media-libs/libpipewire : version bump

3 files changed, 30 insertions, 47 deletions

diff --git a/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch
deleted file mode 100644
index ccc89f13..00000000
--- a/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/daemon/pipewire.conf.in	2021-06-30 22:22:09.520402459 +0200
-+++ b/src/daemon/pipewire.conf.in	2021-06-30 22:22:30.620404999 +0200
-@@ -234,12 +234,12 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
-+    { path = "@session_manager_path@"  args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
-     # It can be interesting to start another daemon here that listens
-     # on another address with the -a option (eg. -a tcp:4713).
-     #
--    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
diff --git a/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
deleted file mode 100644
index d8496bc5..00000000
--- a/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Fri, 21 May 2021 10:32:52 +0200
-Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
-
-This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
-
-Doesn't apply to us.
-
-Bug: https://bugs.gentoo.org/785634
----
- spa/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/meson.build b/spa/meson.build
-index e13802e94..885b25405 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
-     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
-     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
-     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--- 
-2.32.0
-
diff --git a/media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch b/media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
new file mode 100644
index 00000000..93c3ffe3
--- /dev/null
+++ b/media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
@@ -0,0 +1,30 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch
+
+From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Thu, 6 Jan 2022 12:17:10 +0000
+Subject: [PATCH] systemd: Add systemd-system-unit-dir override
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -179,6 +179,9 @@ option('udev',
+ option('udevrulesdir',
+        type : 'string',
+        description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')
++option('systemd-system-unit-dir',
++       type : 'string',
++       description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)')
+ option('systemd-user-unit-dir',
+        type : 'string',
+        description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')
+--- a/src/daemon/systemd/system/meson.build
++++ b/src/daemon/systemd/system/meson.build
+@@ -1,4 +1,7 @@
+ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix])
++if get_option('systemd-system-unit-dir') != ''
++  systemd_system_services_dir = get_option('systemd-system-unit-dir')
++endif
+ 
+ install_data(sources : 'pipewire.socket',
+              install_dir : systemd_system_services_dir)
+GitLab