summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor V. Kovalenko <igor.v.kovalenko@gmail.com>2022-12-03 09:31:05 +0300
committerSam James <sam@gentoo.org>2022-12-03 07:48:08 +0000
commitec06180714fd70296f1ac141438e2a39de624c97 (patch)
tree1796f051c5e2f2d794ed3581ecd9bd7213b9aee7 /media-sound
parentdev-db/firebird: incorporate suggestions to 3.0.10 (diff)
downloadgentoo-ec06180714fd70296f1ac141438e2a39de624c97.tar.gz
gentoo-ec06180714fd70296f1ac141438e2a39de624c97.tar.bz2
gentoo-ec06180714fd70296f1ac141438e2a39de624c97.zip
media-sound/pulseaudio-daemon: Move qpaeq to daemon build
Upstream commit 07a9fcefbab049d66cb174ca2c9b91fecc444c5b Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28519 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch36
-rw-r--r--media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r2.ebuild (renamed from media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r1.ebuild)1
2 files changed, 37 insertions, 0 deletions
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch
new file mode 100644
index 000000000000..d3943bf10a49
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch
@@ -0,0 +1,36 @@
+commit 07a9fcefbab049d66cb174ca2c9b91fecc444c5b
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date: Sat Jul 9 09:12:38 2022 +0300
+
+ build-sys: meson: Move qpaeq to daemon build
+
+ Equalizer control requires server modules only available when daemon is built.
+ Move qpaeq script to be installed together with daemon.
+
+ Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/734>
+
+diff --git a/src/utils/meson.build b/src/utils/meson.build
+index 28e1fc10a..8496d0bc5 100644
+--- a/src/utils/meson.build
++++ b/src/utils/meson.build
+@@ -72,6 +72,10 @@ if get_option('daemon')
+ c_args : pa_c_args,
+ )
+ endif
++
++ if dbus_dep.found() and fftw_dep.found()
++ install_data('qpaeq', install_dir : bindir)
++ endif
+ endif
+
+ if get_option('client')
+@@ -117,9 +121,5 @@ if get_option('client')
+ )
+ endif
+
+- if dbus_dep.found() and fftw_dep.found()
+- install_data('qpaeq', install_dir : bindir)
+- endif
+-
+ install_data('pa-info', install_dir : bindir)
+ endif
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r2.ebuild
index 8ccca2d552d5..a358f8c2235d 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r2.ebuild
@@ -167,6 +167,7 @@ PATCHES=(
"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
"${FILESDIR}"/pulseaudio-16.1-module-combine-sink-load-crash.patch
"${FILESDIR}"/pulseaudio-16.1-module-combine-sink-unload-crash.patch
+ "${FILESDIR}"/pulseaudio-16.1-move-qpaeq-to-daemon.patch
)
src_prepare() {