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 B8A12139694 for ; Tue, 28 Mar 2017 12:19:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03D2E21C1EA; Tue, 28 Mar 2017 12:19:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C27ED21C1EA for ; Tue, 28 Mar 2017 12:19:19 +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 A3B0D341662 for ; Tue, 28 Mar 2017 12:19:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AC207300 for ; Tue, 28 Mar 2017 12:19:17 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1490703519.c34f0f5d99437df788d57c278fea89944203b11f.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/pulseaudio/pulseaudio-10.0.ebuild X-VCS-Directories: media-sound/pulseaudio/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: c34f0f5d99437df788d57c278fea89944203b11f X-VCS-Branch: master Date: Tue, 28 Mar 2017 12:19:17 +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: 38d9bdf8-5b4a-49aa-bc29-543749c08a1b X-Archives-Hash: f3f243df35a34fe3e5c8440645995c03 commit: c34f0f5d99437df788d57c278fea89944203b11f Author: Mart Raudsepp gentoo org> AuthorDate: Tue Mar 28 10:46:22 2017 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Tue Mar 28 12:18:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34f0f5d media-sound/pulseaudio: clarify equalizer licensing, handle split speexdsp, remove ancient v6 upgrade handling PA-6 is well over a year old (with at least a year ago in stable) that needed this upgrade path, so just remove the REPLACING_VERSIONS handling code instead of fixing it up. qpaeq is AGPL-3+, so declare it properly. It also needs dbus to get built (the sink module build requires both HAVE_FFTW and HAVE_DBUS). Tweak dependencies to pull in split speexdsp when needed. Also update check dependency minimum version to match configure.ac (albeit we don't have any older versions in tree). Gentoo-bug: 589480 Gentoo-bug: 611660 media-sound/pulseaudio/pulseaudio-10.0.ebuild | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.0.ebuild index 135faa732ff..26090f8fd27 100644 --- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild +++ b/media-sound/pulseaudio/pulseaudio-10.0.ebuild @@ -12,7 +12,8 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" # 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 )" +# qpaeq equalizer pyqt GUI frontend is AGPL-3+ +LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" @@ -26,6 +27,7 @@ gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headse # 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 ) ) @@ -73,7 +75,16 @@ RDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) - >=media-libs/speex-1.2_rc1 + || ( + ( + >=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}] ) @@ -85,7 +96,7 @@ RDEPEND=" DEPEND="${RDEPEND} sys-devel/m4 doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) + test? ( >=dev-libs/check-0.9.10 ) X? ( x11-proto/xproto[${MULTILIB_USEDEP}] >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] @@ -351,11 +362,4 @@ pkg_postinst() { elog "The libsamplerate based resamplers are now deprecated, because they offer no" elog "particular advantage over speex. Upstream suggests disabling them." fi - - # Needed for pulseaudio-6.0 update from older versions - if use udev; then - if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then - udevadm control --reload && udevadm trigger - fi - fi }