commit: a79464d7a2a35772d1829b21a84a0778b293aa63 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 9 19:38:10 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 10 10:18:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79464d7
media-libs/libpulse: drop 16.1-r2, 16.99.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/libpulse/Manifest | 2 - .../files/pulseaudio-16.1-memfd-cleanup.patch | 28 --- ...ulseaudio-16.1-proplist-util-without-gdkx.patch | 42 ---- .../files/pulseaudio-16.99.1-memfd-compat.patch | 24 --- media-libs/libpulse/libpulse-16.1-r2.ebuild | 208 -------------------- media-libs/libpulse/libpulse-16.99.1.ebuild | 215 --------------------- 6 files changed, 519 deletions(-) diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest index 776caac18a80..42cd89ab8f99 100644 --- a/media-libs/libpulse/Manifest +++ b/media-libs/libpulse/Manifest @@ -1,3 +1 @@ -DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f -DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2 DIST pulseaudio-17.0.tar.xz 1566556 BLAKE2B 781ece3d507916aa681d3b0132689730a621b4d92e45f86570e4d2fdebc4c0025ebe7f7a05046545f9b26caca513e8975f12498fa314524bc67eacaea72842fa SHA512 be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97 diff --git a/media-libs/libpulse/files/pulseaudio-16.1-memfd-cleanup.patch b/media-libs/libpulse/files/pulseaudio-16.1-memfd-cleanup.patch deleted file mode 100644 index b24ab8943899..000000000000 --- a/media-libs/libpulse/files/pulseaudio-16.1-memfd-cleanup.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit e650c2b33e4fefc0589751b3958bd3b5d3b423ac -Author: Alistair Leslie-Hughes <[email protected]> -Date: Thu Nov 3 09:22:48 2022 +1100 - - Ensure fds are closed when exec functions are used. - - When usng shm_open, FD_CLOEXEC is set explicitly. - - However when using memfd_create, we must pass the MFD_CLOEXEC flag - to ensure the same fcntl value (FD_CLOEXEC) is set. - - Fixes #1394 - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/751> - -diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c -index e464f6bce..ff54dcb59 100644 ---- a/src/pulsecore/shm.c -+++ b/src/pulsecore/shm.c -@@ -164,7 +164,7 @@ static int sharedmem_create(pa_shm *m, pa_mem_type_t type, size_t size, mode_t m - #endif - #ifdef HAVE_MEMFD - case PA_MEM_TYPE_SHARED_MEMFD: -- fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING); -+ fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING|MFD_CLOEXEC); - break; - #endif - default: diff --git a/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch b/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch deleted file mode 100644 index a5e025ccb4dc..000000000000 --- a/media-libs/libpulse/files/pulseaudio-16.1-proplist-util-without-gdkx.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 89ce6321bd19452097392ddfb416bc51a280b63e -Author: Mart Raudsepp <[email protected]> -Date: Wed Nov 30 09:25:22 2022 +0200 - - proplist-util: Don't assume gdkx is there as gtk could be built without it - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/757> - -diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c -index 16ea9e006..1330ef5ef 100644 ---- a/src/pulsecore/proplist-util.c -+++ b/src/pulsecore/proplist-util.c -@@ -51,10 +51,12 @@ static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_applicati - #if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF) - #pragma GCC diagnostic ignored "-Wstrict-prototypes" - #include <gtk/gtk.h> --#include <gdk/gdkx.h> - static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name); -+#ifdef GDK_WINDOWING_X11 -+#include <gdk/gdkx.h> - static Display *_gdk_display PA_GCC_WEAKREF(gdk_display); - #endif -+#endif - - #include "proplist-util.h" - -@@ -89,6 +91,7 @@ static void add_gtk_properties(pa_proplist *p) { - pa_proplist_sets(p, PA_PROP_APPLICATION_ICON_NAME, t); - } - -+#ifdef GDK_WINDOWING_X11 - if (!pa_proplist_contains(p, PA_PROP_WINDOW_X11_DISPLAY)) - if (&_gdk_display && _gdk_display) { - const char *t; -@@ -99,6 +102,7 @@ static void add_gtk_properties(pa_proplist *p) { - pa_proplist_sets(p, PA_PROP_WINDOW_X11_DISPLAY, t); - } - -+#endif - #endif - } - diff --git a/media-libs/libpulse/files/pulseaudio-16.99.1-memfd-compat.patch b/media-libs/libpulse/files/pulseaudio-16.99.1-memfd-compat.patch deleted file mode 100644 index 77af0ac915f6..000000000000 --- a/media-libs/libpulse/files/pulseaudio-16.99.1-memfd-compat.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 421cf15486eea1b52f10e2b0be305018fee8c285 -Author: Rudi Heitbaum <[email protected]> -Date: Sun Aug 13 09:37:32 2023 +0000 - - shm: allow for older versions of Linux without MFD_NOEXEC_SEAL - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/794> - -diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c -index 4247b0921..694f971b4 100644 ---- a/src/pulsecore/shm.c -+++ b/src/pulsecore/shm.c -@@ -164,7 +164,11 @@ static int sharedmem_create(pa_shm *m, pa_mem_type_t type, size_t size, mode_t m - #endif - #ifdef HAVE_MEMFD - case PA_MEM_TYPE_SHARED_MEMFD: -+ /* For linux >= 6.3 create fd with MFD_NOEXEC_SEAL flag */ - fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING|MFD_CLOEXEC|MFD_NOEXEC_SEAL); -+ /* Retry creating fd without MFD_NOEXEC_SEAL to support linux < 6.3 */ -+ if (fd < 0) -+ fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING|MFD_CLOEXEC); - break; - #endif - default: diff --git a/media-libs/libpulse/libpulse-16.1-r2.ebuild b/media-libs/libpulse/libpulse-16.1-r2.ebuild deleted file mode 100644 index 1a552c4be5cb..000000000000 --- a/media-libs/libpulse/libpulse-16.1-r2.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PV="${PV/_pre*}" -MY_P="pulseaudio-${MY_PV}" -inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev - -DESCRIPTION="Libraries for PulseAudio clients" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"; - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_BRANCH="master" - EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"; -else - SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-2.1+" - -SLOT="0" -IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X" -RESTRICT="!test? ( test )" - -# NOTE: libpcre needed in some cases, bug #472228 -# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too -RDEPEND=" - dev-libs/libatomic_ops - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] ) - elibc_mingw? ( dev-libs/libpcre:3 ) - glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - selinux? ( sec-policy/selinux-pulseaudio ) - systemd? ( sys-apps/systemd:= ) - valgrind? ( dev-debug/valgrind ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - ) - !<media-sound/pulseaudio-15.0-r100 -" - -DEPEND="${RDEPEND} - test? ( >=dev-libs/check-0.9.10 ) - X? ( x11-base/xorg-proto ) -" - -# pulseaudio ships a bundled xmltoman, which uses XML::Parser -BDEPEND=" - dev-lang/perl - dev-perl/XML-Parser - sys-devel/gettext - sys-devel/m4 - virtual/libiconv - virtual/libintl - virtual/pkgconfig - doc? ( app-text/doxygen ) -" -PDEPEND=" - || ( - media-video/pipewire[sound-server(+)] - media-sound/pulseaudio-daemon - media-sound/pulseaudio[daemon(+)] - ) -" - -DOCS=( NEWS README ) - -# patches merged upstream, to be removed with 16.2 or later bump -PATCHES=( - "${FILESDIR}"/pulseaudio-16.1-memfd-cleanup.patch - "${FILESDIR}"/pulseaudio-16.1-proplist-util-without-gdkx.patch -) - -src_prepare() { - default - - # disable autospawn by client - sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die - - gnome2_environment_reset -} - -multilib_src_configure() { - local emesonargs=( - --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 - $(meson_native_use_bool test tests) - -Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks - -Dstream-restore-clear-old-devices=true - -Drunning-from-build-tree=false - - # Paths - -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P} - -Dsystemduserunitdir=$(systemd_get_userunitdir) - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value - - # Optional features - -Dalsa=disabled - $(meson_feature asyncns) - -Davahi=disabled - -Dbluez5=disabled - -Dbluez5-gstreamer=disabled - -Dbluez5-native-headset=false - -Dbluez5-ofono-headset=false - $(meson_feature dbus) - -Delogind=disabled - -Dfftw=disabled - $(meson_feature glib) # WARNING: toggling this likely changes ABI - -Dgsettings=disabled - -Dgstreamer=disabled - $(meson_native_use_feature gtk) - -Dhal-compat=false - -Dipv6=true - -Djack=disabled - -Dlirc=disabled - -Dopenssl=disabled - -Dorc=disabled - -Doss-output=disabled - -Dsamplerate=disabled # Matches upstream - -Dsoxr=disabled - -Dspeex=disabled - $(meson_native_use_feature systemd) - -Dtcpwrap=disabled - -Dudev=disabled - $(meson_native_use_feature valgrind) - $(meson_feature X x11) - - # Echo cancellation - -Dadrian-aec=false - -Dwebrtc-aec=disabled - ) - - if multilib_is_native_abi; then - # Make padsp work for non-native ABI, supposedly only possible with glibc; - # this is used by /usr/bin/padsp that comes from native build, thus we need - # this argument for native build - if use elibc_glibc; then - emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' ) - fi - else - emesonargs+=( -Dman=false ) - if ! use elibc_glibc; then - # Non-glibc multilib is probably non-existent but just in case: - ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!" - fi - fi - - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile - - if multilib_is_native_abi; then - if use doc; then - einfo "Generating documentation ..." - meson_src_compile doxygen - fi - fi -} - -multilib_src_install() { - # The files referenced in the DOCS array do not exist in the multilib source directory, - # 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 ..." - docinto html - dodoc -r doxygen/html/. - fi - fi -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die -} - -pkg_postinst() { - optfeature_header "PulseAudio can be enhanced by installing the following:" - use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit -} diff --git a/media-libs/libpulse/libpulse-16.99.1.ebuild b/media-libs/libpulse/libpulse-16.99.1.ebuild deleted file mode 100644 index 833d72d57d8b..000000000000 --- a/media-libs/libpulse/libpulse-16.99.1.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PV="${PV/_pre*}" -MY_P="pulseaudio-${MY_PV}" -inherit bash-completion-r1 flag-o-matic gnome2-utils meson-multilib optfeature systemd toolchain-funcs udev - -DESCRIPTION="Libraries for PulseAudio clients" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"; - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_BRANCH="master" - EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"; -else - SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-2.1+" - -SLOT="0" -IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X" -RESTRICT="!test? ( test )" - -# NOTE: libpcre needed in some cases, bug #472228 -# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too -RDEPEND=" - dev-libs/libatomic_ops - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] ) - elibc_mingw? ( dev-libs/libpcre:3 ) - glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - selinux? ( sec-policy/selinux-pulseaudio ) - systemd? ( sys-apps/systemd:= ) - valgrind? ( dev-debug/valgrind ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - ) - !<media-sound/pulseaudio-16.1 - !<media-sound/pulseaudio-daemon-16.99.1 -" - -DEPEND="${RDEPEND} - test? ( >=dev-libs/check-0.9.10 ) - X? ( x11-base/xorg-proto ) -" - -# pulseaudio ships a bundled xmltoman, which uses XML::Parser -BDEPEND=" - dev-lang/perl - dev-perl/XML-Parser - sys-devel/gettext - sys-devel/m4 - virtual/libiconv - virtual/libintl - virtual/pkgconfig - doc? ( app-text/doxygen ) -" -PDEPEND=" - || ( - media-video/pipewire[sound-server(+)] - media-sound/pulseaudio-daemon - media-sound/pulseaudio[daemon(+)] - ) -" - -DOCS=( NEWS README ) - -# patches merged upstream, to be removed with 16.99.2 or later bump -PATCHES=( - "${FILESDIR}"/pulseaudio-16.99.1-memfd-compat.patch -) - -src_prepare() { - default - - # disable autospawn by client - sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die - - gnome2_environment_reset -} - -multilib_src_configure() { - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - local emesonargs=( - --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 - $(meson_native_use_bool test tests) - -Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks - -Dstream-restore-clear-old-devices=true - -Drunning-from-build-tree=false - - # Paths - -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P} - -Dsystemduserunitdir=$(systemd_get_userunitdir) - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value - - # Optional features - -Dalsa=disabled - $(meson_feature asyncns) - -Davahi=disabled - -Dbluez5=disabled - -Dbluez5-gstreamer=disabled - -Dbluez5-native-headset=false - -Dbluez5-ofono-headset=false - $(meson_feature dbus) - -Delogind=disabled - -Dfftw=disabled - $(meson_feature glib) # WARNING: toggling this likely changes ABI - -Dgsettings=disabled - -Dgstreamer=disabled - $(meson_native_use_feature gtk) - -Dhal-compat=false - -Dipv6=true - -Djack=disabled - -Dlirc=disabled - -Dopenssl=disabled - -Dorc=disabled - -Doss-output=disabled - -Dsamplerate=disabled # Matches upstream - -Dsoxr=disabled - -Dspeex=disabled - $(meson_native_use_feature systemd) - -Dtcpwrap=disabled - -Dudev=disabled - $(meson_native_use_feature valgrind) - $(meson_feature X x11) - - # Echo cancellation - -Dadrian-aec=false - -Dwebrtc-aec=disabled - ) - - if multilib_is_native_abi; then - # Make padsp work for non-native ABI, supposedly only possible with glibc; - # this is used by /usr/bin/padsp that comes from native build, thus we need - # this argument for native build - if use elibc_glibc; then - emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' ) - fi - else - emesonargs+=( -Dman=false ) - if ! use elibc_glibc; then - # Non-glibc multilib is probably non-existent but just in case: - ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!" - fi - fi - - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile - - if multilib_is_native_abi; then - if use doc; then - einfo "Generating documentation ..." - meson_src_compile doxygen - fi - fi -} - -multilib_src_install() { - # The files referenced in the DOCS array do not exist in the multilib source directory, - # 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 ..." - docinto html - dodoc -r doxygen/html/. - fi - fi -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die -} - -pkg_postinst() { - optfeature_header "PulseAudio can be enhanced by installing the following:" - use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit -}
