| 1 |
commit: c382628fac657a40f0d846c1372f35324ae83105 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 18 13:52:47 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 18 14:14:33 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c382628f |
| 7 |
|
| 8 |
media-plugins/audacious-plugins: USE aosd does not like qt5 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/671428 |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild | 10 +++------- |
| 15 |
media-plugins/audacious-plugins/audacious-plugins-9999.ebuild | 2 +- |
| 16 |
2 files changed, 4 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild |
| 19 |
index 5871219ae3b..f8439c86fa9 100644 |
| 20 |
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild |
| 21 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild |
| 22 |
@@ -18,8 +18,8 @@ fi |
| 23 |
|
| 24 |
LICENSE="GPL-2" |
| 25 |
SLOT="0" |
| 26 |
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify |
| 27 |
- libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
| 28 |
+IUSE="aac +adplug alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify |
| 29 |
+ libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
| 30 |
REQUIRED_USE=" |
| 31 |
|| ( alsa jack pulseaudio sdl ) |
| 32 |
ampache? ( http )" |
| 33 |
@@ -55,10 +55,6 @@ RDEPEND=" |
| 34 |
aac? ( >=media-libs/faad2-2.7 ) |
| 35 |
alsa? ( >=media-libs/alsa-lib-1.0.16 ) |
| 36 |
ampache? ( =media-libs/ampache_browser-1* ) |
| 37 |
- aosd? ( |
| 38 |
- x11-libs/libXrender |
| 39 |
- x11-libs/libXcomposite |
| 40 |
- ) |
| 41 |
bs2b? ( media-libs/libbs2b ) |
| 42 |
cdda? ( |
| 43 |
>=media-libs/libcddb-1.2.1 |
| 44 |
@@ -116,6 +112,7 @@ src_configure() { |
| 45 |
--enable-qt \ |
| 46 |
--enable-qtaudio \ |
| 47 |
--enable-songchange \ |
| 48 |
+ --disable-aosd \ |
| 49 |
--disable-coreaudio \ |
| 50 |
--disable-gtk \ |
| 51 |
--disable-hotkey \ |
| 52 |
@@ -126,7 +123,6 @@ src_configure() { |
| 53 |
$(use_enable aac) \ |
| 54 |
$(use_enable alsa) \ |
| 55 |
$(use_enable ampache) \ |
| 56 |
- $(use_enable aosd) \ |
| 57 |
$(use_enable bs2b) \ |
| 58 |
$(use_enable cdda cdaudio) \ |
| 59 |
$(use_enable cue) \ |
| 60 |
|
| 61 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 62 |
index 57cc7a7ae92..49746fa262f 100644 |
| 63 |
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 64 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 65 |
@@ -24,7 +24,7 @@ IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys |
| 66 |
libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
| 67 |
REQUIRED_USE=" |
| 68 |
^^ ( gtk gtk3 qt5 ) |
| 69 |
- qt5? ( !hotkeys ) |
| 70 |
+ qt5? ( !aosd !hotkeys ) |
| 71 |
|| ( alsa jack pulseaudio sdl ) |
| 72 |
ampache? ( qt5 http )" |
Archives