media-sound/pulseaudio: clarify equalizer licensing, handle split speexdsp, remove...
authorMart Raudsepp <leio@gentoo.org>
Tue, 28 Mar 2017 10:46:22 +0000 (13:46 +0300)
committerMart Raudsepp <leio@gentoo.org>
Tue, 28 Mar 2017 12:18:39 +0000 (15:18 +0300)
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

index 135faa732ff10e8bf137676b0cd4ba51a9abe4a1..26090f8fd27937872b2aebebc36b028179d2b196 100644 (file)
@@ -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.0
+                       >=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
 }