[gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/

[Andreas Sturmlechner]

commit:     5393df9c49f78a8eda66c6a81482f4c18db2b527
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 22:41:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 22:47:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5393df9c

media-plugins/audacious-plugins: Add USE opengl

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild | 7 ++++---
 media-plugins/audacious-plugins/audacious-plugins-9999.ebuild | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild 
b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
index 01c53d0961d..541b297db2f 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
@@ -18,8 +18,8 @@ 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 qtmedia scrobbler sdl 
sid sndfile soxr speedpitch vorbis wavpack"
+IUSE="aac +adplug alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme 
jack lame libav libnotify libsamplerate
+        lirc mms modplug mp3 nls opengl pulseaudio qtmedia scrobbler sdl sid 
sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
        || ( alsa jack pulseaudio qtmedia sdl )
        ampache? ( http )"
@@ -79,6 +79,7 @@ RDEPEND="
        mms? ( >=media-libs/libmms-0.3 )
        modplug? ( media-libs/libmodplug )
        mp3? ( >=media-sound/mpg123-1.12.1 )
+       opengl? ( dev-qt/qtopengl:5 )
        pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
        qtmedia? ( dev-qt/qtmultimedia:5 )
        scrobbler? ( net-misc/curl )
@@ -115,7 +116,6 @@ src_configure() {
                --disable-hotkey
                --disable-notify
                --disable-oss4
-               --disable-qtglspectrum
                --disable-sndio
                $(use_enable aac)
                $(use_enable alsa)
@@ -137,6 +137,7 @@ src_configure() {
                $(use_enable modplug)
                $(use_enable mp3 mpg123)
                $(use_enable nls)
+               $(use_enable opengl qtglspectrum)
                $(use_enable pulseaudio pulse)
                $(use_enable qtmedia qtaudio)
                $(use_enable scrobbler scrobbler2)

diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild 
b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index bcc581ce8a0..d7585a68aa8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -19,7 +19,7 @@ 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 qtmedia 
scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+       libsamplerate lirc mms modplug mp3 nls opengl pulseaudio +qt5 qtmedia 
scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
        ^^ ( gtk qt5 )
        qt5? ( !aosd !hotkeys )
@@ -77,6 +77,7 @@ RDEPEND="
                dev-qt/qtgui:5
                dev-qt/qtwidgets:5
                media-libs/adplug
+               opengl? ( dev-qt/qtopengl:5 )
        )
        jack? (
                >=media-libs/bio2jack-0.4
@@ -123,7 +124,6 @@ src_configure() {
                --enable-mpris2
                --enable-songchange
                --disable-oss4
-               --disable-qtglspectrum
                --disable-coreaudio
                --disable-sndio
                $(use_enable aac)
@@ -162,5 +162,7 @@ src_configure() {
                $(use_enable wavpack)
                $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
        )
+       use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum 
--disable-qtglspectrum) )
+
        econf "${myeconfargs[@]}"
 }