* [PR PATCH] pipewire: update to 0.3.39
@ 2021-10-21 22:22 st3r4g
2021-10-21 22:46 ` st3r4g
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 22:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]
There is a new pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.39
https://github.com/void-linux/void-packages/pull/33682
pipewire: update to 0.3.39
Still need to try the new v4l2 stuff and decide if it's worth to make a subpackage for that.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33682.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.39-33682.patch --]
[-- Type: text/x-diff, Size: 3212 bytes --]
From f7c119a4aa9c525f37f3f046db367e67e3ae01fd Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH] pipewire: update to 0.3.39
---
srcpkgs/pipewire/patches/f8817b4.patch | 25 -------------------------
srcpkgs/pipewire/template | 18 +++++++++++++++---
2 files changed, 15 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
---
-GitLab
-
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..ed00172f2d9b 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=0.3.38
+version=0.3.39
revision=1
+_pms_version=0.4.0
build_style=meson
configure_args="
--auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
-Dsystemd=disabled
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
"
hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -27,8 +29,14 @@ maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz
+"
+checksum="
+ 2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b
+"
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
@@ -47,6 +55,10 @@ else
configure_args+=" -Dbluez5-codec-ldac=disabled"
fi
+post_extract() {
+ mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
post_install() {
vlicense LICENSE
vdoc "${FILESDIR}/README.voidlinux"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
@ 2021-10-21 22:46 ` st3r4g
2021-10-21 22:47 ` st3r4g
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949057229
Comment:
`/usr/bin/pw-v4l2` has a bug:
```
diff --git a/usr/bin/pw-v4l2 b/tmp/pw-v4l2
index ebe8301..c671364 100755
--- a/usr/bin/pw-v4l2
+++ b/tmp/pw-v4l2
@@ -55,7 +55,7 @@ done
shift $(( OPTIND - 1 ))
if [ "$LD_PRELOAD" = "" ] ; then
- LD_PRELOAD="/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
+ LD_PRELOAD='/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so'
else
LD_PRELOAD="$LD_PRELOAD /usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
fi
```
but that probably doesn't work with musl (see `pw-jack` issue)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
2021-10-21 22:46 ` st3r4g
@ 2021-10-21 22:47 ` st3r4g
2021-10-21 22:48 ` st3r4g
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949057229
Comment:
`/usr/bin/pw-v4l2` has a bug:
```
diff --git a/usr/bin/pw-v4l2 b/tmp/pw-v4l2
index ebe8301..c671364 100755
--- a/usr/bin/pw-v4l2
+++ b/tmp/pw-v4l2
@@ -55,7 +55,7 @@ done
shift $(( OPTIND - 1 ))
if [ "$LD_PRELOAD" = "" ] ; then
- LD_PRELOAD="/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
+ LD_PRELOAD='/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so'
else
LD_PRELOAD="$LD_PRELOAD /usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
fi
```
but that probably doesn't work with musl (same issue as `pw-jack`)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
2021-10-21 22:46 ` st3r4g
2021-10-21 22:47 ` st3r4g
@ 2021-10-21 22:48 ` st3r4g
2021-10-21 22:56 ` st3r4g
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949057229
Comment:
`/usr/bin/pw-v4l2` has a bug:
```
diff --git a/usr/bin/pw-v4l2 b/tmp/pw-v4l2
index ebe8301..c671364 100755
--- a/usr/bin/pw-v4l2
+++ b/tmp/pw-v4l2
@@ -55,7 +55,7 @@ done
shift $(( OPTIND - 1 ))
if [ "$LD_PRELOAD" = "" ] ; then
- LD_PRELOAD="/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
+ LD_PRELOAD='/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so'
else
LD_PRELOAD="$LD_PRELOAD /usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
fi
```
but that probably doesn't work with musl (same issue as `pw-jack`). Otherwise it seems to work fine with firefox.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (2 preceding siblings ...)
2021-10-21 22:48 ` st3r4g
@ 2021-10-21 22:56 ` st3r4g
2021-10-21 22:58 ` st3r4g
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 22:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949061055
Comment:
I think it's very reasonable to add `libspa-v4l2` in pipewire's `depends` as the video counterpart of `libspa-alsa`. Doesn't add new dependencies and makes pipewire pick up webcams ootb. The system-wide service should be fine as the pipewire user already has video group membership.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (3 preceding siblings ...)
2021-10-21 22:56 ` st3r4g
@ 2021-10-21 22:58 ` st3r4g
2021-10-21 23:27 ` st3r4g
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 763 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949057229
Comment:
`/usr/bin/pw-v4l2` has a bug:
```
diff --git a/usr/bin/pw-v4l2 b/tmp/pw-v4l2
index ebe8301..c671364 100755
--- a/usr/bin/pw-v4l2
+++ b/tmp/pw-v4l2
@@ -55,7 +55,7 @@ done
shift $(( OPTIND - 1 ))
if [ "$LD_PRELOAD" = "" ] ; then
- LD_PRELOAD="/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
+ LD_PRELOAD='/usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so'
else
LD_PRELOAD="$LD_PRELOAD /usr/${LIB}/pipewire-0.3/v4l2/libpw-v4l2.so"
fi
```
but that probably doesn't work with musl (same [issue](https://github.com/void-linux/void-docs/issues/603) as `pw-jack`). Otherwise it seems to work fine with firefox.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (4 preceding siblings ...)
2021-10-21 22:58 ` st3r4g
@ 2021-10-21 23:27 ` st3r4g
2021-10-22 20:20 ` [PR PATCH] [Updated] " st3r4g
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-21 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 418 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949061055
Comment:
I think it's very reasonable to add `libspa-v4l2` in pipewire's `depends` as the video counterpart of `libspa-alsa`. Doesn't add new dependencies and makes pipewire pick up webcams ootb. The system-wide service should be fine as it is already set to have video group membership.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (5 preceding siblings ...)
2021-10-21 23:27 ` st3r4g
@ 2021-10-22 20:20 ` st3r4g
2021-10-22 20:50 ` st3r4g
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-22 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.39
https://github.com/void-linux/void-packages/pull/33682
pipewire: update to 0.3.39
Still need to try the new v4l2 shim and decide whether to put it in a subpackage (probably not).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33682.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.39-33682.patch --]
[-- Type: text/x-diff, Size: 4701 bytes --]
From 18b105803566af274b6a9b5a89dd3e5e64bbaf9b Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH] pipewire: update to 0.3.39
---
srcpkgs/pipewire/patches/f8817b4.patch | 25 ---------------------
srcpkgs/pipewire/patches/no-LIB-token.patch | 13 +++++++++++
srcpkgs/pipewire/template | 21 +++++++++++++----
3 files changed, 30 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
create mode 100644 srcpkgs/pipewire/patches/no-LIB-token.patch
diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
---
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/no-LIB-token.patch b/srcpkgs/pipewire/patches/no-LIB-token.patch
new file mode 100644
index 000000000000..669002721527
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..5c24e7e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -48,7 +48,7 @@ if host_machine.system() == 'linux'
+ # like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
+ # Note that ${LIB} is a special token expanded by the runtime linker,
+ # not an environment variable, and must be passed through literally.
+- modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
++ modules_install_dir_dlopen = prefix / 'lib' / pipewire_name
+ else
+ modules_install_dir_dlopen = modules_install_dir
+ endif
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..ff38808188ac 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=0.3.38
+version=0.3.39
revision=1
+_pms_version=0.4.0
build_style=meson
configure_args="
--auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
-Dsystemd=disabled
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
"
hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -21,14 +23,21 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
readline-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
- libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
+ libspa-v4l2>=${version}_${revision}"
short_desc="Server and user space API to deal with multimedia pipelines"
maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz
+"
+checksum="
+ 2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b
+"
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
@@ -47,6 +56,10 @@ else
configure_args+=" -Dbluez5-codec-ldac=disabled"
fi
+post_extract() {
+ mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
post_install() {
vlicense LICENSE
vdoc "${FILESDIR}/README.voidlinux"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (6 preceding siblings ...)
2021-10-22 20:20 ` [PR PATCH] [Updated] " st3r4g
@ 2021-10-22 20:50 ` st3r4g
2021-10-22 20:54 ` st3r4g
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-22 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.39
https://github.com/void-linux/void-packages/pull/33682
pipewire: update to 0.3.39
Still need to try the new v4l2 shim and decide whether to put it in a subpackage (probably not).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33682.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.39-33682.patch --]
[-- Type: text/x-diff, Size: 5417 bytes --]
From 19dbde66b25e1e43458a0e100f38610f7dde47e5 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH] pipewire: update to 0.3.39
---
srcpkgs/pipewire/patches/f8817b4.patch | 25 -------------------
srcpkgs/pipewire/patches/no-LIB-token.patch | 27 +++++++++++++++++++++
srcpkgs/pipewire/template | 21 +++++++++++++---
3 files changed, 44 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
create mode 100644 srcpkgs/pipewire/patches/no-LIB-token.patch
diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
---
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/no-LIB-token.patch b/srcpkgs/pipewire/patches/no-LIB-token.patch
new file mode 100644
index 000000000000..6573e2aeb7f4
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,27 @@
+As void doesn't support multiarch, remove the glibc specific $LIB dynamic string
+token, which otherwise breaks musl.
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..7af3373 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,19 +39,7 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
+ modules_install_dir = pipewire_libdir / pipewire_name
+
+-if host_machine.system() == 'linux'
+- # glibc ld.so interprets ${LIB} in a library loading path with an
+- # appropriate value for the current architecture, typically something
+- # like lib, lib64 or lib/x86_64-linux-gnu.
+- # This allows the same pw-jack script to work for both 32- and 64-bit
+- # applications on biarch/multiarch distributions, by setting something
+- # like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
+- # Note that ${LIB} is a special token expanded by the runtime linker,
+- # not an environment variable, and must be passed through literally.
+- modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
+-else
+- modules_install_dir_dlopen = modules_install_dir
+-endif
++modules_install_dir_dlopen = modules_install_dir
+
+ spa_plugindir = pipewire_libdir / spa_name
+ spa_datadir = pipewire_datadir / spa_name
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..ff38808188ac 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=0.3.38
+version=0.3.39
revision=1
+_pms_version=0.4.0
build_style=meson
configure_args="
--auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
-Dsystemd=disabled
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
"
hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -21,14 +23,21 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
readline-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
- libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
+ libspa-v4l2>=${version}_${revision}"
short_desc="Server and user space API to deal with multimedia pipelines"
maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz
+"
+checksum="
+ 2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b
+"
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
@@ -47,6 +56,10 @@ else
configure_args+=" -Dbluez5-codec-ldac=disabled"
fi
+post_extract() {
+ mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
post_install() {
vlicense LICENSE
vdoc "${FILESDIR}/README.voidlinux"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (7 preceding siblings ...)
2021-10-22 20:50 ` st3r4g
@ 2021-10-22 20:54 ` st3r4g
2021-10-24 15:28 ` st3r4g
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-22 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-949953248
Comment:
Now `pw-jack` and the new `pw-v4l2` should work on musl too.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (8 preceding siblings ...)
2021-10-22 20:54 ` st3r4g
@ 2021-10-24 15:28 ` st3r4g
2021-10-25 0:43 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-24 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-950344737
Comment:
I am not sure if this `$LIB` has value for our multilib. If yes I should patch it conditionally.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (9 preceding siblings ...)
2021-10-24 15:28 ` st3r4g
@ 2021-10-25 0:43 ` ericonr
2021-10-25 21:22 ` st3r4g
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-10-25 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#discussion_r735196582
Comment:
```suggestion
distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
checksum="2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b"
```
This is how xgensum will fill it in after an update too ;)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (10 preceding siblings ...)
2021-10-25 0:43 ` [PR REVIEW] " ericonr
@ 2021-10-25 21:22 ` st3r4g
2021-10-25 21:24 ` [PR PATCH] [Updated] " st3r4g
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-25 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-951343026
Comment:
> Any idea about the musl test failures?
discussing it with upstream in https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1736
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (11 preceding siblings ...)
2021-10-25 21:22 ` st3r4g
@ 2021-10-25 21:24 ` st3r4g
2021-10-25 21:51 ` st3r4g
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-25 21:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.39
https://github.com/void-linux/void-packages/pull/33682
pipewire: update to 0.3.39
Still need to try the new v4l2 shim and decide whether to put it in a subpackage (probably not).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33682.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.39-33682.patch --]
[-- Type: text/x-diff, Size: 7119 bytes --]
From 19dbde66b25e1e43458a0e100f38610f7dde47e5 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH 1/2] pipewire: update to 0.3.39
---
srcpkgs/pipewire/patches/f8817b4.patch | 25 -------------------
srcpkgs/pipewire/patches/no-LIB-token.patch | 27 +++++++++++++++++++++
srcpkgs/pipewire/template | 21 +++++++++++++---
3 files changed, 44 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
create mode 100644 srcpkgs/pipewire/patches/no-LIB-token.patch
diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
---
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/no-LIB-token.patch b/srcpkgs/pipewire/patches/no-LIB-token.patch
new file mode 100644
index 000000000000..6573e2aeb7f4
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,27 @@
+As void doesn't support multiarch, remove the glibc specific $LIB dynamic string
+token, which otherwise breaks musl.
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..7af3373 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,19 +39,7 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
+ modules_install_dir = pipewire_libdir / pipewire_name
+
+-if host_machine.system() == 'linux'
+- # glibc ld.so interprets ${LIB} in a library loading path with an
+- # appropriate value for the current architecture, typically something
+- # like lib, lib64 or lib/x86_64-linux-gnu.
+- # This allows the same pw-jack script to work for both 32- and 64-bit
+- # applications on biarch/multiarch distributions, by setting something
+- # like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
+- # Note that ${LIB} is a special token expanded by the runtime linker,
+- # not an environment variable, and must be passed through literally.
+- modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
+-else
+- modules_install_dir_dlopen = modules_install_dir
+-endif
++modules_install_dir_dlopen = modules_install_dir
+
+ spa_plugindir = pipewire_libdir / spa_name
+ spa_datadir = pipewire_datadir / spa_name
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..ff38808188ac 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=0.3.38
+version=0.3.39
revision=1
+_pms_version=0.4.0
build_style=meson
configure_args="
--auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
-Dsystemd=disabled
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
"
hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -21,14 +23,21 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
readline-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
- libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
+ libspa-v4l2>=${version}_${revision}"
short_desc="Server and user space API to deal with multimedia pipelines"
maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz
+"
+checksum="
+ 2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b
+"
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
@@ -47,6 +56,10 @@ else
configure_args+=" -Dbluez5-codec-ldac=disabled"
fi
+post_extract() {
+ mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
post_install() {
vlicense LICENSE
vdoc "${FILESDIR}/README.voidlinux"
From 7529a4b23df0c96ccc563fc92c1d82522119208b Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 25 Oct 2021 23:24:04 +0200
Subject: [PATCH 2/2] Update srcpkgs/pipewire/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
srcpkgs/pipewire/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index ff38808188ac..fc8b75f3aaf9 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -30,14 +30,10 @@ maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="
- https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz
-"
-checksum="
- 2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
- c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b
-"
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
+checksum="2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b"
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (12 preceding siblings ...)
2021-10-25 21:24 ` [PR PATCH] [Updated] " st3r4g
@ 2021-10-25 21:51 ` st3r4g
2021-10-26 7:08 ` [PR PATCH] [Updated] " st3r4g
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-25 21:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-951343026
Comment:
> Any idea about the musl test failures?
Discussing it with upstream in https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1736
But to me it looks like it's probably a bug of the test infrastructure rather than pipewire itself.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (13 preceding siblings ...)
2021-10-25 21:51 ` st3r4g
@ 2021-10-26 7:08 ` st3r4g
2021-10-26 7:32 ` st3r4g
2021-10-30 18:18 ` [PR PATCH] [Merged]: " ericonr
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-26 7:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.39
https://github.com/void-linux/void-packages/pull/33682
pipewire: update to 0.3.39
Still need to try the new v4l2 shim and decide whether to put it in a subpackage (probably not).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33682.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.39-33682.patch --]
[-- Type: text/x-diff, Size: 8074 bytes --]
From 2bd71c190060a4d822e82183a517e66983f819d8 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH] pipewire: update to 0.3.39
---
srcpkgs/pipewire/patches/1042.patch | 77 +++++++++++++++++++++
srcpkgs/pipewire/patches/f8817b4.patch | 25 -------
srcpkgs/pipewire/patches/no-LIB-token.patch | 27 ++++++++
srcpkgs/pipewire/template | 17 +++--
4 files changed, 117 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/pipewire/patches/1042.patch
delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
create mode 100644 srcpkgs/pipewire/patches/no-LIB-token.patch
diff --git a/srcpkgs/pipewire/patches/1042.patch b/srcpkgs/pipewire/patches/1042.patch
new file mode 100644
index 000000000000..fc4c5f2f35cd
--- /dev/null
+++ b/srcpkgs/pipewire/patches/1042.patch
@@ -0,0 +1,77 @@
+From cf3c0431c387a72fdbc66ec78086f695d0b6de3c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 26 Oct 2021 11:14:06 +1000
+Subject: [PATCH 1/2] test: fix tmpdir value after setenv
+
+Introduced in a2856c6e0f692b7a379e06d3ed6ac8107f9b946b
+
+set_test_env() modifies TMPDIR so we must not use getenv until after
+that call.
+
+Fixes #1736
+---
+ test/pwtest.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/pwtest.c b/test/pwtest.c
+index fbf16cb2f..a000153fd 100644
+--- a/test/pwtest.c
++++ b/test/pwtest.c
+@@ -915,9 +915,7 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
+ pid_t pw_daemon = 0;
+ int read_fds[_FD_LAST], write_fds[_FD_LAST];
+ int r;
+- const char *tmpdir = getenv("TMPDIR");
+-
+- spa_assert_se(tmpdir != NULL);
++ const char *tmpdir;
+
+ if (t->result == PWTEST_SKIP) {
+ char *buf = pw_array_add(&t->logs[FD_LOG], 64);
+@@ -934,6 +932,8 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
+ }
+
+ set_test_env(ctx, t);
++ tmpdir = getenv("TMPDIR");
++ spa_assert_se(tmpdir != NULL);
+ r = chdir(tmpdir);
+ if (r < 0) {
+ t->sig_or_errno = -errno;
+--
+GitLab
+
+
+From 07c5511aedf0b0606c0d3f92ce829c5402436d58 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 26 Oct 2021 11:03:22 +1000
+Subject: [PATCH 2/2] test: handle chdir errors correctly
+
+When we get to this code, we already updated the environment variables
+so we need to use the usual error path to restore them.
+
+And where chdir does fail, print an error to the log. 256 chars should
+be enough here, if your tmpdir exceeds that you just have the error
+message cut off.
+---
+ test/pwtest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/test/pwtest.c b/test/pwtest.c
+index a000153fd..35e7b003c 100644
+--- a/test/pwtest.c
++++ b/test/pwtest.c
+@@ -936,8 +936,10 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct
+ spa_assert_se(tmpdir != NULL);
+ r = chdir(tmpdir);
+ if (r < 0) {
++ char *buf = pw_array_add(&t->logs[FD_LOG], 256);
++ spa_scnprintf(buf, 256, "pwtest: failed to chdir to '%s'\n", tmpdir);
+ t->sig_or_errno = -errno;
+- return;
++ goto error;
+ }
+
+ if (t->args.pw_daemon) {
+--
+GitLab
+
diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- int arch;
-
- if (!(cpuinfo = get_cpuinfo())) {
-- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- return 1;
- }
-
---
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/no-LIB-token.patch b/srcpkgs/pipewire/patches/no-LIB-token.patch
new file mode 100644
index 000000000000..6573e2aeb7f4
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,27 @@
+As void doesn't support multiarch, remove the glibc specific $LIB dynamic string
+token, which otherwise breaks musl.
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..7af3373 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,19 +39,7 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
+ modules_install_dir = pipewire_libdir / pipewire_name
+
+-if host_machine.system() == 'linux'
+- # glibc ld.so interprets ${LIB} in a library loading path with an
+- # appropriate value for the current architecture, typically something
+- # like lib, lib64 or lib/x86_64-linux-gnu.
+- # This allows the same pw-jack script to work for both 32- and 64-bit
+- # applications on biarch/multiarch distributions, by setting something
+- # like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
+- # Note that ${LIB} is a special token expanded by the runtime linker,
+- # not an environment variable, and must be passed through literally.
+- modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
+-else
+- modules_install_dir_dlopen = modules_install_dir
+-endif
++modules_install_dir_dlopen = modules_install_dir
+
+ spa_plugindir = pipewire_libdir / spa_name
+ spa_datadir = pipewire_datadir / spa_name
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..fc8b75f3aaf9 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=0.3.38
+version=0.3.39
revision=1
+_pms_version=0.4.0
build_style=meson
configure_args="
--auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
-Dsystemd=disabled
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
"
hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -21,14 +23,17 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
readline-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
- libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
+ libspa-v4l2>=${version}_${revision}"
short_desc="Server and user space API to deal with multimedia pipelines"
maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
license="MIT"
homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
+checksum="2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b"
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
@@ -47,6 +52,10 @@ else
configure_args+=" -Dbluez5-codec-ldac=disabled"
fi
+post_extract() {
+ mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
post_install() {
vlicense LICENSE
vdoc "${FILESDIR}/README.voidlinux"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (14 preceding siblings ...)
2021-10-26 7:08 ` [PR PATCH] [Updated] " st3r4g
@ 2021-10-26 7:32 ` st3r4g
2021-10-30 18:18 ` [PR PATCH] [Merged]: " ericonr
16 siblings, 0 replies; 18+ messages in thread
From: st3r4g @ 2021-10-26 7:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/33682#issuecomment-951641988
Comment:
musl test failures now fixed. About `$LIB`, I cannot think of any proprietary binary only available in 32bit that uses the Jack or v4l2 APIs... so it shouldn't matter if I remove it.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Merged]: pipewire: update to 0.3.39
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
` (15 preceding siblings ...)
2021-10-26 7:32 ` st3r4g
@ 2021-10-30 18:18 ` ericonr
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-10-30 18:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]
There's a merged pull request on the void-packages repository
pipewire: update to 0.3.39
https://github.com/void-linux/void-packages/pull/33682
Description:
Still need to try the new v4l2 shim and decide whether to put it in a subpackage (probably not).
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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:[~2021-10-30 18:18 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-21 22:22 [PR PATCH] pipewire: update to 0.3.39 st3r4g
2021-10-21 22:46 ` st3r4g
2021-10-21 22:47 ` st3r4g
2021-10-21 22:48 ` st3r4g
2021-10-21 22:56 ` st3r4g
2021-10-21 22:58 ` st3r4g
2021-10-21 23:27 ` st3r4g
2021-10-22 20:20 ` [PR PATCH] [Updated] " st3r4g
2021-10-22 20:50 ` st3r4g
2021-10-22 20:54 ` st3r4g
2021-10-24 15:28 ` st3r4g
2021-10-25 0:43 ` [PR REVIEW] " ericonr
2021-10-25 21:22 ` st3r4g
2021-10-25 21:24 ` [PR PATCH] [Updated] " st3r4g
2021-10-25 21:51 ` st3r4g
2021-10-26 7:08 ` [PR PATCH] [Updated] " st3r4g
2021-10-26 7:32 ` st3r4g
2021-10-30 18:18 ` [PR PATCH] [Merged]: " ericonr
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).