| 1 |
commit: c0a6624cf1c73c62c77dd7a564ff2c8586cc6c9a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 2 11:19:23 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 11:26:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a6624c |
| 7 |
|
| 8 |
media-plugins/audacious-plugins: Drop IUSE=qtmedia |
| 9 |
|
| 10 |
Unconditionally pull in dev-qt/qtmultimedia:5. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../audacious-plugins/audacious-plugins-4.0.4.ebuild | 12 +++++------- |
| 16 |
.../audacious-plugins/audacious-plugins-9999.ebuild | 12 +++++------- |
| 17 |
2 files changed, 10 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild |
| 20 |
index 32544b9a66f..76a54c61081 100644 |
| 21 |
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild |
| 22 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild |
| 23 |
@@ -17,12 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/" |
| 24 |
|
| 25 |
LICENSE="GPL-2" |
| 26 |
SLOT="0" |
| 27 |
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame |
| 28 |
- libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia |
| 29 |
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack |
| 30 |
+ lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio |
| 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 |
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )" |
| 36 |
|
| 37 |
# The following plugins REQUIRE a GUI build of audacious, because non-GUI |
| 38 |
# builds do NOT install the libaudgui library & headers. |
| 39 |
@@ -53,6 +51,7 @@ DEPEND=" |
| 40 |
dev-libs/libxml2:2 |
| 41 |
dev-qt/qtcore:5 |
| 42 |
dev-qt/qtgui:5 |
| 43 |
+ dev-qt/qtmultimedia:5 |
| 44 |
dev-qt/qtwidgets:5 |
| 45 |
~media-sound/audacious-${PV} |
| 46 |
aac? ( >=media-libs/faad2-2.7 ) |
| 47 |
@@ -85,7 +84,6 @@ DEPEND=" |
| 48 |
mp3? ( >=media-sound/mpg123-1.12.1 ) |
| 49 |
opengl? ( dev-qt/qtopengl:5 ) |
| 50 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) |
| 51 |
- qtmedia? ( dev-qt/qtmultimedia:5 ) |
| 52 |
scrobbler? ( net-misc/curl ) |
| 53 |
sdl? ( media-libs/libsdl2[sound] ) |
| 54 |
sid? ( >=media-libs/libsidplayfp-1.0.0 ) |
| 55 |
@@ -119,6 +117,7 @@ src_configure() { |
| 56 |
local myeconfargs=( |
| 57 |
--enable-mpris2 |
| 58 |
--enable-qt |
| 59 |
+ --enable-qtaudio |
| 60 |
--enable-songchange |
| 61 |
--disable-adplug # not packaged |
| 62 |
--disable-gtk |
| 63 |
@@ -148,7 +147,6 @@ src_configure() { |
| 64 |
$(use_enable nls) |
| 65 |
$(use_enable opengl qtglspectrum) |
| 66 |
$(use_enable pulseaudio pulse) |
| 67 |
- $(use_enable qtmedia qtaudio) |
| 68 |
$(use_enable scrobbler scrobbler2) |
| 69 |
$(use_enable sdl sdlout) |
| 70 |
$(use_enable sid) |
| 71 |
|
| 72 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 73 |
index 32544b9a66f..76a54c61081 100644 |
| 74 |
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 75 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 76 |
@@ -17,12 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/" |
| 77 |
|
| 78 |
LICENSE="GPL-2" |
| 79 |
SLOT="0" |
| 80 |
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame |
| 81 |
- libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia |
| 82 |
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack |
| 83 |
+ lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio |
| 84 |
scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack" |
| 85 |
-REQUIRED_USE=" |
| 86 |
- || ( alsa jack pulseaudio qtmedia sdl ) |
| 87 |
- ampache? ( http ) streamtuner? ( http )" |
| 88 |
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )" |
| 89 |
|
| 90 |
# The following plugins REQUIRE a GUI build of audacious, because non-GUI |
| 91 |
# builds do NOT install the libaudgui library & headers. |
| 92 |
@@ -53,6 +51,7 @@ DEPEND=" |
| 93 |
dev-libs/libxml2:2 |
| 94 |
dev-qt/qtcore:5 |
| 95 |
dev-qt/qtgui:5 |
| 96 |
+ dev-qt/qtmultimedia:5 |
| 97 |
dev-qt/qtwidgets:5 |
| 98 |
~media-sound/audacious-${PV} |
| 99 |
aac? ( >=media-libs/faad2-2.7 ) |
| 100 |
@@ -85,7 +84,6 @@ DEPEND=" |
| 101 |
mp3? ( >=media-sound/mpg123-1.12.1 ) |
| 102 |
opengl? ( dev-qt/qtopengl:5 ) |
| 103 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) |
| 104 |
- qtmedia? ( dev-qt/qtmultimedia:5 ) |
| 105 |
scrobbler? ( net-misc/curl ) |
| 106 |
sdl? ( media-libs/libsdl2[sound] ) |
| 107 |
sid? ( >=media-libs/libsidplayfp-1.0.0 ) |
| 108 |
@@ -119,6 +117,7 @@ src_configure() { |
| 109 |
local myeconfargs=( |
| 110 |
--enable-mpris2 |
| 111 |
--enable-qt |
| 112 |
+ --enable-qtaudio |
| 113 |
--enable-songchange |
| 114 |
--disable-adplug # not packaged |
| 115 |
--disable-gtk |
| 116 |
@@ -148,7 +147,6 @@ src_configure() { |
| 117 |
$(use_enable nls) |
| 118 |
$(use_enable opengl qtglspectrum) |
| 119 |
$(use_enable pulseaudio pulse) |
| 120 |
- $(use_enable qtmedia qtaudio) |
| 121 |
$(use_enable scrobbler scrobbler2) |
| 122 |
$(use_enable sdl sdlout) |
| 123 |
$(use_enable sid) |
Archives