From 0706fc6986773f4e4d391deff4ad5143c464ea4e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:44:59 +0000 Subject: Revert "gentoo resync : 24.03.2019" This reverts commit aa3411e241a201d53a2689766fe419f2756819f3. --- media-sound/pulseaudio/Manifest | 3 +- media-sound/pulseaudio/metadata.xml | 1 - media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild | 360 ----------------------- 3 files changed, 1 insertion(+), 363 deletions(-) delete mode 100644 media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild (limited to 'media-sound/pulseaudio') diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index c3f36e733cec..fa02b2ed2014 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -4,6 +4,5 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e -EBUILD pulseaudio-12.2-r1.ebuild 11544 BLAKE2B 215b686f4ab5959e3c932cc1e3c873a6522161581cfff84ddc7c2a308022366c240a15246c2cf3ef637b5429f3a06eed327aa3cb59cc146be90d0cddff2d828a SHA512 1b7017e25805d304280fd8ce6c0c4f5a70da4af5341fc92a81f03c573ff5a2c07d2036ab49bc378de25d0416f06e1fbf05d31517b9ddfd4d22b50348323d8fc0 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21 -MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31 +MISC metadata.xml 3208 BLAKE2B c403977ebc346d7bb9c3749225bcc31324a70ed5e737eda2c7d2b6f6d3de9270425ba0aa605dd8a592f89ff249b5caecaff85a2482c0c008412c1eefc5736db1 SHA512 32ac643d5de46c26075f5539bb2feb6fdece76e88ea591e85768ecef41ec8db577577c084aa80e33ca96670eb98858474d3a4c5a8ed78801b4336fecbed89260 diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml index 38993dac40af..a0d16e0c7810 100644 --- a/media-sound/pulseaudio/metadata.xml +++ b/media-sound/pulseaudio/metadata.xml @@ -17,7 +17,6 @@ PulseAudio plugin enabled. This ensures that clients supporting ALSA only will use PulseAudio. - Use sys-auth/elogind for giving each session a PA client Ensure gnome-base/gconf is present for pulseaudio GConf to GSettings module automatic migration (keeping the user configuration) diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild deleted file mode 100644 index daf9be7e703f..000000000000 --- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal - -DESCRIPTION="A networked sound server with an advanced plugin system" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" -SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" - -# libpulse-simple and libpulse link to libpulse-core; this is daemon's -# library and can link to gdbm and other GPL-only libraries. In this -# cases, we have a fully GPL-2 package. Leaving the rest of the -# GPL-forcing USE flags for those who use them. -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" - -# +alsa-plugin as discussed in bug #519530 -IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf -+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon -ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test -+udev +webrtc-aec +X zeroconf" - -# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac -REQUIRED_USE=" - ?? ( elogind systemd ) - bluetooth? ( dbus ) - equalizer? ( dbus ) - ofono-headset? ( bluetooth ) - native-headset? ( bluetooth ) - realtime? ( dbus ) - udev? ( || ( alsa oss ) ) -" - -# libpcre needed in some cases, bug #472228 -CDEPEND=" - || ( - elibc_glibc? ( virtual/libc ) - elibc_uclibc? ( virtual/libc ) - dev-libs/libpcre - ) - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - X? ( - >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - ) - caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) - alsa? ( >=media-libs/alsa-lib-1.0.19 ) - glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] ) - zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) - jack? ( virtual/jack ) - tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) - lirc? ( app-misc/lirc ) - dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - bluetooth? ( - >=net-wireless/bluez-5 - >=sys-apps/dbus-1.0.0 - media-libs/sbc - ) - asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/udev-143[hwdb(+)] ) - equalizer? ( sci-libs/fftw:3.0 ) - ofono-headset? ( >=net-misc/ofono-1.13 ) - orc? ( >=dev-lang/orc-0.4.15 ) - sox? ( >=media-libs/soxr-0.1.1 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - media-libs/speexdsp - gdbm? ( sys-libs/gdbm:= ) - webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - dev-libs/libltdl:0 - selinux? ( sec-policy/selinux-pulseaudio ) -" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon - -RDEPEND="${CDEPEND} - realtime? ( sys-auth/rtkit ) - gconf? ( >=gnome-base/gconf-3.2.6 ) -" - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( >=dev-libs/check-0.9.10 ) - X? ( - x11-base/xorg-proto - >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] - ) - dev-libs/libatomic_ops - virtual/pkgconfig - system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) - dev-util/intltool - >=sys-devel/gettext-0.18.1 -" -# This is a PDEPEND to avoid a circular dep -PDEPEND=" - alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) ) -" - -# alsa-utils dep is for the alsasound init.d script (see bug #155707) -# bluez dep is for the bluetooth init.d script -# PyQt5 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( >=net-wireless/bluez-5 ) - ) -" - -PATCHES=( - "${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894 -) - -pkg_pretend() { - CONFIG_CHECK="~HIGH_RES_TIMERS" - WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" - check_extra_config - - if linux_config_exists; then - local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) - if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then - ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" - ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" - fi - fi -} - -pkg_setup() { - linux-info_pkg_setup - gnome2_environment_reset #543364 - - enewgroup audio 18 # Just make sure it exists - - if use system-wide; then - enewgroup pulse-access - enewgroup pulse - enewuser pulse -1 -1 /var/run/pulse pulse,audio - fi -} - -src_prepare() { - default - - # Skip test that cannot work with sandbox, bug #501846 - sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die - sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die -} - -multilib_src_configure() { - local myconf=( - --disable-adrian-aec - --disable-bluez4 - --disable-esound - --disable-gconf - --disable-solaris - --enable-largefile - --localstatedir="${EPREFIX}"/var - --with-systemduserunitdir=$(systemd_get_userunitdir) - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - $(multilib_native_use_enable alsa) - $(multilib_native_use_enable bluetooth bluez5) - $(multilib_native_use_enable glib gsettings) - $(multilib_native_use_enable gtk gtk3) - $(multilib_native_use_enable jack) - $(multilib_native_use_enable libsamplerate samplerate) - $(multilib_native_use_enable lirc) - $(multilib_native_use_enable orc) - $(multilib_native_use_enable oss oss-output) - $(multilib_native_use_enable ssl openssl) - # tests involve random modules, so just do them for the native - $(multilib_native_use_enable test default-build-tests) - $(multilib_native_use_enable udev) - $(multilib_native_use_enable webrtc-aec) - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_use_with equalizer fftw) - $(multilib_native_use_with sox soxr) - $(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple') - $(use_enable glib glib2) - $(use_enable asyncns) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable dbus) - $(use_enable X x11) - $(use_enable systemd systemd-daemon) - # systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port - $(use_enable systemd systemd-login) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_with caps) - ) - - if use elogind && multilib_is_native_abi; then - myconf+=( - --enable-systemd-login - SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` - ) - fi - - if use bluetooth; then - myconf+=( - $(multilib_native_use_enable native-headset bluez5-native-headset) - $(multilib_native_use_enable ofono-headset bluez5-ofono-headset) - ) - fi - - if ! multilib_is_native_abi; then - myconf+=( - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - else - # 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 - myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' ) - fi - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - use doc && emake doxygen - else - local targets=( libpulse.la libpulsedsp.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src ${targets[*]} - fi -} - -multilib_src_test() { - # We avoid running the toplevel check target because that will run - # po/'s tests too, and they are broken. Officially, it should work - # with intltool 0.41, but that doesn't look like a stable release. - if multilib_is_native_abi; then - emake -C src check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install - if use doc ; then - docinto html - dodoc -r doxygen/html/ - fi - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake DESTDIR="${D}" install-pkgconfigDATA - emake DESTDIR="${D}" -C src \ - install-libLTLIBRARIES \ - install-padsplibLTLIBRARIES \ - lib_LTLIBRARIES="${targets[*]}" \ - install-pulseincludeHEADERS - fi -} - -multilib_src_install_all() { - if use system-wide; then - newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio - - use_define() { - local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} - - use "$1" && echo "-D$define" || echo "-U$define" - } - - unifdef $(use_define zeroconf AVAHI) \ - $(use_define alsa) \ - $(use_define bluetooth) \ - $(use_define udev) \ - "${FILESDIR}/pulseaudio.init.d-5" \ - > "${T}/pulseaudio" - - doinitd "${T}/pulseaudio" - - systemd_dounit "${FILESDIR}/${PN}.service" - - # We need /var/run/pulse, bug #442852 - systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - else - # Prevent warnings when system-wide is not used, bug #447694 - if use dbus ; then - rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die - fi - fi - - if use zeroconf ; then - sed -e '/module-zeroconf-publish/s:^#::' \ - -i "${ED%/}/etc/pulse/default.pa" || die - fi - - dodoc NEWS README todo - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die -} - -pkg_postinst() { - gnome2_schemas_update - if use system-wide; then - elog "You have enabled the 'system-wide' USE flag for pulseaudio." - elog "This mode should only be used on headless servers, embedded systems," - elog "or thin clients. It will usually require manual configuration, and is" - elog "incompatible with many expected pulseaudio features." - elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." - elog "For more information, see" - elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" - elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" - elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" - fi - - if use equalizer && ! use qt5; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag." - elog "This will build the equalizer module, but the 'qpaeq' tool" - elog "which is required to set equalizer levels will not work." - fi - - if use equalizer && use qt5; then - elog "You will need to load some extra modules to make qpaeq work." - elog "You can do that by adding the following two lines in" - elog "/etc/pulse/default.pa and restarting pulseaudio:" - elog "load-module module-equalizer-sink" - elog "load-module module-dbus-protocol" - fi - - if use native-headset && use ofono-headset; then - elog "You have enabled both native and ofono headset profiles. The runtime decision" - elog "which to use is done via the 'headset' argument of module-bluetooth-discover." - fi - - if use libsamplerate; then - elog "The libsamplerate based resamplers are now deprecated, because they offer no" - elog "particular advantage over speex. Upstream suggests disabling them." - fi -} - -pkg_postrm() { - gnome2_schemas_update -} -- cgit v1.2.3