commit: c0a6624cf1c73c62c77dd7a564ff2c8586cc6c9a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 2 11:19:23 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jun 2 11:26:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a6624c
media-plugins/audacious-plugins: Drop IUSE=qtmedia Unconditionally pull in dev-qt/qtmultimedia:5. Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../audacious-plugins/audacious-plugins-4.0.4.ebuild | 12 +++++------- .../audacious-plugins/audacious-plugins-9999.ebuild | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild index 32544b9a66f..76a54c61081 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild @@ -17,12 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/"; LICENSE="GPL-2" SLOT="0" -IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame - libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia +IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack + lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack" -REQUIRED_USE=" - || ( alsa jack pulseaudio qtmedia sdl ) - ampache? ( http ) streamtuner? ( http )" +REQUIRED_USE="ampache? ( http ) streamtuner? ( http )" # The following plugins REQUIRE a GUI build of audacious, because non-GUI # builds do NOT install the libaudgui library & headers. @@ -53,6 +51,7 @@ DEPEND=" dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-${PV} aac? ( >=media-libs/faad2-2.7 ) @@ -85,7 +84,6 @@ DEPEND=" mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) - qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) @@ -119,6 +117,7 @@ src_configure() { local myeconfargs=( --enable-mpris2 --enable-qt + --enable-qtaudio --enable-songchange --disable-adplug # not packaged --disable-gtk @@ -148,7 +147,6 @@ src_configure() { $(use_enable nls) $(use_enable opengl qtglspectrum) $(use_enable pulseaudio pulse) - $(use_enable qtmedia qtaudio) $(use_enable scrobbler scrobbler2) $(use_enable sdl sdlout) $(use_enable sid) diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild index 32544b9a66f..76a54c61081 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild @@ -17,12 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/"; LICENSE="GPL-2" SLOT="0" -IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame - libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia +IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack + lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack" -REQUIRED_USE=" - || ( alsa jack pulseaudio qtmedia sdl ) - ampache? ( http ) streamtuner? ( http )" +REQUIRED_USE="ampache? ( http ) streamtuner? ( http )" # The following plugins REQUIRE a GUI build of audacious, because non-GUI # builds do NOT install the libaudgui library & headers. @@ -53,6 +51,7 @@ DEPEND=" dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-${PV} aac? ( >=media-libs/faad2-2.7 ) @@ -85,7 +84,6 @@ DEPEND=" mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) - qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) @@ -119,6 +117,7 @@ src_configure() { local myeconfargs=( --enable-mpris2 --enable-qt + --enable-qtaudio --enable-songchange --disable-adplug # not packaged --disable-gtk @@ -148,7 +147,6 @@ src_configure() { $(use_enable nls) $(use_enable opengl qtglspectrum) $(use_enable pulseaudio pulse) - $(use_enable qtmedia qtaudio) $(use_enable scrobbler scrobbler2) $(use_enable sdl sdlout) $(use_enable sid)
