From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F5E6138334 for ; Mon, 11 Jun 2018 03:59:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F7D4E090F; Mon, 11 Jun 2018 03:58:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15385E090F for ; Mon, 11 Jun 2018 03:58:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDC43335C7F for ; Mon, 11 Jun 2018 03:58:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F2EF296 for ; Mon, 11 Jun 2018 03:58:54 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1528689504.0848539320c7f89610fb42205f1e2183de97065f.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-sound/pulseaudio/ X-VCS-Repository: proj/musl X-VCS-Files: media-sound/pulseaudio/Manifest media-sound/pulseaudio/metadata.xml media-sound/pulseaudio/pulseaudio-10.0.ebuild media-sound/pulseaudio/pulseaudio-10.99.1.ebuild media-sound/pulseaudio/pulseaudio-11.1.ebuild X-VCS-Directories: media-sound/pulseaudio/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 0848539320c7f89610fb42205f1e2183de97065f X-VCS-Branch: master Date: Mon, 11 Jun 2018 03:58:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e880da9-52fa-4188-94da-090ee0e0d896 X-Archives-Hash: ee96776fc01356ae432a98164829900f commit: 0848539320c7f89610fb42205f1e2183de97065f Author: Aric Belsito gmail com> AuthorDate: Mon Jun 11 03:58:24 2018 +0000 Commit: Aric Belsito gmail com> CommitDate: Mon Jun 11 03:58:24 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=08485393 media-sound/pulseaudio: sync with upstream media-sound/pulseaudio/Manifest | 2 - media-sound/pulseaudio/metadata.xml | 2 +- media-sound/pulseaudio/pulseaudio-10.0.ebuild | 369 ----------------------- media-sound/pulseaudio/pulseaudio-10.99.1.ebuild | 369 ----------------------- media-sound/pulseaudio/pulseaudio-11.1.ebuild | 20 +- 5 files changed, 7 insertions(+), 755 deletions(-) diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index cc69a64..6a179c8 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -1,3 +1 @@ -DIST pulseaudio-10.0.tar.xz 1608040 SHA256 a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481 WHIRLPOOL 6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119 -DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006 WHIRLPOOL c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml index e35348f..3a9d6bb 100644 --- a/media-sound/pulseaudio/metadata.xml +++ b/media-sound/pulseaudio/metadata.xml @@ -42,7 +42,7 @@ script for PulseAudio. Since this support is only supported for embedded situations, do not enable without reading the upstream instructions at - https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ . + https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ . Use libasyncns for asynchronous name resolution. Build the doxygen-described API documentation. diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.0.ebuild deleted file mode 100644 index c94b22f..0000000 --- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild +++ /dev/null @@ -1,369 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator 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. -# qpaeq equalizer pyqt GUI frontend is AGPL-3+ -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" - -SLOT="0" -KEYWORDS="amd64 arm ia64 ppc ~sh sparc x86" - -# +alsa-plugin as discussed in bug #519530 -IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib -gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset -+orc oss qt4 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=" - bluetooth? ( dbus ) - equalizer? ( dbus ) - ofono-headset? ( bluetooth ) - native-headset? ( bluetooth ) - udev? ( || ( alsa oss ) ) -" - -# libpcre needed in some cases, bug #472228 -RDEPEND=" - || ( - 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.4.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 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - 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(+)] ) - realtime? ( sys-auth/rtkit ) - 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/speex-1.2.0 - media-libs/speexdsp - ) - ( - =media-libs/speex-1.2_rc1 - ) - ) - gdbm? ( sys-libs/gdbm ) - webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - dev-libs/libltdl:0 - selinux? ( sec-policy/selinux-pulseaudio ) -" -# it's a valid RDEPEND, libltdl.so is used for native abi - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( >=dev-libs/check-0.9.10 ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - >=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 -# PyQt4 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( >=net-wireless/bluez-5 ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-9.0-musl-padsp.patch" -) - -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 - - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use gdbm; then - myconf+=( --with-database=gdbm ) - else - myconf+=( --with-database=simple ) - fi - - if use bluetooth; then - if multilib_is_native_abi; then - myconf+=( --enable-bluez5 --disable-bluez4 - $(use_enable native-headset bluez5-native-headset) - $(use_enable ofono-headset bluez5-ofono-headset) ) - fi - else - myconf+=( --disable-bluez5 --disable-bluez4 ) - fi - - myconf+=( - --enable-largefile - $(use_enable glib glib2) - --disable-solaris - $(use_enable asyncns) - $(use_enable oss oss-output) - $(use_enable alsa) - $(use_enable lirc) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable jack) - $(use_enable zeroconf avahi) - $(use_enable dbus) - $(use_enable gnome gconf) - $(use_enable gtk gtk3) - $(use_enable libsamplerate samplerate) - $(use_enable orc) - $(use_enable X x11) - $(use_enable test default-build-tests) - $(use_enable udev) - $(use_with sox soxr) - $(use_enable systemd systemd-daemon) - $(use_enable systemd systemd-login) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_enable ssl openssl) - $(use_enable webrtc-aec) - $(use_with caps) - $(use_with equalizer fftw) - --disable-adrian-aec - --disable-esound - --localstatedir="${EPREFIX}"/var - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - --with-systemduserunitdir=$(systemd_get_userunitdir) - ) - - if ! multilib_is_native_abi; then - # disable all the modules and stuff - myconf+=( - --disable-oss-output - --disable-alsa - --disable-lirc - --disable-jack - --disable-avahi - --disable-gconf - --disable-gtk3 - --disable-samplerate - --disable-bluez4 - --disable-bluez5 - --disable-udev - --disable-openssl - --disable-orc - --disable-webrtc-aec - --without-fftw - --without-soxr - - # tests involve random modules, so just do them for the native - --disable-default-build-tests - - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - --with-database=simple - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - 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 libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la - 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 - use doc && dohtml -r doxygen/html/ - 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() { - # Drop the script entirely if X is disabled - use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 - - 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" - fi - - use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc NEWS README todo - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - # We need /var/run/pulse, bug #442852 - use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - - # Prevent warnings when system-wide is not used, bug #447694 - use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf - - prune_libtool_files --all -} - -pkg_postinst() { - 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" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - fi - - if use equalizer && ! use qt4; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' 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 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 -} diff --git a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild deleted file mode 100644 index 57b3dfd..0000000 --- a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild +++ /dev/null @@ -1,369 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator 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. -# qpaeq equalizer pyqt GUI frontend is AGPL-3+ -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86" - -# +alsa-plugin as discussed in bug #519530 -IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib -gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset -+orc oss qt4 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=" - bluetooth? ( dbus ) - equalizer? ( dbus ) - ofono-headset? ( bluetooth ) - native-headset? ( bluetooth ) - udev? ( || ( alsa oss ) ) -" - -# libpcre needed in some cases, bug #472228 -RDEPEND=" - || ( - 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.4.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 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - 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(+)] ) - realtime? ( sys-auth/rtkit ) - 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/speex-1.2.0 - media-libs/speexdsp - ) - ( - =media-libs/speex-1.2_rc1 - ) - ) - gdbm? ( sys-libs/gdbm ) - webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - dev-libs/libltdl:0 - selinux? ( sec-policy/selinux-pulseaudio ) -" -# it's a valid RDEPEND, libltdl.so is used for native abi - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( >=dev-libs/check-0.9.10 ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - >=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 -# PyQt4 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( >=net-wireless/bluez-5 ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-9.0-musl-padsp.patch" -) - -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 - - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use gdbm; then - myconf+=( --with-database=gdbm ) - else - myconf+=( --with-database=simple ) - fi - - if use bluetooth; then - if multilib_is_native_abi; then - myconf+=( --enable-bluez5 --disable-bluez4 - $(use_enable native-headset bluez5-native-headset) - $(use_enable ofono-headset bluez5-ofono-headset) ) - fi - else - myconf+=( --disable-bluez5 --disable-bluez4 ) - fi - - myconf+=( - --enable-largefile - $(use_enable glib glib2) - --disable-solaris - $(use_enable asyncns) - $(use_enable oss oss-output) - $(use_enable alsa) - $(use_enable lirc) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable jack) - $(use_enable zeroconf avahi) - $(use_enable dbus) - $(use_enable gnome gconf) - $(use_enable gtk gtk3) - $(use_enable libsamplerate samplerate) - $(use_enable orc) - $(use_enable X x11) - $(use_enable test default-build-tests) - $(use_enable udev) - $(use_with sox soxr) - $(use_enable systemd systemd-daemon) - $(use_enable systemd systemd-login) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_enable ssl openssl) - $(use_enable webrtc-aec) - $(use_with caps) - $(use_with equalizer fftw) - --disable-adrian-aec - --disable-esound - --localstatedir="${EPREFIX}"/var - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - --with-systemduserunitdir=$(systemd_get_userunitdir) - ) - - if ! multilib_is_native_abi; then - # disable all the modules and stuff - myconf+=( - --disable-oss-output - --disable-alsa - --disable-lirc - --disable-jack - --disable-avahi - --disable-gconf - --disable-gtk3 - --disable-samplerate - --disable-bluez4 - --disable-bluez5 - --disable-udev - --disable-openssl - --disable-orc - --disable-webrtc-aec - --without-fftw - --without-soxr - - # tests involve random modules, so just do them for the native - --disable-default-build-tests - - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - --with-database=simple - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - 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 libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la - 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 - use doc && dohtml -r doxygen/html/ - 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() { - # Drop the script entirely if X is disabled - use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 - - 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" - fi - - use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc NEWS README todo - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - # We need /var/run/pulse, bug #442852 - use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - - # Prevent warnings when system-wide is not used, bug #447694 - use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf - - prune_libtool_files --all -} - -pkg_postinst() { - 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" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - fi - - if use equalizer && ! use qt4; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' 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 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 -} diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild index eeceeac..ede0809 100644 --- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86" +KEYWORDS="amd64 arm ia64 ppc ~sh sparc x86" # +alsa-plugin as discussed in bug #519530 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib @@ -75,17 +75,9 @@ RDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) - || ( - ( - >=media-libs/speex-1.2.0 - media-libs/speexdsp - ) - ( - =media-libs/speex-1.2_rc1 - ) - ) - gdbm? ( sys-libs/gdbm ) + >=media-libs/speex-1.2.0 + media-libs/speexdsp + gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) dev-libs/libltdl:0 @@ -98,7 +90,7 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) test? ( >=dev-libs/check-0.9.10 ) X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] + x11-base/xorg-proto >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] ) dev-libs/libatomic_ops