* [PR PATCH] pipewire: update to 1.2.0; wireplumber: update to 0.5.5
@ 2024-07-09 1:13 cinerea0
2024-07-10 22:25 ` [PR PATCH] [Updated] " cinerea0
2024-07-10 22:47 ` [PR PATCH] [Merged]: " cinerea0
0 siblings, 2 replies; 3+ messages in thread
From: cinerea0 @ 2024-07-09 1:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is a new pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages pw
https://github.com/void-linux/void-packages/pull/51159
pipewire: update to 1.2.0; wireplumber: update to 0.5.5
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/51159.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pw-51159.patch --]
[-- Type: text/x-diff, Size: 7340 bytes --]
From f426740932b15ca1ffbc6354838daf3e8b824a04 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 8 Jul 2024 21:12:04 -0400
Subject: [PATCH 1/2] pipewire: update to 1.2.0
---
.../patches/fix-conflicting-meson-deps.patch | 79 +++++++++++++++++++
srcpkgs/pipewire/template | 7 +-
2 files changed, 83 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch
diff --git a/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch b/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch
new file mode 100644
index 00000000000000..ab102a606c8272
--- /dev/null
+++ b/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch
@@ -0,0 +1,79 @@
+From b5f031bc15524bbfde577290ad9bbadeab77ae8b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 30 Jun 2024 13:44:06 -0400
+Subject: [PATCH] meson: fix conflicting use of feature-based dependency
+ lookups
+
+When spa-plugins is enabled, the gio-2.0 global dependency is
+overwritten.
+
+When bluez support is enabled, OR when gsettings is enabled, the gio-2.0
+dependency is then detected as found. This means that
+pipewire-module-protocol-pulse can end up enabling gsettings support
+even if it has been forcibly turned off.
+
+Rename the meson variables to ensure they are looked up separately.
+---
+ meson.build | 6 +++---
+ spa/meson.build | 6 +++---
+ src/modules/meson.build | 4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2607c5c8f4..38b6b59d00 100644
+--- a/meson.build
++++ b/meson.build
+@@ -346,9 +346,9 @@ summary({'GLib-2.0 (Flatpak support)': glib2_dep.found()}, bool_yn: true, sectio
+ flatpak_support = glib2_dep.found()
+ cdata.set('HAVE_GLIB2', flatpak_support)
+
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+-summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+-if not gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
++gsettings_gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
++summary({'GIO (GSettings)': gsettings_gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++if not gsettings_gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
+ error('`gsettings-pulse-schema` is enabled but `gio` was not found.')
+ endif
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 67e4b5c506..cf25609dab 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -47,12 +47,12 @@ if get_option('spa-plugins').allowed()
+ summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend')
+
+ bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5'))
+- gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
+- gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
++ bluez_gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
++ bluez_gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
+ bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5'))
+ sbc_dep = dependency('sbc', required: get_option('bluez5'))
+ summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+- bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ]
++ bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, bluez_gio_dep, bluez_gio_unix_dep ]
+ bluez_deps_found = get_option('bluez5').allowed()
+ foreach dep: bluez5_deps
+ if get_option('bluez5').enabled() and not dep.found()
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index ceaa7013d9..3f400f0877 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -433,11 +433,11 @@ if avahi_dep.found()
+ cdata.set('HAVE_AVAHI', true)
+ endif
+
+-if gio_dep.found()
++if gsettings_gio_dep.found()
+ pipewire_module_protocol_pulse_sources += [
+ 'module-protocol-pulse/modules/module-gsettings.c',
+ ]
+- pipewire_module_protocol_pulse_deps += gio_dep
++ pipewire_module_protocol_pulse_deps += gsettings_gio_dep
+ cdata.set('HAVE_GIO', true)
+ if get_option('gsettings-pulse-schema').enabled()
+ install_data(['module-protocol-pulse/modules/org.freedesktop.pulseaudio.gschema.xml'],
+--
+GitLab
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 761a174a52bb9a..1567a7abf072f1 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=1.0.7
+version=1.2.0
revision=1
build_style=meson
configure_args="
@@ -15,6 +15,7 @@ configure_args="
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
-Dbluez5-codec-lc3plus=disabled
+ -Dsnap=disabled
-Dsession-managers=[]
-Drlimits-match=@_pipewire
$(vopt_feature ffado libffado)
@@ -27,7 +28,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
vulkan-loader-devel pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
libmysofa-devel opus-devel $(vopt_if ffado libffado-devel) liblc3-devel
- $(vopt_if selinux libselinux-devel) libcamera-devel"
+ $(vopt_if selinux libselinux-devel) libcamera-devel libcap-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
@@ -38,7 +39,7 @@ 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=9c45eef65e66224804ae8671849452a7f221e913813072b3aad346f20df666a8
+checksum=477eb1245a66a982345404b57fab1b9f402c12292047c4d9bea90d6445374653
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
From 220398dedb268314fcc570b97cd5993e6778338e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 8 Jul 2024 21:12:25 -0400
Subject: [PATCH 2/2] wireplumber: update to 0.5.5
---
srcpkgs/wireplumber/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index f999bc3b098310..d85b6b931e6a56 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,6 +1,6 @@
# Template file for 'wireplumber'
pkgname=wireplumber
-version=0.5.3
+version=0.5.5
revision=1
build_style=meson
build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pipewire.pages.freedesktop.org/wireplumber"
changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=626cfaf090efb5359454a30c9b288e068ea04289b341dc4d5c7064fd6b1427b4
+checksum=49075cd5c2f4820839a9e69d4a22386bc280c62b92c153af9be39ca439d45a09
provides="pipewire-session-manager-0_1"
post_install() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] pipewire: update to 1.2.0; wireplumber: update to 0.5.5
2024-07-09 1:13 [PR PATCH] pipewire: update to 1.2.0; wireplumber: update to 0.5.5 cinerea0
@ 2024-07-10 22:25 ` cinerea0
2024-07-10 22:47 ` [PR PATCH] [Merged]: " cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: cinerea0 @ 2024-07-10 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages pw
https://github.com/void-linux/void-packages/pull/51159
pipewire: update to 1.2.0; wireplumber: update to 0.5.5
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/51159.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pw-51159.patch --]
[-- Type: text/x-diff, Size: 7708 bytes --]
From b5a8b75311983a357d76dda7f7ed536510e914a8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 10 Jul 2024 18:25:22 -0400
Subject: [PATCH 1/2] pipewire: update to 1.2.0
---
.../patches/fix-conflicting-meson-deps.patch | 79 +++++++++++++++++++
srcpkgs/pipewire/template | 8 +-
srcpkgs/pipewire/update | 1 -
3 files changed, 84 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch
delete mode 100644 srcpkgs/pipewire/update
diff --git a/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch b/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch
new file mode 100644
index 00000000000000..ab102a606c8272
--- /dev/null
+++ b/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch
@@ -0,0 +1,79 @@
+From b5f031bc15524bbfde577290ad9bbadeab77ae8b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 30 Jun 2024 13:44:06 -0400
+Subject: [PATCH] meson: fix conflicting use of feature-based dependency
+ lookups
+
+When spa-plugins is enabled, the gio-2.0 global dependency is
+overwritten.
+
+When bluez support is enabled, OR when gsettings is enabled, the gio-2.0
+dependency is then detected as found. This means that
+pipewire-module-protocol-pulse can end up enabling gsettings support
+even if it has been forcibly turned off.
+
+Rename the meson variables to ensure they are looked up separately.
+---
+ meson.build | 6 +++---
+ spa/meson.build | 6 +++---
+ src/modules/meson.build | 4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2607c5c8f4..38b6b59d00 100644
+--- a/meson.build
++++ b/meson.build
+@@ -346,9 +346,9 @@ summary({'GLib-2.0 (Flatpak support)': glib2_dep.found()}, bool_yn: true, sectio
+ flatpak_support = glib2_dep.found()
+ cdata.set('HAVE_GLIB2', flatpak_support)
+
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+-summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+-if not gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
++gsettings_gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
++summary({'GIO (GSettings)': gsettings_gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++if not gsettings_gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
+ error('`gsettings-pulse-schema` is enabled but `gio` was not found.')
+ endif
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 67e4b5c506..cf25609dab 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -47,12 +47,12 @@ if get_option('spa-plugins').allowed()
+ summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend')
+
+ bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5'))
+- gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
+- gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
++ bluez_gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
++ bluez_gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
+ bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5'))
+ sbc_dep = dependency('sbc', required: get_option('bluez5'))
+ summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+- bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ]
++ bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, bluez_gio_dep, bluez_gio_unix_dep ]
+ bluez_deps_found = get_option('bluez5').allowed()
+ foreach dep: bluez5_deps
+ if get_option('bluez5').enabled() and not dep.found()
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index ceaa7013d9..3f400f0877 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -433,11 +433,11 @@ if avahi_dep.found()
+ cdata.set('HAVE_AVAHI', true)
+ endif
+
+-if gio_dep.found()
++if gsettings_gio_dep.found()
+ pipewire_module_protocol_pulse_sources += [
+ 'module-protocol-pulse/modules/module-gsettings.c',
+ ]
+- pipewire_module_protocol_pulse_deps += gio_dep
++ pipewire_module_protocol_pulse_deps += gsettings_gio_dep
+ cdata.set('HAVE_GIO', true)
+ if get_option('gsettings-pulse-schema').enabled()
+ install_data(['module-protocol-pulse/modules/org.freedesktop.pulseaudio.gschema.xml'],
+--
+GitLab
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 761a174a52bb9a..425e19891ed9b4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
# Template file for 'pipewire'
pkgname=pipewire
-version=1.0.7
+version=1.2.0
revision=1
build_style=meson
configure_args="
@@ -15,6 +15,8 @@ configure_args="
-Dudevrulesdir=/usr/lib/udev/rules.d
-Dvulkan=enabled
-Dbluez5-codec-lc3plus=disabled
+ -Dgsettings-pulse-schema=disabled
+ -Dsnap=disabled
-Dsession-managers=[]
-Drlimits-match=@_pipewire
$(vopt_feature ffado libffado)
@@ -27,7 +29,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
vulkan-loader-devel pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
libmysofa-devel opus-devel $(vopt_if ffado libffado-devel) liblc3-devel
- $(vopt_if selinux libselinux-devel) libcamera-devel"
+ $(vopt_if selinux libselinux-devel) libcamera-devel libcap-devel"
depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
@@ -38,7 +40,7 @@ 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=9c45eef65e66224804ae8671849452a7f221e913813072b3aad346f20df666a8
+checksum=477eb1245a66a982345404b57fab1b9f402c12292047c4d9bea90d6445374653
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
system_accounts="_pipewire"
diff --git a/srcpkgs/pipewire/update b/srcpkgs/pipewire/update
deleted file mode 100644
index 239ca88a92fbf8..00000000000000
--- a/srcpkgs/pipewire/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="1.1.*" # ignore v1.2 release candidates
From c23d3e21856357ea58892ca3c65cb424616596f0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 10 Jul 2024 18:25:37 -0400
Subject: [PATCH 2/2] wireplumber: update to 0.5.5
---
srcpkgs/wireplumber/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index f999bc3b098310..d85b6b931e6a56 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,6 +1,6 @@
# Template file for 'wireplumber'
pkgname=wireplumber
-version=0.5.3
+version=0.5.5
revision=1
build_style=meson
build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pipewire.pages.freedesktop.org/wireplumber"
changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=626cfaf090efb5359454a30c9b288e068ea04289b341dc4d5c7064fd6b1427b4
+checksum=49075cd5c2f4820839a9e69d4a22386bc280c62b92c153af9be39ca439d45a09
provides="pipewire-session-manager-0_1"
post_install() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: pipewire: update to 1.2.0; wireplumber: update to 0.5.5
2024-07-09 1:13 [PR PATCH] pipewire: update to 1.2.0; wireplumber: update to 0.5.5 cinerea0
2024-07-10 22:25 ` [PR PATCH] [Updated] " cinerea0
@ 2024-07-10 22:47 ` cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: cinerea0 @ 2024-07-10 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
There's a merged pull request on the void-packages repository
pipewire: update to 1.2.0; wireplumber: update to 0.5.5
https://github.com/void-linux/void-packages/pull/51159
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-10 22:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-09 1:13 [PR PATCH] pipewire: update to 1.2.0; wireplumber: update to 0.5.5 cinerea0
2024-07-10 22:25 ` [PR PATCH] [Updated] " cinerea0
2024-07-10 22:47 ` [PR PATCH] [Merged]: " cinerea0
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).