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