Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/
Date: Mon, 19 Nov 2018 21:53:02
Message-Id: 1542664362.6a43158d0f467b46aec9cccc9e2e2af1c4082ea3.asturm@gentoo
1 commit: 6a43158d0f467b46aec9cccc9e2e2af1c4082ea3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 19 21:51:52 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 19 21:52:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a43158d
7
8 media-plugins/audacious-plugins: Add USE qtmedia
9
10 Making experimental qtaudio backend depending on dev-qt/qtmultimedia
11 optional, maybe this works for LibreSSL users.
12
13 Bug: https://bugs.gentoo.org/671414
14 Package-Manager: Portage-2.3.52, Repoman-2.3.12
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild | 6 +++---
18 media-plugins/audacious-plugins/audacious-plugins-9999.ebuild | 7 ++++---
19 media-plugins/audacious-plugins/metadata.xml | 1 +
20 3 files changed, 8 insertions(+), 6 deletions(-)
21
22 diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
23 index 2b8878c61b6..85993d766a9 100644
24 --- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
25 +++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
26 @@ -19,7 +19,7 @@ fi
27 LICENSE="GPL-2"
28 SLOT="0"
29 IUSE="aac +adplug alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify
30 - libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
31 + libsamplerate lirc mms modplug mp3 nls pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
32 REQUIRED_USE="
33 || ( alsa jack pulseaudio sdl )
34 ampache? ( http )"
35 @@ -48,7 +48,6 @@ RDEPEND="
36 dev-libs/libxml2:2
37 dev-qt/qtcore:5
38 dev-qt/qtgui:5
39 - dev-qt/qtmultimedia:5
40 dev-qt/qtwidgets:5
41 media-libs/adplug
42 ~media-sound/audacious-${PV}
43 @@ -81,6 +80,7 @@ RDEPEND="
44 modplug? ( media-libs/libmodplug )
45 mp3? ( >=media-sound/mpg123-1.12.1 )
46 pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
47 + qtmedia? ( dev-qt/qtmultimedia:5 )
48 scrobbler? ( net-misc/curl )
49 sdl? ( media-libs/libsdl2[sound] )
50 sid? ( >=media-libs/libsidplayfp-1.0.0 )
51 @@ -110,7 +110,6 @@ src_configure() {
52 econf \
53 --enable-mpris2 \
54 --enable-qt \
55 - --enable-qtaudio \
56 --enable-songchange \
57 --disable-aosd \
58 --disable-coreaudio \
59 @@ -141,6 +140,7 @@ src_configure() {
60 $(use_enable mp3 mpg123) \
61 $(use_enable nls) \
62 $(use_enable pulseaudio pulse) \
63 + $(use_enable qtmedia qtaudio) \
64 $(use_enable scrobbler scrobbler2) \
65 $(use_enable sdl sdlout) \
66 $(use_enable sid) \
67
68 diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
69 index 5d63400ef48..6ade90c9bd8 100644
70 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
71 +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
72 @@ -18,11 +18,12 @@ fi
73
74 LICENSE="GPL-2"
75 SLOT="0"
76 -IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav
77 - libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
78 +IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav libnotify
79 + libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
80 REQUIRED_USE="
81 ^^ ( gtk qt5 )
82 qt5? ( !aosd !hotkeys )
83 + qtmedia? ( qt5 )
84 || ( alsa jack pulseaudio sdl )
85 ampache? ( qt5 http )"
86
87 @@ -152,7 +153,7 @@ src_configure() {
88 $(use_enable nls) \
89 $(use_enable pulseaudio pulse) \
90 $(use_enable qt5 qt) \
91 - $(use_enable qt5 qtaudio) \
92 + $(use_enable qtmedia qtaudio) \
93 $(use_enable scrobbler scrobbler2) \
94 $(use_enable sdl sdlout) \
95 $(use_enable sid) \
96
97 diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
98 index 4fc91fc80a7..49372c8715d 100644
99 --- a/media-plugins/audacious-plugins/metadata.xml
100 +++ b/media-plugins/audacious-plugins/metadata.xml
101 @@ -20,6 +20,7 @@
102 <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
103 <flag name="hotkeys">Enable support for controlling via hotkeys</flag>
104 <flag name="http">Support HTTP streams through neon</flag>
105 + <flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
106 <flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
107 <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
108 <flag name="soxr">Build with SoX Resampler support</flag>