diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /media-libs/libpulse | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'media-libs/libpulse')
-rw-r--r-- | media-libs/libpulse/Manifest | 6 | ||||
-rw-r--r-- | media-libs/libpulse/files/15.0-no-aec.patch | 45 | ||||
-rw-r--r-- | media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch | 25 | ||||
-rw-r--r-- | media-libs/libpulse/libpulse-15.99.1.ebuild (renamed from media-libs/libpulse/libpulse-15.0.ebuild) | 16 |
4 files changed, 14 insertions, 78 deletions
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest index ea7f3fbbae5e..590d76b6f770 100644 --- a/media-libs/libpulse/Manifest +++ b/media-libs/libpulse/Manifest @@ -1,5 +1,3 @@ -AUX 15.0-no-aec.patch 1709 BLAKE2B 0e31e8a4595525905163453b5f37751aecd63006c791005a74de259958b72be0b1e0e6a4597c839e84b7297c5122c0d0d3f4ccada143a28174a57797baa22a90 SHA512 5547d1d400967dffb868109ff6ebb51a723338d94f6da0b4ff18cb021b898469ef11f00fceddc1afe51643ad13443fc51ee26f3096f2dbd1626710c5895f8e58 -AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0 -DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833 -EBUILD libpulse-15.0.ebuild 5133 BLAKE2B 7f783ab29826f04a04d1c286911debca9a8bd76934d862f97d8e7802f49cc79babb8f2917c1c7166806f48d555807a8d02e2cbaf4c08e1a9936dc9a4e5b2deb1 SHA512 eeca206d17f0c826c35d893d5cc85d74591cf83130da2ea5e0e53d91e5dca3aa0c389ef65c494339f1e1c42b5374c65895366e79594df03435659899e2106375 +DIST pulseaudio-15.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5 +EBUILD libpulse-15.99.1.ebuild 5549 BLAKE2B 65717b18f084134215884dd2f1580bb5fb242c757a1ad30e75724d517a585600168bf5023e8701a9c0e423b22ecb651e442398d972e25f6849d5e37ccc77adc7 SHA512 300f4e11a6e521ccb9fcad128e0aa17d189aba1367ce48f63c7d805723426ef1ac9aef38e15eeed647133d7df6743c06eb2073fd905209ac43ee9d7611f85272 MISC metadata.xml 622 BLAKE2B 4d143ef69b028fc7668d69fca9cae2b57a2c7e654d415807142098bd1a764e57b335280426d4dccaf2b1a8834bb7f2f18d07148539f0b00266c9851f45881a36 SHA512 efefb947045f47d0e5ddfd8c6a2a575ec2b51165a71b6cba9667e82c86265427d0832cb4f14f0f783e2d1d5261bf453f6730a452a9521b1c88e9989733e1402f diff --git a/media-libs/libpulse/files/15.0-no-aec.patch b/media-libs/libpulse/files/15.0-no-aec.patch deleted file mode 100644 index bd0b4d58b789..000000000000 --- a/media-libs/libpulse/files/15.0-no-aec.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4ea50aa41ff0131b380aef97623be578b702cac7 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <mart@leio.tech> -Date: Fri, 24 Sep 2021 00:02:40 +0300 -Subject: [PATCH] build-sys: meson: Relax sanity checks for daemonless builds - -Echo canceller, udev and speex resampling is only used by the daemon, so -don't error or warn about those in -Ddaemon=false builds. ---- - meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index d7e468cab..63ed62342 100644 ---- a/meson.build -+++ b/meson.build -@@ -961,7 +961,7 @@ message('\n '.join(summary)) - - # Sanity checks - --if not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec') -+if get_option('daemon') and not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec') - error('At least one echo canceller implementation must be available!') - endif - -@@ -981,7 +981,7 @@ if host_machine.system() != 'windows' - ] - warning('\n' + '\n'.join(message)) - endif -- if host_machine.system() == 'linux' and not udev_dep.found() -+ if host_machine.system() == 'linux' and not udev_dep.found() and get_option('daemon') - message = [ - 'You do not have udev support enabled. It is strongly recommended', - 'that you enable udev support if your platform supports it as it is', -@@ -990,7 +990,7 @@ if host_machine.system() != 'windows' - ] - warning('\n' + '\n'.join(message)) - endif -- if not speex_dep.found() -+ if not speex_dep.found() and get_option('daemon') - message = [ - 'You do not have speex support enabled. It is strongly recommended', - 'that you enable speex support if your platform supports it as it is', --- -2.32.0 - diff --git a/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch deleted file mode 100644 index f3df62031d34..000000000000 --- a/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-libs/libpulse/libpulse-15.0.ebuild b/media-libs/libpulse/libpulse-15.99.1.ebuild index 44b59893433b..357eea6b8537 100644 --- a/media-libs/libpulse/libpulse-15.0.ebuild +++ b/media-libs/libpulse/libpulse-15.99.1.ebuild @@ -5,8 +5,7 @@ EAPI="7" MY_PV="${PV/_pre*}" MY_P="pulseaudio-${MY_PV}" - -inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev +inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev DESCRIPTION="Libraries for PulseAudio clients" HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" @@ -71,9 +70,8 @@ BDEPEND=" DOCS=( NEWS README ) +# patches merged upstream, to be removed with 16.0 bump PATCHES=( - "${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch - "${FILESDIR}"/${PV}-no-aec.patch ) src_prepare() { @@ -87,6 +85,7 @@ multilib_src_configure() { --localstatedir="${EPREFIX}"/var -Ddaemon=false + -Dclient=true $(meson_native_use_bool doc doxygen) -Dgcov=false # tests involve random modules, so just do them for the native # TODO: tests should run always @@ -171,6 +170,15 @@ multilib_src_install() { # therefore clear the variable when calling the function that will access it. DOCS= meson_src_install + # Upstream installs 'pactl' if client is built, with all symlinks except for + # 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built. + # This trips QA warning, workaround: + # - install missing aliases in media-libs/libpulse (client build) + # - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build) + bashcomp_alias pactl pulseaudio + bashcomp_alias pactl pacmd + bashcomp_alias pactl pasuspender + if multilib_is_native_abi; then if use doc; then einfo "Installing documentation ..." |