summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-11-18 14:52:47 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-11-18 15:14:33 +0100
commitc382628fac657a40f0d846c1372f35324ae83105 (patch)
tree2f8ffaed06e87a240b1b3c0559ef724dae73d631 /media-plugins
parentsys-kernel/aufs-sources: Bump to latest genpatches and linux release (diff)
downloadgentoo-c382628fac657a40f0d846c1372f35324ae83105.tar.gz
gentoo-c382628fac657a40f0d846c1372f35324ae83105.tar.bz2
gentoo-c382628fac657a40f0d846c1372f35324ae83105.zip
media-plugins/audacious-plugins: USE aosd does not like qt5
Closes: https://bugs.gentoo.org/671428 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild10
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-9999.ebuild2
2 files changed, 4 insertions, 8 deletions
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
index 5871219ae3b3..f8439c86fa9e 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 aosd bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify
- libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio 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 pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
REQUIRED_USE="
|| ( alsa jack pulseaudio sdl )
ampache? ( http )"
@@ -55,10 +55,6 @@ RDEPEND="
aac? ( >=media-libs/faad2-2.7 )
alsa? ( >=media-libs/alsa-lib-1.0.16 )
ampache? ( =media-libs/ampache_browser-1* )
- aosd? (
- x11-libs/libXrender
- x11-libs/libXcomposite
- )
bs2b? ( media-libs/libbs2b )
cdda? (
>=media-libs/libcddb-1.2.1
@@ -116,6 +112,7 @@ src_configure() {
--enable-qt \
--enable-qtaudio \
--enable-songchange \
+ --disable-aosd \
--disable-coreaudio \
--disable-gtk \
--disable-hotkey \
@@ -126,7 +123,6 @@ src_configure() {
$(use_enable aac) \
$(use_enable alsa) \
$(use_enable ampache) \
- $(use_enable aosd) \
$(use_enable bs2b) \
$(use_enable cdda cdaudio) \
$(use_enable cue) \
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 57cc7a7ae929..49746fa262f5 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys
libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
REQUIRED_USE="
^^ ( gtk gtk3 qt5 )
- qt5? ( !hotkeys )
+ qt5? ( !aosd !hotkeys )
|| ( alsa jack pulseaudio sdl )
ampache? ( qt5 http )"