media-plugins/audacious-plugins: Add USE qtmedia

Making experimental qtaudio backend depending on dev-qt/qtmultimedia
optional, maybe this works for LibreSSL users.

Bug: https://bugs.gentoo.org/671414
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
index 2b8878c61b65485ce8fa259ade3923515343a083..85993d766a924aa7d62bdd7db0d20adeaa149a64 100644 (file)
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac +adplug alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify
-       libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+       libsamplerate lirc mms modplug mp3 nls pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
        || ( alsa jack pulseaudio sdl )
        ampache? ( http )"
@@ -48,7 +48,6 @@ RDEPEND="
        dev-libs/libxml2:2
        dev-qt/qtcore:5
        dev-qt/qtgui:5
-       dev-qt/qtmultimedia:5
        dev-qt/qtwidgets:5
        media-libs/adplug
        ~media-sound/audacious-${PV}
@@ -81,6 +80,7 @@ RDEPEND="
        modplug? ( media-libs/libmodplug )
        mp3? ( >=media-sound/mpg123-1.12.1 )
        pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+       qtmedia? ( dev-qt/qtmultimedia:5 )
        scrobbler? ( net-misc/curl )
        sdl? ( media-libs/libsdl2[sound] )
        sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -110,7 +110,6 @@ src_configure() {
        econf \
                --enable-mpris2 \
                --enable-qt \
-               --enable-qtaudio \
                --enable-songchange \
                --disable-aosd \
                --disable-coreaudio \
@@ -141,6 +140,7 @@ src_configure() {
                $(use_enable mp3 mpg123) \
                $(use_enable nls) \
                $(use_enable pulseaudio pulse) \
+               $(use_enable qtmedia qtaudio) \
                $(use_enable scrobbler scrobbler2) \
                $(use_enable sdl sdlout) \
                $(use_enable sid) \

diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 5d63400ef4814ecfb4b3d6a26061c52e1996fed3..6ade90c9bd81efd8018b3e953147e7baa471880b 100644 (file)
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -18,11 +18,12 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav
-       libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav libnotify
+       libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
        ^^ ( gtk qt5 )
        qt5? ( !aosd !hotkeys )
+       qtmedia? ( qt5 )
        || ( alsa jack pulseaudio sdl )
        ampache? ( qt5 http )"
 
@@ -152,7 +153,7 @@ src_configure() {
                $(use_enable nls) \
                $(use_enable pulseaudio pulse) \
                $(use_enable qt5 qt) \
-               $(use_enable qt5 qtaudio) \
+               $(use_enable qtmedia qtaudio) \
                $(use_enable scrobbler scrobbler2) \
                $(use_enable sdl sdlout) \
                $(use_enable sid) \

diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 4fc91fc80a7656e0a7824c4f9ff30584beba5609..49372c8715da1892237ba4fb6a8e21c543e51255 100644 (file)
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -20,6 +20,7 @@
                <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
                <flag name="hotkeys">Enable support for controlling via hotkeys</flag>
                <flag name="http">Support HTTP streams through neon</flag>
+               <flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
                <flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
                <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
                <flag name="soxr">Build with SoX Resampler support</flag>