* [PR PATCH] helvum: update to 0.4.1.
@ 2023-09-16 10:14 0x5c
2023-09-16 11:54 ` tranzystorek-io
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: 0x5c @ 2023-09-16 10:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is a new pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages update/helvum
https://github.com/void-linux/void-packages/pull/46082
helvum: update to 0.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46082.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/helvum-46082.patch --]
[-- Type: text/x-diff, Size: 1109 bytes --]
From 26c476541e7b6a7dc445dc86c47f92d4b722ac0b Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 16 Sep 2023 06:14:05 -0400
Subject: [PATCH] helvum: update to 0.4.1.
---
srcpkgs/helvum/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 1f3c89a66717c..5162239953fb1 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,6 +1,6 @@
# Template file for 'helvum'
pkgname=helvum
-version=0.4.0
+version=0.4.1
revision=1
build_style=cargo
hostmakedepends="pkg-config clang libclang"
@@ -11,7 +11,7 @@ maintainer="0x5c <dev@0x5c.io>"
license="GPL-3.0-only"
homepage="https://gitlab.freedesktop.org/pipewire/helvum"
distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
-checksum=e93afa788d3e50bae489db888ecf0d79e5735b8f4f8b29fe4174540b0872b622
+checksum=510fbe472c1d9de546f298b8fb954c493e2e3ad1df80e730558972bbee1d692c
post_install() {
# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
@ 2023-09-16 11:54 ` tranzystorek-io
2023-09-16 12:32 ` 0x5c
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: tranzystorek-io @ 2023-09-16 11:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722213838
Comment:
Seems like an issue to report upstream, their wrappers don't look properly tested on other platforms
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
2023-09-16 11:54 ` tranzystorek-io
@ 2023-09-16 12:32 ` 0x5c
2023-09-16 15:18 ` [PR PATCH] [Updated] " 0x5c
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-16 12:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722220667
Comment:
Ahhh very fun
I feared breakage when seeing the update, tested locally (x86_64 glibc) and had no errors, and had the hubris of expecting to push that before going afk and come back to all green on CI
Welp :(
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
2023-09-16 11:54 ` tranzystorek-io
2023-09-16 12:32 ` 0x5c
@ 2023-09-16 15:18 ` 0x5c
2023-09-16 15:33 ` 0x5c
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-16 15:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages update/helvum
https://github.com/void-linux/void-packages/pull/46082
helvum: update to 0.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46082.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/helvum-46082.patch --]
[-- Type: text/x-diff, Size: 1189 bytes --]
From 1309533d213e8428242143a2782e1171ac675d39 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 16 Sep 2023 06:14:05 -0400
Subject: [PATCH] helvum: update to 0.4.1.
---
srcpkgs/helvum/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 1f3c89a66717c..976fbede0c629 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,6 +1,6 @@
# Template file for 'helvum'
pkgname=helvum
-version=0.4.0
+version=0.4.1
revision=1
build_style=cargo
hostmakedepends="pkg-config clang libclang"
@@ -11,7 +11,11 @@ maintainer="0x5c <dev@0x5c.io>"
license="GPL-3.0-only"
homepage="https://gitlab.freedesktop.org/pipewire/helvum"
distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
-checksum=e93afa788d3e50bae489db888ecf0d79e5735b8f4f8b29fe4174540b0872b622
+checksum=510fbe472c1d9de546f298b8fb954c493e2e3ad1df80e730558972bbee1d692c
+
+post_patch() {
+ cargo update --package libspa@0.7.0 --precise 0.7.2
+}
post_install() {
# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (2 preceding siblings ...)
2023-09-16 15:18 ` [PR PATCH] [Updated] " 0x5c
@ 2023-09-16 15:33 ` 0x5c
2023-09-17 2:54 ` 0x5c
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-16 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722254778
Comment:
Ok, by updating the libspa crate to the latest version we get rid of the bindgen errors on musl, but we still have the type mismatch on 32bit architectures
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (3 preceding siblings ...)
2023-09-16 15:33 ` 0x5c
@ 2023-09-17 2:54 ` 0x5c
2023-09-17 6:15 ` icp1994
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-17 2:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722375961
Comment:
https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/84
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (4 preceding siblings ...)
2023-09-17 2:54 ` 0x5c
@ 2023-09-17 6:15 ` icp1994
2023-09-17 8:13 ` 0x5c
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: icp1994 @ 2023-09-17 6:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2347 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722403396
Comment:
A bit tangential, this template uses the `cargo` build style instead of the `meson` one and recommends checking all `meson.build` files during each update. I think this is probably not the ideal approach so I had these changes when I updated it locally a few months ago.
```patch
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 1f3c89a66..071033ee1 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -2,10 +2,12 @@
pkgname=helvum
version=0.4.0
revision=1
-build_style=cargo
-hostmakedepends="pkg-config clang libclang"
-makedepends="gtk4-devel pipewire-devel glib-devel"
+build_style=meson
+build_helper="rust"
+hostmakedepends="pkg-config clang libclang cargo desktop-file-utils gtk4-update-icon-cache"
+makedepends="gtk4-devel pipewire-devel glib-devel rust-std"
depends="pipewire"
+checkdepends="desktop-file-utils appstream-glib"
short_desc="GTK patchbay for pipewire"
maintainer="0x5c <dev@0x5c.io>"
license="GPL-3.0-only"
@@ -13,17 +15,9 @@ homepage="https://gitlab.freedesktop.org/pipewire/helvum"
distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
checksum=e93afa788d3e50bae489db888ecf0d79e5735b8f4f8b29fe4174540b0872b622
-post_install() {
- # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
- # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
- # On update, all meson.build files should be checked for changes
- _app_id='org.pipewire.Helvum'
- vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
- vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
-
- vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
- vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
-
- vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
- vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+post_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+ fi
}
```
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (5 preceding siblings ...)
2023-09-17 6:15 ` icp1994
@ 2023-09-17 8:13 ` 0x5c
2023-09-17 8:13 ` 0x5c
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-17 8:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722421440
Comment:
> A bit tangential, this template uses the `cargo` build style instead of the `meson` one and recommends checking all `meson.build` files during each update. I think this is probably not the ideal approach so I had these changes when I updated it locally a few months ago.
The meson story is a pure nuisance for downstream packagers, since all it does is a couple of template filling operations *and things that should only run on the end-user system* in xbps triggers. The reason upstream has it is so that `meson install` does the desktop db update on gnome systems for users that manually build helvum, and for flatpack dist.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (6 preceding siblings ...)
2023-09-17 8:13 ` 0x5c
@ 2023-09-17 8:13 ` 0x5c
2023-09-17 8:18 ` 0x5c
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-17 8:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722421440
Comment:
> A bit tangential, this template uses the `cargo` build style instead of the `meson` one and recommends checking all `meson.build` files during each update. I think this is probably not the ideal approach so I had these changes when I updated it locally a few months ago.
The meson stuff is a pure nuisance for downstream packagers, since all it does is a couple of template filling operations *and things that should only run on the end-user system* in xbps triggers. The reason upstream has it is so that `meson install` does the desktop db update on gnome systems for users that manually build helvum, and for flatpack dist.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (7 preceding siblings ...)
2023-09-17 8:13 ` 0x5c
@ 2023-09-17 8:18 ` 0x5c
2023-09-17 10:43 ` icp1994
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-17 8:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722422279
Comment:
On top of the above, the meson build needlessly bypasses some of our setup for properly building/testing/installing cargo projects
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (8 preceding siblings ...)
2023-09-17 8:18 ` 0x5c
@ 2023-09-17 10:43 ` icp1994
2023-09-18 7:55 ` 0x5c
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: icp1994 @ 2023-09-17 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722448369
Comment:
Oh, I wasn't aware of that. I thought this was a common pattern for gtk4+rust apps - fex [amberol](https://github.com/void-linux/void-packages/blob/master/srcpkgs/amberol/template), [gnome-authenticator](https://github.com/void-linux/void-packages/blob/master/srcpkgs/gnome-authenticator/template), [shortwave](https://github.com/void-linux/void-packages/blob/master/srcpkgs/shortwave/template) etc.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (9 preceding siblings ...)
2023-09-17 10:43 ` icp1994
@ 2023-09-18 7:55 ` 0x5c
2023-09-18 7:55 ` 0x5c
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-18 7:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722913321
Comment:
> Oh, I wasn't aware of that. I thought this was a common pattern for gtk4+rust apps - fex [amberol](https://github.com/void-linux/void-packages/blob/master/srcpkgs/amberol/template), [gnome-authenticator](https://github.com/void-linux/void-packages/blob/master/srcpkgs/gnome-authenticator/template), [shortwave](https://github.com/void-linux/void-packages/blob/master/srcpkgs/shortwave/template) etc.
Yeah, it's common for gnome stuff both for the same reasons as above and also because they're often based on a template that does it, along with even worse things like changing `CARGO_HOME` to break caching
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (10 preceding siblings ...)
2023-09-18 7:55 ` 0x5c
@ 2023-09-18 7:55 ` 0x5c
2023-09-20 12:14 ` [PR PATCH] [Updated] " 0x5c
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-18 7:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1722913321
Comment:
> Oh, I wasn't aware of that. I thought this was a common pattern for gtk4+rust apps - fex [amberol](https://github.com/void-linux/void-packages/blob/master/srcpkgs/amberol/template), [gnome-authenticator](https://github.com/void-linux/void-packages/blob/master/srcpkgs/gnome-authenticator/template), [shortwave](https://github.com/void-linux/void-packages/blob/master/srcpkgs/shortwave/template) etc.
Yeah, it's common in gnome stuff both for the same reasons as above and also because they're often based on a template that does it, along with even worse things like changing `CARGO_HOME` to break caching
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (11 preceding siblings ...)
2023-09-18 7:55 ` 0x5c
@ 2023-09-20 12:14 ` 0x5c
2023-09-20 12:27 ` 0x5c
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-20 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages update/helvum
https://github.com/void-linux/void-packages/pull/46082
helvum: update to 0.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46082.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/helvum-46082.patch --]
[-- Type: text/x-diff, Size: 3014 bytes --]
From 45ff712802c02a9a409525e42729ead7e958facc Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 16 Sep 2023 06:14:05 -0400
Subject: [PATCH] helvum: update to 0.4.1.
---
srcpkgs/helvum/patches/32bit-c_long.patch | 23 +++++++++++++++++++++++
srcpkgs/helvum/template | 19 ++++++++++++++++---
2 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/helvum/patches/32bit-c_long.patch
diff --git a/srcpkgs/helvum/patches/32bit-c_long.patch b/srcpkgs/helvum/patches/32bit-c_long.patch
new file mode 100644
index 0000000000000..0186f01d9565a
--- /dev/null
+++ b/srcpkgs/helvum/patches/32bit-c_long.patch
@@ -0,0 +1,23 @@
+--- a/libspa/src/pod/parser.rs
++++ b/libspa/src/pod/parser.rs
+@@ -5,7 +5,7 @@
+ // SPDX-License-Identifier: MIT
+
+ use std::{
+- ffi::{c_char, c_double, c_float, c_int, c_long, c_void, CStr},
++ ffi::{c_char, c_double, c_float, c_int, c_void, CStr},
+ marker::PhantomData,
+ mem::MaybeUninit,
+ };
+@@ -174,9 +174,9 @@
+ }
+ }
+
+- pub fn get_long(&mut self) -> Result<c_long, Errno> {
++ pub fn get_long(&mut self) -> Result<i64, Errno> {
+ unsafe {
+- let mut long: MaybeUninit<c_long> = MaybeUninit::uninit();
++ let mut long: MaybeUninit<i64> = MaybeUninit::uninit();
+ let res = spa_sys::spa_pod_parser_get_long(self.as_raw_ptr(), long.as_mut_ptr());
+ if res >= 0 {
+ Ok(long.assume_init())
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 1f3c89a66717c..88a51d9575933 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,7 +1,8 @@
# Template file for 'helvum'
pkgname=helvum
-version=0.4.0
+version=0.4.1
revision=1
+_pwrs_version="0.7.2"
build_style=cargo
hostmakedepends="pkg-config clang libclang"
makedepends="gtk4-devel pipewire-devel glib-devel"
@@ -10,8 +11,20 @@ short_desc="GTK patchbay for pipewire"
maintainer="0x5c <dev@0x5c.io>"
license="GPL-3.0-only"
homepage="https://gitlab.freedesktop.org/pipewire/helvum"
-distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
-checksum=e93afa788d3e50bae489db888ecf0d79e5735b8f4f8b29fe4174540b0872b622
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pwrs_version}/pipewire-rs-v${_pwrs_version}.tar.gz"
+checksum="510fbe472c1d9de546f298b8fb954c493e2e3ad1df80e730558972bbee1d692c
+ fa1efaa854b84cdafe1526932f20be638ce28324acb0d62d9f6d1f73809f1548"
+build_wrksrc="helvum-${version}"
+patch_args="-Np1 -d pipewire-rs-v${_pwrs_version}"
+
+post_patch() {
+ cat <<-EOF >> "Cargo.toml"
+ [patch.crates-io]
+ pipewire = { path = "../pipewire-rs-v${_pwrs_version}/pipewire" }
+ EOF
+ cargo update --package pipewire@0.7.0 --precise 0.7.2
+}
post_install() {
# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (12 preceding siblings ...)
2023-09-20 12:14 ` [PR PATCH] [Updated] " 0x5c
@ 2023-09-20 12:27 ` 0x5c
2023-09-20 12:29 ` 0x5c
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-20 12:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1727624253
Comment:
Ok so I found the bug and have a fix that builds. Logically it should be good to go but I can't really test the i686 build currently
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (13 preceding siblings ...)
2023-09-20 12:27 ` 0x5c
@ 2023-09-20 12:29 ` 0x5c
2023-09-26 18:10 ` [PR PATCH] [Updated] " 0x5c
2023-09-26 18:20 ` [PR PATCH] [Merged]: " classabbyamp
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-20 12:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/46082#issuecomment-1727624253
Comment:
Ok so I found the bug and have a fix that builds. Logically it should be good to go but I can't really test the i686 build currently (or rather, any of the 32bit builds)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (14 preceding siblings ...)
2023-09-20 12:29 ` 0x5c
@ 2023-09-26 18:10 ` 0x5c
2023-09-26 18:20 ` [PR PATCH] [Merged]: " classabbyamp
16 siblings, 0 replies; 18+ messages in thread
From: 0x5c @ 2023-09-26 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages update/helvum
https://github.com/void-linux/void-packages/pull/46082
helvum: update to 0.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46082.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/helvum-46082.patch --]
[-- Type: text/x-diff, Size: 3014 bytes --]
From 214d5be7113cd4f78a816436796695e1002fb699 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 16 Sep 2023 06:14:05 -0400
Subject: [PATCH] helvum: update to 0.4.1.
---
srcpkgs/helvum/patches/32bit-c_long.patch | 23 +++++++++++++++++++++++
srcpkgs/helvum/template | 19 ++++++++++++++++---
2 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/helvum/patches/32bit-c_long.patch
diff --git a/srcpkgs/helvum/patches/32bit-c_long.patch b/srcpkgs/helvum/patches/32bit-c_long.patch
new file mode 100644
index 0000000000000..0186f01d9565a
--- /dev/null
+++ b/srcpkgs/helvum/patches/32bit-c_long.patch
@@ -0,0 +1,23 @@
+--- a/libspa/src/pod/parser.rs
++++ b/libspa/src/pod/parser.rs
+@@ -5,7 +5,7 @@
+ // SPDX-License-Identifier: MIT
+
+ use std::{
+- ffi::{c_char, c_double, c_float, c_int, c_long, c_void, CStr},
++ ffi::{c_char, c_double, c_float, c_int, c_void, CStr},
+ marker::PhantomData,
+ mem::MaybeUninit,
+ };
+@@ -174,9 +174,9 @@
+ }
+ }
+
+- pub fn get_long(&mut self) -> Result<c_long, Errno> {
++ pub fn get_long(&mut self) -> Result<i64, Errno> {
+ unsafe {
+- let mut long: MaybeUninit<c_long> = MaybeUninit::uninit();
++ let mut long: MaybeUninit<i64> = MaybeUninit::uninit();
+ let res = spa_sys::spa_pod_parser_get_long(self.as_raw_ptr(), long.as_mut_ptr());
+ if res >= 0 {
+ Ok(long.assume_init())
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 1f3c89a66717c..88a51d9575933 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,7 +1,8 @@
# Template file for 'helvum'
pkgname=helvum
-version=0.4.0
+version=0.4.1
revision=1
+_pwrs_version="0.7.2"
build_style=cargo
hostmakedepends="pkg-config clang libclang"
makedepends="gtk4-devel pipewire-devel glib-devel"
@@ -10,8 +11,20 @@ short_desc="GTK patchbay for pipewire"
maintainer="0x5c <dev@0x5c.io>"
license="GPL-3.0-only"
homepage="https://gitlab.freedesktop.org/pipewire/helvum"
-distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
-checksum=e93afa788d3e50bae489db888ecf0d79e5735b8f4f8b29fe4174540b0872b622
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pwrs_version}/pipewire-rs-v${_pwrs_version}.tar.gz"
+checksum="510fbe472c1d9de546f298b8fb954c493e2e3ad1df80e730558972bbee1d692c
+ fa1efaa854b84cdafe1526932f20be638ce28324acb0d62d9f6d1f73809f1548"
+build_wrksrc="helvum-${version}"
+patch_args="-Np1 -d pipewire-rs-v${_pwrs_version}"
+
+post_patch() {
+ cat <<-EOF >> "Cargo.toml"
+ [patch.crates-io]
+ pipewire = { path = "../pipewire-rs-v${_pwrs_version}/pipewire" }
+ EOF
+ cargo update --package pipewire@0.7.0 --precise 0.7.2
+}
post_install() {
# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Merged]: helvum: update to 0.4.1.
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
` (15 preceding siblings ...)
2023-09-26 18:10 ` [PR PATCH] [Updated] " 0x5c
@ 2023-09-26 18:20 ` classabbyamp
16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2023-09-26 18:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
There's a merged pull request on the void-packages repository
helvum: update to 0.4.1.
https://github.com/void-linux/void-packages/pull/46082
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-09-26 18:20 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-16 10:14 [PR PATCH] helvum: update to 0.4.1 0x5c
2023-09-16 11:54 ` tranzystorek-io
2023-09-16 12:32 ` 0x5c
2023-09-16 15:18 ` [PR PATCH] [Updated] " 0x5c
2023-09-16 15:33 ` 0x5c
2023-09-17 2:54 ` 0x5c
2023-09-17 6:15 ` icp1994
2023-09-17 8:13 ` 0x5c
2023-09-17 8:13 ` 0x5c
2023-09-17 8:18 ` 0x5c
2023-09-17 10:43 ` icp1994
2023-09-18 7:55 ` 0x5c
2023-09-18 7:55 ` 0x5c
2023-09-20 12:14 ` [PR PATCH] [Updated] " 0x5c
2023-09-20 12:27 ` 0x5c
2023-09-20 12:29 ` 0x5c
2023-09-26 18:10 ` [PR PATCH] [Updated] " 0x5c
2023-09-26 18:20 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).