diff options
| author |   Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2021-08-18 22:31:59 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-08-18 21:10:45 +0100 |
| commit | 148c7751fcab10497a6a780ab15c48bd782f2b56 (patch) | |
| tree | f97ba0906dbb8b3943455b185c685bac8f330c0c | |
| parent | sys-kernel/gentoo-kernel-bin: Bump to 5.4.142 (diff) | |
| download | gentoo-148c7751fcab10497a6a780ab15c48bd782f2b56.tar.gz gentoo-148c7751fcab10497a6a780ab15c48bd782f2b56.tar.bz2 gentoo-148c7751fcab10497a6a780ab15c48bd782f2b56.zip | |
media-sound/pulseaudio: Require xice, xsm and xtst for daemon only
Backport change 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5 from upstream master.
Closes: https://bugs.gentoo.org/806052
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22020
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch | 25 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-15.0.ebuild | 4 |
2 files changed, 29 insertions, 0 deletions
diff --git a/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch new file mode 100644 index 000000000000..f3df62031d34 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/806052 + +commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5 +Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> +Date: Tue Aug 3 09:43:32 2021 +0300 + + build-sys: meson: Require xice, xsm and xtst for daemon only + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613> + +--- a/meson.build ++++ b/meson.build +@@ -681,9 +681,9 @@ endif + x11_dep = dependency('x11-xcb', required : get_option('x11')) + if x11_dep.found() + xcb_dep = dependency('xcb', required : true, version : '>= 1.6') +- ice_dep = dependency('ice', required : true) +- sm_dep = dependency('sm', required : true) +- xtst_dep = dependency('xtst', required : true) ++ ice_dep = dependency('ice', required : get_option('daemon')) ++ sm_dep = dependency('sm', required : get_option('daemon')) ++ xtst_dep = dependency('xtst', required : get_option('daemon')) + cdata.set('HAVE_X11', 1) + if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep) + cdata.set('HAVE_XSETIOERROREXITHANDLER', 1) diff --git a/media-sound/pulseaudio/pulseaudio-15.0.ebuild b/media-sound/pulseaudio/pulseaudio-15.0.ebuild index b3e74c86cb1e..a28a050fb041 100644 --- a/media-sound/pulseaudio/pulseaudio-15.0.ebuild +++ b/media-sound/pulseaudio/pulseaudio-15.0.ebuild @@ -165,6 +165,10 @@ DOCS=( NEWS README ) S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch +) + src_prepare() { default |