1 |
commit: 841846ce732c657a318ffc7a548c5401333725a3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 14 20:23:18 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 15 00:34:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841846ce |
7 |
|
8 |
media-plugins/audacious-plugins: Default switched to Qt5 |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../audacious-plugins-9999.ebuild | 44 ++++++++++++---------- |
14 |
media-plugins/audacious-plugins/metadata.xml | 3 +- |
15 |
2 files changed, 26 insertions(+), 21 deletions(-) |
16 |
|
17 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
18 |
index c5831e1e045..173f9f213eb 100644 |
19 |
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
20 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
21 |
@@ -17,11 +17,13 @@ HOMEPAGE="https://audacious-media-player.org/" |
22 |
|
23 |
LICENSE="GPL-2" |
24 |
SLOT="0" |
25 |
-IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate |
26 |
- lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
27 |
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gtk http gme |
28 |
+ jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl |
29 |
+ pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
30 |
REQUIRED_USE=" |
31 |
|| ( alsa jack pulseaudio qtmedia sdl ) |
32 |
- ampache? ( qt5 http ) qtmedia? ( qt5 )" |
33 |
+ ampache? ( http ) |
34 |
+ gtk? ( !ampache !qtmedia )" |
35 |
|
36 |
# The following plugins REQUIRE a GUI build of audacious, because non-GUI |
37 |
# builds do NOT install the libaudgui library & headers. |
38 |
@@ -50,7 +52,7 @@ DEPEND=" |
39 |
dev-libs/dbus-glib |
40 |
dev-libs/glib |
41 |
dev-libs/libxml2:2 |
42 |
- ~media-sound/audacious-${PV}[qt5=] |
43 |
+ ~media-sound/audacious-${PV}[gtk=] |
44 |
aac? ( >=media-libs/faad2-2.7 ) |
45 |
adplug? ( media-libs/adplug ) |
46 |
alsa? ( >=media-libs/alsa-lib-1.0.16 ) |
47 |
@@ -68,6 +70,17 @@ DEPEND=" |
48 |
>=media-libs/libvorbis-1.0 |
49 |
) |
50 |
fluidsynth? ( media-sound/fluidsynth:= ) |
51 |
+ gtk? ( |
52 |
+ x11-libs/gtk+:2 |
53 |
+ x11-libs/libXcomposite |
54 |
+ x11-libs/libXrender |
55 |
+ ) |
56 |
+ !gtk? ( |
57 |
+ dev-qt/qtcore:5 |
58 |
+ dev-qt/qtgui:5 |
59 |
+ dev-qt/qtwidgets:5 |
60 |
+ opengl? ( dev-qt/qtopengl:5 ) |
61 |
+ ) |
62 |
http? ( >=net-libs/neon-0.26.4 ) |
63 |
jack? ( |
64 |
>=media-libs/bio2jack-0.4 |
65 |
@@ -81,17 +94,6 @@ DEPEND=" |
66 |
modplug? ( media-libs/libmodplug ) |
67 |
mp3? ( >=media-sound/mpg123-1.12.1 ) |
68 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) |
69 |
- !qt5? ( |
70 |
- x11-libs/gtk+:2 |
71 |
- x11-libs/libXcomposite |
72 |
- x11-libs/libXrender |
73 |
- ) |
74 |
- qt5? ( |
75 |
- dev-qt/qtcore:5 |
76 |
- dev-qt/qtgui:5 |
77 |
- dev-qt/qtwidgets:5 |
78 |
- opengl? ( dev-qt/qtopengl:5 ) |
79 |
- ) |
80 |
qtmedia? ( dev-qt/qtmultimedia:5 ) |
81 |
scrobbler? ( net-misc/curl ) |
82 |
sdl? ( media-libs/libsdl2[sound] ) |
83 |
@@ -137,6 +139,10 @@ src_configure() { |
84 |
$(use_enable flac filewriter) |
85 |
$(use_enable fluidsynth amidiplug) |
86 |
$(use_enable gme console) |
87 |
+ $(use_enable gtk aosd) |
88 |
+ $(use_enable gtk gtk) |
89 |
+ $(use_enable gtk hotkey) |
90 |
+ $(use_enable !gtk qt) |
91 |
$(use_enable http neon) |
92 |
$(use_enable jack) |
93 |
$(use_enable lame filewriter_mp3) |
94 |
@@ -148,10 +154,6 @@ src_configure() { |
95 |
$(use_enable mp3 mpg123) |
96 |
$(use_enable nls) |
97 |
$(use_enable pulseaudio pulse) |
98 |
- $(use_enable !qt5 aosd) |
99 |
- $(use_enable !qt5 gtk) |
100 |
- $(use_enable !qt5 hotkey) |
101 |
- $(use_enable qt5 qt) |
102 |
$(use_enable qtmedia qtaudio) |
103 |
$(use_enable scrobbler scrobbler2) |
104 |
$(use_enable sdl sdlout) |
105 |
@@ -163,7 +165,9 @@ src_configure() { |
106 |
$(use_enable wavpack) |
107 |
$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) |
108 |
) |
109 |
- use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) ) |
110 |
+ use !gtk && myeconfargs+=( |
111 |
+ $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) |
112 |
+ ) |
113 |
|
114 |
econf "${myeconfargs[@]}" |
115 |
} |
116 |
|
117 |
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml |
118 |
index cdc6bec65c6..b541fbe258e 100644 |
119 |
--- a/media-plugins/audacious-plugins/metadata.xml |
120 |
+++ b/media-plugins/audacious-plugins/metadata.xml |
121 |
@@ -16,8 +16,9 @@ |
122 |
<flag name="cue">Support CUE sheets using the libcue library</flag> |
123 |
<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag> |
124 |
<flag name="gme">Support various gaming console music formats</flag> |
125 |
+ <flag name="gtk">Build with GTK interface instead of Qt5</flag> |
126 |
<flag name="http">Support HTTP streams through neon</flag> |
127 |
- <flag name="qt5">Build with Qt5 interface instead Gtk+</flag> |
128 |
+ <flag name="qt5">Build with Qt5 interface instead of GTK</flag> |
129 |
<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag> |
130 |
<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag> |
131 |
<flag name="sid">Build with SID (Commodore 64 Audio) support</flag> |