1 |
commit: 9817e950a3f0edb45ee0b8e51429004965315005 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 08:38:50 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 09:58:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9817e950 |
7 |
|
8 |
media-video/vlc: Switch IUSE=qt5 -> IUSE=gui |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-video/vlc/vlc-3.0.9999.ebuild | 43 ++++++++++++++++++------------------- |
14 |
media-video/vlc/vlc-9999.ebuild | 39 ++++++++++++++++----------------- |
15 |
2 files changed, 40 insertions(+), 42 deletions(-) |
16 |
|
17 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
18 |
index c88bc2c4ce2..5adbabb6c6d 100644 |
19 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
20 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
21 |
@@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
22 |
LICENSE="LGPL-2.1 GPL-2" |
23 |
SLOT="0/5-9" # vlc - vlccore |
24 |
|
25 |
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast |
26 |
- dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
27 |
- fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
28 |
- libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc |
29 |
- live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses |
30 |
- nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp |
31 |
- run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib |
32 |
- theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X |
33 |
- x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx |
34 |
- cpu_flags_x86_sse |
35 |
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus |
36 |
+ dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
37 |
+ fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate |
38 |
+ libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
39 |
+ macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg |
40 |
+ omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image |
41 |
+ sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame |
42 |
+ udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi |
43 |
+ cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse |
44 |
" |
45 |
REQUIRED_USE=" |
46 |
chromecast? ( encode ) |
47 |
@@ -47,7 +46,7 @@ REQUIRED_USE=" |
48 |
libcaca? ( X ) |
49 |
libtar? ( skins ) |
50 |
libtiger? ( kate ) |
51 |
- skins? ( qt5 truetype X xml ) |
52 |
+ skins? ( gui truetype X xml ) |
53 |
ssl? ( gcrypt ) |
54 |
vaapi? ( ffmpeg X ) |
55 |
vdpau? ( ffmpeg X ) |
56 |
@@ -109,6 +108,16 @@ RDEPEND=" |
57 |
gme? ( media-libs/game-music-emu ) |
58 |
gnome-keyring? ( app-crypt/libsecret ) |
59 |
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
60 |
+ gui? ( |
61 |
+ dev-qt/qtcore:5 |
62 |
+ dev-qt/qtgui:5 |
63 |
+ dev-qt/qtsvg:5 |
64 |
+ dev-qt/qtwidgets:5 |
65 |
+ X? ( |
66 |
+ dev-qt/qtx11extras:5 |
67 |
+ x11-libs/libX11 |
68 |
+ ) |
69 |
+ ) |
70 |
ieee1394? ( |
71 |
sys-libs/libavc1394 |
72 |
sys-libs/libraw1394 |
73 |
@@ -154,16 +163,6 @@ RDEPEND=" |
74 |
media-libs/libprojectm |
75 |
) |
76 |
pulseaudio? ( media-sound/pulseaudio ) |
77 |
- qt5? ( |
78 |
- dev-qt/qtcore:5 |
79 |
- dev-qt/qtgui:5 |
80 |
- dev-qt/qtsvg:5 |
81 |
- dev-qt/qtwidgets:5 |
82 |
- X? ( |
83 |
- dev-qt/qtx11extras:5 |
84 |
- x11-libs/libX11 |
85 |
- ) |
86 |
- ) |
87 |
rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) |
88 |
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) |
89 |
sdl-image? ( media-libs/sdl-image ) |
90 |
@@ -321,6 +320,7 @@ src_configure() { |
91 |
$(use_enable gme) |
92 |
$(use_enable gnome-keyring secret) |
93 |
$(use_enable gstreamer gst-decode) |
94 |
+ $(use_enable gui qt) |
95 |
$(use_enable ieee1394 dv1394) |
96 |
$(use_enable jack) |
97 |
$(use_enable jpeg) |
98 |
@@ -353,7 +353,6 @@ src_configure() { |
99 |
$(use_enable png) |
100 |
$(use_enable projectm) |
101 |
$(use_enable pulseaudio pulse) |
102 |
- $(use_enable qt5 qt) |
103 |
$(use_enable rdp freerdp) |
104 |
$(use_enable run-as-root) |
105 |
$(use_enable samba smbclient) |
106 |
|
107 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
108 |
index c501e315737..c7d6c95b35e 100644 |
109 |
--- a/media-video/vlc/vlc-9999.ebuild |
110 |
+++ b/media-video/vlc/vlc-9999.ebuild |
111 |
@@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
112 |
LICENSE="LGPL-2.1 GPL-2" |
113 |
SLOT="0/12-9" # vlc - vlccore |
114 |
|
115 |
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast |
116 |
- dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
117 |
- fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms |
118 |
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus |
119 |
+ dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
120 |
+ fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate kms |
121 |
libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc |
122 |
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses |
123 |
- nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp |
124 |
- run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib |
125 |
- theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X |
126 |
- x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx |
127 |
- cpu_flags_x86_sse |
128 |
+ nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba |
129 |
+ sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype |
130 |
+ twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf |
131 |
+ zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse |
132 |
" |
133 |
REQUIRED_USE=" |
134 |
chromecast? ( encode ) |
135 |
@@ -47,7 +46,7 @@ REQUIRED_USE=" |
136 |
libcaca? ( X ) |
137 |
libtar? ( skins ) |
138 |
libtiger? ( kate ) |
139 |
- skins? ( qt5 truetype X xml ) |
140 |
+ skins? ( gui truetype X xml ) |
141 |
ssl? ( gcrypt ) |
142 |
vaapi? ( ffmpeg X ) |
143 |
vdpau? ( ffmpeg X ) |
144 |
@@ -109,6 +108,16 @@ RDEPEND=" |
145 |
gme? ( media-libs/game-music-emu ) |
146 |
gnome-keyring? ( app-crypt/libsecret ) |
147 |
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
148 |
+ gui? ( |
149 |
+ dev-qt/qtcore:5 |
150 |
+ dev-qt/qtgui:5 |
151 |
+ dev-qt/qtsvg:5 |
152 |
+ dev-qt/qtwidgets:5 |
153 |
+ X? ( |
154 |
+ dev-qt/qtx11extras:5 |
155 |
+ x11-libs/libX11 |
156 |
+ ) |
157 |
+ ) |
158 |
ieee1394? ( |
159 |
sys-libs/libavc1394 |
160 |
sys-libs/libraw1394 |
161 |
@@ -156,16 +165,6 @@ RDEPEND=" |
162 |
media-libs/libprojectm |
163 |
) |
164 |
pulseaudio? ( media-sound/pulseaudio ) |
165 |
- qt5? ( |
166 |
- dev-qt/qtcore:5 |
167 |
- dev-qt/qtgui:5 |
168 |
- dev-qt/qtsvg:5 |
169 |
- dev-qt/qtwidgets:5 |
170 |
- X? ( |
171 |
- dev-qt/qtx11extras:5 |
172 |
- x11-libs/libX11 |
173 |
- ) |
174 |
- ) |
175 |
rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) |
176 |
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) |
177 |
sdl-image? ( media-libs/sdl-image ) |
178 |
@@ -322,6 +321,7 @@ src_configure() { |
179 |
$(use_enable gme) |
180 |
$(use_enable gnome-keyring secret) |
181 |
$(use_enable gstreamer gst-decode) |
182 |
+ $(use_enable gui qt) |
183 |
$(use_enable ieee1394 dv1394) |
184 |
$(use_enable jack) |
185 |
$(use_enable jpeg) |
186 |
@@ -355,7 +355,6 @@ src_configure() { |
187 |
$(use_enable png) |
188 |
$(use_enable projectm) |
189 |
$(use_enable pulseaudio pulse) |
190 |
- $(use_enable qt5 qt) |
191 |
$(use_enable rdp freerdp) |
192 |
$(use_enable run-as-root) |
193 |
$(use_enable samba smbclient) |