1 |
commit: 7698d3296b27e1f53a9abd8af43a66dc5e676541 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 17 20:04:17 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 26 18:00:09 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7698d329 |
7 |
|
8 |
media-video/vlc: Prefer qt5 to qt4 if both enabled |
9 |
|
10 |
- No kde unless !qt5 |
11 |
- EAPI=6, DOC to array, drop unused eutils and multilib eclass |
12 |
- Sort and cleanup ancient, irrelevant min version deps |
13 |
- Somewhat sync changes between live and release ebuilds |
14 |
2.2.9999 + 9999: Indentation, EAPI, PATCHES, virtx, epatch-- |
15 |
|
16 |
media-video/vlc/metadata.xml | 2 +- |
17 |
media-video/vlc/vlc-2.2.1-r1.ebuild | 41 ++--- |
18 |
media-video/vlc/vlc-2.2.4.ebuild | 57 ++++--- |
19 |
media-video/vlc/vlc-2.2.9999.ebuild | 308 +++++++++++++++++++----------------- |
20 |
media-video/vlc/vlc-9999.ebuild | 295 +++++++++++++++++----------------- |
21 |
5 files changed, 356 insertions(+), 347 deletions(-) |
22 |
|
23 |
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml |
24 |
index 27b4c0f..ec1f07d 100644 |
25 |
--- a/media-video/vlc/metadata.xml |
26 |
+++ b/media-video/vlc/metadata.xml |
27 |
@@ -56,7 +56,7 @@ |
28 |
<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag> |
29 |
<flag name="projectm">Enables the projectM visualization plugin.</flag> |
30 |
<flag name="qt4" restrict=">=media-video/vlc-0.9">Builds a Qt4 based frontend, a graphical interface.</flag> |
31 |
- <flag name="qt5" restrict=">=media-video/vlc-2.2">Builds a Qt5 based frontend, a graphical interface.</flag> |
32 |
+ <flag name="qt5" restrict=">=media-video/vlc-2.2">Builds a Qt5 based frontend, a graphical interface (overrides qt4).</flag> |
33 |
<flag name="rdp">Enables freerdp for RDP/Remote Desktop client support</flag> |
34 |
<flag name="rtsp">Enables real audio and RTSP modules.</flag> |
35 |
<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag> |
36 |
|
37 |
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild |
38 |
index 7e4a206..59b277c 100644 |
39 |
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild |
40 |
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild |
41 |
@@ -121,9 +121,8 @@ RDEPEND=" |
42 |
) |
43 |
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
44 |
pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
45 |
- qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) |
46 |
- qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 |
47 |
- >=dev-qt/qtx11extras-5.1:5 ) |
48 |
+ !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
49 |
+ qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
50 |
rdp? ( >=net-misc/freerdp-1.0.1:0=[client] <net-misc/freerdp-2 ) |
51 |
samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] ) |
52 |
>=net-fs/samba-4.0.0_alpha1:0[client] ) ) |
53 |
@@ -178,7 +177,7 @@ RDEPEND="${RDEPEND} |
54 |
" |
55 |
|
56 |
DEPEND="${RDEPEND} |
57 |
- kde? ( >=kde-base/kdelibs-4:4 ) |
58 |
+ !qt5? ( kde? ( kde-base/kdelibs:4 ) ) |
59 |
xcb? ( x11-proto/xproto:0 ) |
60 |
app-arch/xz-utils:0 |
61 |
x86? ( dev-lang/yasm:* ) |
62 |
@@ -200,10 +199,10 @@ REQUIRED_USE=" |
63 |
libcaca? ( X ) |
64 |
libtar? ( skins ) |
65 |
libtiger? ( kate ) |
66 |
- qt4? ( X !qt5 ) |
67 |
- qt5? ( X !qt4 ) |
68 |
+ qt4? ( X ) |
69 |
+ qt5? ( X ) |
70 |
sdl? ( X ) |
71 |
- skins? ( truetype X xml ^^ ( qt4 qt5 ) ) |
72 |
+ skins? ( truetype X xml || ( qt4 qt5 ) ) |
73 |
vaapi? ( avcodec X ) |
74 |
vdpau? ( xcb ) |
75 |
vlm? ( encode ) |
76 |
@@ -289,14 +288,16 @@ src_prepare() { |
77 |
|
78 |
# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. |
79 |
# Setting QT_SELECT environment variable will enforce correct binaries. |
80 |
- if use qt4; then |
81 |
- export QT_SELECT=qt4 |
82 |
- elif use qt5; then |
83 |
+ if use qt5; then |
84 |
export QT_SELECT=qt5 |
85 |
+ elif use qt4; then |
86 |
+ export QT_SELECT=qt4 |
87 |
fi |
88 |
} |
89 |
|
90 |
src_configure() { |
91 |
+ local myconf |
92 |
+ |
93 |
# Compatibility fix for Samba 4. |
94 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
95 |
|
96 |
@@ -316,13 +317,15 @@ src_configure() { |
97 |
--with-default-monospace-font-family=Monospace" |
98 |
fi |
99 |
|
100 |
- local qt_flag="" |
101 |
- if use qt4 ; then |
102 |
- qt_flag="--enable-qt=4" |
103 |
- elif use qt5 ; then |
104 |
- qt_flag="--enable-qt=5" |
105 |
+ if use qt5 ; then |
106 |
+ myconf+=" --enable-qt=5" |
107 |
else |
108 |
- qt_flag="--disable-qt" |
109 |
+ if use qt4 ; then |
110 |
+ myconf+=" --enable-qt=4" |
111 |
+ else |
112 |
+ myconf+=" --disable-qt" |
113 |
+ fi |
114 |
+ use kde && myconf+=" --with-kde-solid" |
115 |
fi |
116 |
|
117 |
econf \ |
118 |
@@ -372,7 +375,6 @@ src_configure() { |
119 |
$(use_enable jack) \ |
120 |
$(use_enable jpeg) \ |
121 |
$(use_enable kate) \ |
122 |
- $(use_with kde kde-solid) \ |
123 |
$(use_enable libass) \ |
124 |
$(use_enable libcaca caca) \ |
125 |
$(use_enable libnotify notify) \ |
126 |
@@ -407,7 +409,6 @@ src_configure() { |
127 |
$(use_enable postproc) \ |
128 |
$(use_enable projectm) \ |
129 |
$(use_enable pulseaudio pulse) \ |
130 |
- ${qt_flag} \ |
131 |
$(use_enable rdp freerdp) \ |
132 |
$(use_enable rtsp realrtsp) \ |
133 |
$(use_enable run-as-root) \ |
134 |
@@ -482,7 +483,7 @@ src_configure() { |
135 |
} |
136 |
|
137 |
src_test() { |
138 |
- Xemake check-TESTS |
139 |
+ virtx emake check-TESTS |
140 |
} |
141 |
|
142 |
DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt" |
143 |
@@ -491,7 +492,7 @@ src_install() { |
144 |
default |
145 |
|
146 |
# Punt useless libtool's .la files |
147 |
- find "${D}" -name '*.la' -delete |
148 |
+ find "${D}" -name '*.la' -delete || die |
149 |
} |
150 |
|
151 |
pkg_postinst() { |
152 |
|
153 |
diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild |
154 |
index 7e3bd58..61ac596 100644 |
155 |
--- a/media-video/vlc/vlc-2.2.4.ebuild |
156 |
+++ b/media-video/vlc/vlc-2.2.4.ebuild |
157 |
@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then |
158 |
fi |
159 |
fi |
160 |
|
161 |
-inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} |
162 |
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM} |
163 |
|
164 |
MY_PV="${PV/_/-}" |
165 |
MY_PV="${MY_PV/-beta/-test}" |
166 |
@@ -62,15 +62,11 @@ RDEPEND=" |
167 |
aalib? ( media-libs/aalib:0 ) |
168 |
alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
169 |
avcodec? ( |
170 |
- !libav? ( |
171 |
- >=media-video/ffmpeg-2.8:0= |
172 |
- ) |
173 |
+ !libav? ( >=media-video/ffmpeg-2.8:0= ) |
174 |
libav? ( >=media-video/libav-11:0= ) |
175 |
) |
176 |
avformat? ( |
177 |
- !libav? ( |
178 |
- >=media-video/ffmpeg-2.8:0= |
179 |
- ) |
180 |
+ !libav? ( >=media-video/ffmpeg-2.8:0= ) |
181 |
libav? ( media-video/libav:0= ) |
182 |
) |
183 |
bidi? ( >=dev-libs/fribidi-0.10.4:0 ) |
184 |
@@ -125,9 +121,8 @@ RDEPEND=" |
185 |
) |
186 |
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
187 |
pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
188 |
- qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) |
189 |
- qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.5.1-r1:5 |
190 |
- >=dev-qt/qtx11extras-5.1:5 ) |
191 |
+ !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
192 |
+ qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
193 |
rdp? ( >=net-misc/freerdp-1.0.1:0=[client] <net-misc/freerdp-2 ) |
194 |
samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] ) |
195 |
>=net-fs/samba-4.0.0_alpha1:0[client] ) ) |
196 |
@@ -184,7 +179,7 @@ RDEPEND="${RDEPEND} |
197 |
" |
198 |
|
199 |
DEPEND="${RDEPEND} |
200 |
- kde? ( >=kde-base/kdelibs-4:4 ) |
201 |
+ !qt5? ( kde? ( kde-base/kdelibs:4 ) ) |
202 |
xcb? ( x11-proto/xproto:0 ) |
203 |
app-arch/xz-utils:0 |
204 |
x86? ( dev-lang/yasm:* ) |
205 |
@@ -206,10 +201,10 @@ REQUIRED_USE=" |
206 |
libcaca? ( X ) |
207 |
libtar? ( skins ) |
208 |
libtiger? ( kate ) |
209 |
- qt4? ( X !qt5 ) |
210 |
- qt5? ( X !qt4 ) |
211 |
+ qt4? ( X ) |
212 |
+ qt5? ( X ) |
213 |
sdl? ( X ) |
214 |
- skins? ( truetype X xml ^^ ( qt4 qt5 ) ) |
215 |
+ skins? ( truetype X xml || ( qt4 qt5 ) ) |
216 |
vaapi? ( avcodec X ) |
217 |
vdpau? ( xcb ) |
218 |
vlm? ( encode ) |
219 |
@@ -237,6 +232,8 @@ PATCHES=( |
220 |
"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch |
221 |
) |
222 |
|
223 |
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) |
224 |
+ |
225 |
S="${WORKDIR}/${MY_P}" |
226 |
|
227 |
pkg_setup() { |
228 |
@@ -290,16 +287,18 @@ src_prepare() { |
229 |
# Disable automatic running of tests. |
230 |
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die |
231 |
|
232 |
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. |
233 |
- # Setting QT_SELECT environment variable will enforce correct binaries. |
234 |
- if use qt4; then |
235 |
- export QT_SELECT=qt4 |
236 |
- elif use qt5; then |
237 |
+ # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt |
238 |
+ # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
239 |
+ if use qt5; then |
240 |
export QT_SELECT=qt5 |
241 |
+ elif use qt4; then |
242 |
+ export QT_SELECT=qt4 |
243 |
fi |
244 |
} |
245 |
|
246 |
src_configure() { |
247 |
+ local myconf |
248 |
+ |
249 |
# Compatibility fix for Samba 4. |
250 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
251 |
|
252 |
@@ -319,13 +318,15 @@ src_configure() { |
253 |
--with-default-monospace-font-family=Monospace" |
254 |
fi |
255 |
|
256 |
- local qt_flag="" |
257 |
- if use qt4 ; then |
258 |
- qt_flag="--enable-qt=4" |
259 |
- elif use qt5 ; then |
260 |
- qt_flag="--enable-qt=5" |
261 |
+ if use qt5 ; then |
262 |
+ myconf+=" --enable-qt=5" |
263 |
else |
264 |
- qt_flag="--disable-qt" |
265 |
+ if use qt4 ; then |
266 |
+ myconf+=" --enable-qt=4" |
267 |
+ else |
268 |
+ myconf+=" --disable-qt" |
269 |
+ fi |
270 |
+ use kde && myconf+=" --with-kde-solid" |
271 |
fi |
272 |
|
273 |
econf \ |
274 |
@@ -375,7 +376,6 @@ src_configure() { |
275 |
$(use_enable jack) \ |
276 |
$(use_enable jpeg) \ |
277 |
$(use_enable kate) \ |
278 |
- $(use_with kde kde-solid) \ |
279 |
$(use_enable libass) \ |
280 |
$(use_enable libcaca caca) \ |
281 |
$(use_enable libnotify notify) \ |
282 |
@@ -410,7 +410,6 @@ src_configure() { |
283 |
$(use_enable postproc) \ |
284 |
$(use_enable projectm) \ |
285 |
$(use_enable pulseaudio pulse) \ |
286 |
- ${qt_flag} \ |
287 |
$(use_enable rdp freerdp) \ |
288 |
$(use_enable rtsp realrtsp) \ |
289 |
$(use_enable run-as-root) \ |
290 |
@@ -488,13 +487,11 @@ src_test() { |
291 |
virtx emake check-TESTS |
292 |
} |
293 |
|
294 |
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt" |
295 |
- |
296 |
src_install() { |
297 |
default |
298 |
|
299 |
# Punt useless libtool's .la files |
300 |
- find "${D}" -name '*.la' -delete |
301 |
+ find "${D}" -name '*.la' -delete || die |
302 |
} |
303 |
|
304 |
pkg_postinst() { |
305 |
|
306 |
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild |
307 |
index 4593b11..004ccdd 100644 |
308 |
--- a/media-video/vlc/vlc-2.2.9999.ebuild |
309 |
+++ b/media-video/vlc/vlc-2.2.9999.ebuild |
310 |
@@ -2,7 +2,7 @@ |
311 |
# Distributed under the terms of the GNU General Public License v2 |
312 |
# $Id$ |
313 |
|
314 |
-EAPI="5" |
315 |
+EAPI=6 |
316 |
|
317 |
SCM="" |
318 |
if [ "${PV%9999}" != "${PV}" ] ; then |
319 |
@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then |
320 |
fi |
321 |
fi |
322 |
|
323 |
-inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} |
324 |
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM} |
325 |
|
326 |
MY_PV="${PV/_/-}" |
327 |
MY_PV="${MY_PV/-beta/-test}" |
328 |
@@ -53,131 +53,130 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec |
329 |
vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf" |
330 |
|
331 |
RDEPEND=" |
332 |
- !<media-video/ffmpeg-1.2:0 |
333 |
- dev-libs/libgpg-error:0 |
334 |
- net-dns/libidn:0 |
335 |
- >=sys-libs/zlib-1.2.5.1-r2:0[minizip] |
336 |
- virtual/libintl:0 |
337 |
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) |
338 |
- aalib? ( media-libs/aalib:0 ) |
339 |
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
340 |
- avcodec? ( |
341 |
- !libav? ( media-video/ffmpeg:0= ) |
342 |
- libav? ( media-video/libav:0= ) |
343 |
- ) |
344 |
- avformat? ( |
345 |
- !libav? ( media-video/ffmpeg:0= ) |
346 |
- libav? ( media-video/libav:0= ) |
347 |
- ) |
348 |
- bidi? ( >=dev-libs/fribidi-0.10.4:0 ) |
349 |
- bluray? ( >=media-libs/libbluray-0.3:0 ) |
350 |
- cddb? ( >=media-libs/libcddb-1.2:0 ) |
351 |
- chromaprint? ( >=media-libs/chromaprint-0.6:0 ) |
352 |
- dbus? ( >=sys-apps/dbus-1.6:0 ) |
353 |
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) |
354 |
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) |
355 |
- dts? ( >=media-libs/libdca-0.0.5:0 ) |
356 |
- dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) |
357 |
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) |
358 |
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
359 |
- faad? ( >=media-libs/faad2-2.6.1:0 ) |
360 |
- fdk? ( media-libs/fdk-aac:0 ) |
361 |
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) |
362 |
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) |
363 |
- fontconfig? ( media-libs/fontconfig:1.0 ) |
364 |
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) |
365 |
- gme? ( media-libs/game-music-emu:0 ) |
366 |
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) |
367 |
- gnutls? ( >=net-libs/gnutls-3.0.20:0 ) |
368 |
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
369 |
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) |
370 |
- jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) |
371 |
- jpeg? ( virtual/jpeg:0 ) |
372 |
- kate? ( >=media-libs/libkate-0.3:0 ) |
373 |
- libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) |
374 |
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) |
375 |
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) |
376 |
- libsamplerate? ( media-libs/libsamplerate:0 ) |
377 |
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) |
378 |
- libtiger? ( >=media-libs/libtiger-0.3.1:0 ) |
379 |
- linsys? ( >=media-libs/zvbi-0.2.28:0 ) |
380 |
- lirc? ( app-misc/lirc:0 ) |
381 |
- live? ( >=media-plugins/live-2011.12.23:0 ) |
382 |
- lua? ( >=dev-lang/lua-5.1:0 ) |
383 |
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) |
384 |
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) |
385 |
- mp3? ( media-libs/libmad:0 ) |
386 |
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) |
387 |
- mtp? ( >=media-libs/libmtp-1:0 ) |
388 |
- musepack? ( >=media-sound/musepack-tools-444:0 ) |
389 |
- ncurses? ( sys-libs/ncurses:0=[unicode] ) |
390 |
- ogg? ( >=media-libs/libogg-1:0 ) |
391 |
- opencv? ( >media-libs/opencv-2:0 ) |
392 |
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) |
393 |
- opus? ( >=media-libs/opus-1.0.3:0 ) |
394 |
- png? ( media-libs/libpng:0= sys-libs/zlib:0 ) |
395 |
- postproc? ( |
396 |
- !libav? ( >=media-video/ffmpeg-2.2:0= ) |
397 |
- libav? ( media-libs/libpostproc:0= ) |
398 |
- ) |
399 |
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
400 |
- pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
401 |
- qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) |
402 |
- qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) |
403 |
- rdp? ( >=net-misc/freerdp-1.0.1:0= ) |
404 |
- samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) |
405 |
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) |
406 |
- sdl? ( >=media-libs/libsdl-1.2.10:0 |
407 |
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) |
408 |
- sftp? ( net-libs/libssh2:0 ) |
409 |
- shout? ( >=media-libs/libshout-2.1:0 ) |
410 |
- sid? ( media-libs/libsidplay:2 ) |
411 |
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
412 |
- speex? ( media-libs/speex:0 ) |
413 |
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
414 |
- swscale? ( |
415 |
- !libav? ( media-video/ffmpeg:0= ) |
416 |
- libav? ( media-video/libav:0= ) |
417 |
- ) |
418 |
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) |
419 |
- theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
420 |
- tremor? ( media-libs/tremor:0 ) |
421 |
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 |
422 |
- !fontconfig? ( media-fonts/dejavu:0 ) ) |
423 |
- twolame? ( media-sound/twolame:0 ) |
424 |
- udev? ( >=virtual/udev-142:0 ) |
425 |
- upnp? ( net-libs/libupnp:0 ) |
426 |
- v4l? ( media-libs/libv4l:0 ) |
427 |
- vaapi? ( |
428 |
- x11-libs/libva:0[X,drm] |
429 |
- !libav? ( media-video/ffmpeg:0=[vaapi] ) |
430 |
- libav? ( media-video/libav:0=[vaapi] ) |
431 |
- ) |
432 |
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) |
433 |
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) |
434 |
+ dev-libs/libgpg-error:0 |
435 |
+ net-dns/libidn:0 |
436 |
+ sys-libs/zlib:0[minizip] |
437 |
+ virtual/libintl:0 |
438 |
+ a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) |
439 |
+ aalib? ( media-libs/aalib:0 ) |
440 |
+ alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
441 |
+ avcodec? ( |
442 |
+ !libav? ( media-video/ffmpeg:0= ) |
443 |
+ libav? ( media-video/libav:0= ) |
444 |
+ ) |
445 |
+ avformat? ( |
446 |
+ !libav? ( media-video/ffmpeg:0= ) |
447 |
+ libav? ( media-video/libav:0= ) |
448 |
+ ) |
449 |
+ bidi? ( dev-libs/fribidi:0 ) |
450 |
+ bluray? ( >=media-libs/libbluray-0.3:0 ) |
451 |
+ cddb? ( >=media-libs/libcddb-1.2:0 ) |
452 |
+ chromaprint? ( >=media-libs/chromaprint-0.6:0 ) |
453 |
+ dbus? ( >=sys-apps/dbus-1.6:0 ) |
454 |
+ dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) |
455 |
+ directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) |
456 |
+ dts? ( >=media-libs/libdca-0.0.5:0 ) |
457 |
+ dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) |
458 |
+ dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) |
459 |
+ elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
460 |
+ faad? ( >=media-libs/faad2-2.6.1:0 ) |
461 |
+ fdk? ( media-libs/fdk-aac:0 ) |
462 |
+ flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) |
463 |
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) |
464 |
+ fontconfig? ( media-libs/fontconfig:1.0 ) |
465 |
+ gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) |
466 |
+ gme? ( media-libs/game-music-emu:0 ) |
467 |
+ gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) |
468 |
+ gnutls? ( >=net-libs/gnutls-3.0.20:0 ) |
469 |
+ gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
470 |
+ ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) |
471 |
+ jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) |
472 |
+ jpeg? ( virtual/jpeg:0 ) |
473 |
+ kate? ( >=media-libs/libkate-0.3:0 ) |
474 |
+ libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) |
475 |
+ libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) |
476 |
+ libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) |
477 |
+ libsamplerate? ( media-libs/libsamplerate:0 ) |
478 |
+ libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) |
479 |
+ libtiger? ( >=media-libs/libtiger-0.3.1:0 ) |
480 |
+ linsys? ( >=media-libs/zvbi-0.2.28:0 ) |
481 |
+ lirc? ( app-misc/lirc:0 ) |
482 |
+ live? ( >=media-plugins/live-2011.12.23:0 ) |
483 |
+ lua? ( >=dev-lang/lua-5.1:0 ) |
484 |
+ matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) |
485 |
+ modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) |
486 |
+ mp3? ( media-libs/libmad:0 ) |
487 |
+ mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) |
488 |
+ mtp? ( >=media-libs/libmtp-1:0 ) |
489 |
+ musepack? ( >=media-sound/musepack-tools-444:0 ) |
490 |
+ ncurses? ( sys-libs/ncurses:0=[unicode] ) |
491 |
+ ogg? ( >=media-libs/libogg-1:0 ) |
492 |
+ opencv? ( >media-libs/opencv-2:0 ) |
493 |
+ opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) |
494 |
+ opus? ( >=media-libs/opus-1.0.3:0 ) |
495 |
+ png? ( media-libs/libpng:0= sys-libs/zlib:0 ) |
496 |
+ postproc? ( |
497 |
+ !libav? ( >=media-video/ffmpeg-2.2:0= ) |
498 |
+ libav? ( media-libs/libpostproc:0= ) |
499 |
+ ) |
500 |
+ projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
501 |
+ pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
502 |
+ !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
503 |
+ qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
504 |
+ rdp? ( >=net-misc/freerdp-1.0.1:0= ) |
505 |
+ samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) |
506 |
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) |
507 |
+ sdl? ( >=media-libs/libsdl-1.2.10:0 |
508 |
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) |
509 |
+ sftp? ( net-libs/libssh2:0 ) |
510 |
+ shout? ( >=media-libs/libshout-2.1:0 ) |
511 |
+ sid? ( media-libs/libsidplay:2 ) |
512 |
+ skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
513 |
+ speex? ( media-libs/speex:0 ) |
514 |
+ svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
515 |
+ swscale? ( |
516 |
+ !libav? ( media-video/ffmpeg:0= ) |
517 |
+ libav? ( media-video/libav:0= ) |
518 |
+ ) |
519 |
+ taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) |
520 |
+ theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
521 |
+ tremor? ( media-libs/tremor:0 ) |
522 |
+ truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 |
523 |
+ !fontconfig? ( media-fonts/dejavu:0 ) ) |
524 |
+ twolame? ( media-sound/twolame:0 ) |
525 |
+ udev? ( >=virtual/udev-142:0 ) |
526 |
+ upnp? ( net-libs/libupnp:0 ) |
527 |
+ v4l? ( media-libs/libv4l:0 ) |
528 |
+ vaapi? ( |
529 |
+ x11-libs/libva:0[X,drm] |
530 |
+ !libav? ( media-video/ffmpeg:0=[vaapi] ) |
531 |
+ libav? ( media-video/libav:0=[vaapi] ) |
532 |
+ ) |
533 |
+ vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) |
534 |
+ zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) |
535 |
" |
536 |
|
537 |
# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; |
538 |
# thus we'll have to wait for a new release there. |
539 |
RDEPEND="${RDEPEND} |
540 |
- vdpau? ( |
541 |
- >=x11-libs/libvdpau-0.6:0 |
542 |
- !libav? ( >=media-video/ffmpeg-2.2:0= ) |
543 |
- libav? ( >=media-video/libav-10:0= ) |
544 |
- ) |
545 |
- vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
546 |
- vorbis? ( >=media-libs/libvorbis-1.1:0 ) |
547 |
- vpx? ( media-libs/libvpx:0= ) |
548 |
- X? ( x11-libs/libX11:0 ) |
549 |
- x264? ( >=media-libs/x264-0.0.20090923:0= ) |
550 |
- x265? ( media-libs/x265:0= ) |
551 |
- xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) |
552 |
- xml? ( >=dev-libs/libxml2-2.5:2 ) |
553 |
- zvbi? ( >=media-libs/zvbi-0.2.25:0 ) |
554 |
+ vdpau? ( |
555 |
+ x11-libs/libvdpau:0 |
556 |
+ !libav? ( media-video/ffmpeg:0= ) |
557 |
+ libav? ( >=media-video/libav-10:0= ) |
558 |
+ ) |
559 |
+ vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
560 |
+ vorbis? ( media-libs/libvorbis:0 ) |
561 |
+ vpx? ( media-libs/libvpx:0= ) |
562 |
+ X? ( x11-libs/libX11:0 ) |
563 |
+ x264? ( media-libs/x264:0= ) |
564 |
+ x265? ( media-libs/x265:0= ) |
565 |
+ xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) |
566 |
+ xml? ( dev-libs/libxml2:2 ) |
567 |
+ zvbi? ( media-libs/zvbi:0 ) |
568 |
" |
569 |
|
570 |
DEPEND="${RDEPEND} |
571 |
- kde? ( >=kde-base/kdelibs-4:4 ) |
572 |
+ !qt5? ( kde? ( kde-base/kdelibs:4 ) ) |
573 |
xcb? ( x11-proto/xproto:0 ) |
574 |
app-arch/xz-utils:0 |
575 |
dev-lang/yasm:* |
576 |
@@ -198,15 +197,34 @@ REQUIRED_USE=" |
577 |
libcaca? ( X ) |
578 |
libtar? ( skins ) |
579 |
libtiger? ( kate ) |
580 |
- qt4? ( X !qt5 ) |
581 |
- qt5? ( X !qt4 ) |
582 |
+ qt4? ( X ) |
583 |
+ qt5? ( X ) |
584 |
sdl? ( X ) |
585 |
- skins? ( truetype X ^^ ( qt4 qt5 ) ) |
586 |
+ skins? ( truetype X || ( qt4 qt5 ) ) |
587 |
vaapi? ( avcodec X ) |
588 |
vlm? ( encode ) |
589 |
xv? ( xcb ) |
590 |
" |
591 |
|
592 |
+PATCHES=( |
593 |
+ # Fix build system mistake. |
594 |
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
595 |
+ |
596 |
+ # Patch up incompatibilities and reconfigure autotools. |
597 |
+ "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch |
598 |
+ |
599 |
+ # Fix up broken audio when skipping using a fixed reversed bisected commit. |
600 |
+ "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
601 |
+ |
602 |
+ # Bug #541678 |
603 |
+ "${FILESDIR}"/qt4-select.patch |
604 |
+ |
605 |
+ # Allow QT5.5 since Gentoo has a patched QTwidgets |
606 |
+ "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch |
607 |
+) |
608 |
+ |
609 |
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) |
610 |
+ |
611 |
S="${WORKDIR}/${MY_P}" |
612 |
|
613 |
pkg_setup() { |
614 |
@@ -248,40 +266,30 @@ src_prepare() { |
615 |
# We are not in a real git checkout due to the absence of a .git directory. |
616 |
touch src/revision.txt || die |
617 |
|
618 |
- # Fix build system mistake. |
619 |
- epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
620 |
- |
621 |
- # Patch up incompatibilities and reconfigure autotools. |
622 |
- epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch |
623 |
- |
624 |
- # Fix up broken audio when skipping using a fixed reversed bisected commit. |
625 |
- epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
626 |
- |
627 |
- # Allow QT5.5 since Gentoo has a patched QTwidgets |
628 |
- epatch "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch |
629 |
+ default |
630 |
|
631 |
# Don't use --started-from-file when not using dbus. |
632 |
if ! use dbus ; then |
633 |
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die |
634 |
fi |
635 |
|
636 |
- epatch_user |
637 |
- |
638 |
eautoreconf |
639 |
|
640 |
# Disable automatic running of tests. |
641 |
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die |
642 |
|
643 |
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. |
644 |
- # Setting QT_SELECT environment variable will enforce correct binaries. |
645 |
- if use qt4; then |
646 |
- export QT_SELECT=qt4 |
647 |
- elif use qt5; then |
648 |
+ # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt |
649 |
+ # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
650 |
+ if use qt5; then |
651 |
export QT_SELECT=qt5 |
652 |
+ elif use qt4; then |
653 |
+ export QT_SELECT=qt4 |
654 |
fi |
655 |
} |
656 |
|
657 |
src_configure() { |
658 |
+ local myconf |
659 |
+ |
660 |
# Compatibility fix for Samba 4. |
661 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
662 |
|
663 |
@@ -301,9 +309,15 @@ src_configure() { |
664 |
--with-default-monospace-font-family=Monospace" |
665 |
fi |
666 |
|
667 |
- local qt_flag="" |
668 |
- if use qt4 || use qt5 ; then |
669 |
- qt_flag="--enable-qt" |
670 |
+ if use qt5 ; then |
671 |
+ myconf+=" --enable-qt=5" |
672 |
+ else |
673 |
+ if use qt4 ; then |
674 |
+ myconf+=" --enable-qt=4" |
675 |
+ else |
676 |
+ myconf+=" --disable-qt" |
677 |
+ fi |
678 |
+ use kde && myconf+=" --with-kde-solid" |
679 |
fi |
680 |
|
681 |
econf \ |
682 |
@@ -354,7 +368,6 @@ src_configure() { |
683 |
$(use_enable jack) \ |
684 |
$(use_enable jpeg) \ |
685 |
$(use_enable kate) \ |
686 |
- $(use_with kde kde-solid) \ |
687 |
$(use_enable libass) \ |
688 |
$(use_enable libcaca caca) \ |
689 |
$(use_enable libnotify notify) \ |
690 |
@@ -389,7 +402,6 @@ src_configure() { |
691 |
$(use_enable postproc) \ |
692 |
$(use_enable projectm) \ |
693 |
$(use_enable pulseaudio pulse) \ |
694 |
- ${qt_flag} \ |
695 |
$(use_enable rdp freerdp) \ |
696 |
$(use_enable rtsp realrtsp) \ |
697 |
$(use_enable run-as-root) \ |
698 |
@@ -464,16 +476,14 @@ src_configure() { |
699 |
} |
700 |
|
701 |
src_test() { |
702 |
- Xemake check-TESTS |
703 |
+ virtx emake check-TESTS |
704 |
} |
705 |
|
706 |
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt" |
707 |
- |
708 |
src_install() { |
709 |
default |
710 |
|
711 |
# Punt useless libtool's .la files |
712 |
- find "${D}" -name '*.la' -delete |
713 |
+ find "${D}" -name '*.la' -delete || die |
714 |
} |
715 |
|
716 |
pkg_postinst() { |
717 |
|
718 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
719 |
index 6305a3a..7b61071 100644 |
720 |
--- a/media-video/vlc/vlc-9999.ebuild |
721 |
+++ b/media-video/vlc/vlc-9999.ebuild |
722 |
@@ -2,7 +2,7 @@ |
723 |
# Distributed under the terms of the GNU General Public License v2 |
724 |
# $Id$ |
725 |
|
726 |
-EAPI="6" |
727 |
+EAPI=6 |
728 |
|
729 |
SCM="" |
730 |
if [ "${PV%9999}" != "${PV}" ] ; then |
731 |
@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then |
732 |
fi |
733 |
fi |
734 |
|
735 |
-inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} |
736 |
+inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM} |
737 |
|
738 |
MY_PV="${PV/_/-}" |
739 |
MY_PV="${MY_PV/-beta/-test}" |
740 |
@@ -53,134 +53,130 @@ IUSE="a52 aalib alsa altivec +audioqueue +avcodec |
741 |
vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf" |
742 |
|
743 |
RDEPEND=" |
744 |
- !<media-video/ffmpeg-1.2:0 |
745 |
- dev-libs/libgpg-error:0 |
746 |
- net-dns/libidn:0 |
747 |
- >=sys-libs/zlib-1.2.5.1-r2:0[minizip] |
748 |
- virtual/libintl:0 |
749 |
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) |
750 |
- aalib? ( media-libs/aalib:0 ) |
751 |
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
752 |
- avcodec? ( |
753 |
- !libav? ( media-video/ffmpeg:0= ) |
754 |
- libav? ( media-video/libav:0= ) |
755 |
- ) |
756 |
- avformat? ( |
757 |
- !libav? ( media-video/ffmpeg:0= ) |
758 |
- libav? ( media-video/libav:0= ) |
759 |
- ) |
760 |
- bidi? ( >=dev-libs/fribidi-0.10.4:0 ) |
761 |
- bluray? ( >=media-libs/libbluray-0.6.2:0 ) |
762 |
- cddb? ( >=media-libs/libcddb-1.2:0 ) |
763 |
- chromaprint? ( >=media-libs/chromaprint-0.6:0 ) |
764 |
- chromecast? ( >=dev-libs/protobuf-2.5.0 ) |
765 |
- dbus? ( >=sys-apps/dbus-1.6:0 ) |
766 |
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) |
767 |
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) |
768 |
- dts? ( >=media-libs/libdca-0.0.5:0 ) |
769 |
- dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) |
770 |
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) |
771 |
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
772 |
- faad? ( >=media-libs/faad2-2.6.1:0 ) |
773 |
- fdk? ( media-libs/fdk-aac:0 ) |
774 |
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) |
775 |
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) |
776 |
- fontconfig? ( media-libs/fontconfig:1.0 ) |
777 |
- gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) |
778 |
- gme? ( media-libs/game-music-emu:0 ) |
779 |
- gnutls? ( >=net-libs/gnutls-3.2.0:0 ) |
780 |
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
781 |
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) |
782 |
- jack? ( >=media-sound/jack-audio-connection-kit-0.120.1:0 ) |
783 |
- jpeg? ( virtual/jpeg:0 ) |
784 |
- kate? ( >=media-libs/libkate-0.3:0 ) |
785 |
- libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) |
786 |
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) |
787 |
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) |
788 |
- libsamplerate? ( media-libs/libsamplerate:0 ) |
789 |
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) |
790 |
- libtiger? ( >=media-libs/libtiger-0.3.1:0 ) |
791 |
- linsys? ( >=media-libs/zvbi-0.2.28:0 ) |
792 |
- lirc? ( app-misc/lirc:0 ) |
793 |
- live? ( >=media-plugins/live-2011.12.23:0 ) |
794 |
- lua? ( >=dev-lang/lua-5.1:0 ) |
795 |
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) |
796 |
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) |
797 |
- mp3? ( media-libs/libmad:0 ) |
798 |
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) |
799 |
- mtp? ( >=media-libs/libmtp-1:0 ) |
800 |
- musepack? ( >=media-sound/musepack-tools-444:0 ) |
801 |
- ncurses? ( sys-libs/ncurses:0=[unicode] ) |
802 |
- ogg? ( >=media-libs/libogg-1:0 ) |
803 |
- opencv? ( >media-libs/opencv-2:0 ) |
804 |
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) |
805 |
- opus? ( >=media-libs/opus-1.0.3:0 ) |
806 |
- png? ( media-libs/libpng:0= sys-libs/zlib:0 ) |
807 |
- postproc? ( |
808 |
- !libav? ( >=media-video/ffmpeg-3.1.3:0= ) |
809 |
- libav? ( media-libs/libpostproc:0= ) |
810 |
- ) |
811 |
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
812 |
- pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
813 |
- qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) |
814 |
- qt5? ( >=dev-qt/qtgui-5.2:5 >=dev-qt/qtcore-5.2:5 >=dev-qt/qtwidgets-5.2:5 >=dev-qt/qtx11extras-5.2:5 ) |
815 |
- rdp? ( >=net-misc/freerdp-1.0.1:0= ) |
816 |
- samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) |
817 |
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) |
818 |
- sdl? ( >=media-libs/libsdl-1.2.10:0 |
819 |
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) |
820 |
- sftp? ( net-libs/libssh2:0 ) |
821 |
- shout? ( >=media-libs/libshout-2.1:0 ) |
822 |
- sid? ( media-libs/libsidplay:2 ) |
823 |
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
824 |
- speex? ( media-libs/speex:0 ) |
825 |
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
826 |
- swscale? ( |
827 |
- !libav? ( media-video/ffmpeg:0= ) |
828 |
- libav? ( media-video/libav:0= ) |
829 |
- ) |
830 |
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) |
831 |
- theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
832 |
- tremor? ( media-libs/tremor:0 ) |
833 |
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 |
834 |
- !fontconfig? ( media-fonts/dejavu:0 ) ) |
835 |
- twolame? ( media-sound/twolame:0 ) |
836 |
- udev? ( >=virtual/udev-142:0 ) |
837 |
- upnp? ( net-libs/libupnp:0 ) |
838 |
- v4l? ( media-libs/libv4l:0 ) |
839 |
- vaapi? ( |
840 |
- x11-libs/libva:0[X,drm] |
841 |
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
842 |
- libav? ( media-video/libav:0=[vaapi] ) |
843 |
- ) |
844 |
- vcd? ( >=dev-libs/libcdio-0.78.2:0 ) |
845 |
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) |
846 |
+ dev-libs/libgpg-error:0 |
847 |
+ net-dns/libidn:0 |
848 |
+ sys-libs/zlib:0[minizip] |
849 |
+ virtual/libintl:0 |
850 |
+ a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) |
851 |
+ aalib? ( media-libs/aalib:0 ) |
852 |
+ alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
853 |
+ avcodec? ( |
854 |
+ !libav? ( media-video/ffmpeg:0= ) |
855 |
+ libav? ( media-video/libav:0= ) |
856 |
+ ) |
857 |
+ avformat? ( |
858 |
+ !libav? ( media-video/ffmpeg:0= ) |
859 |
+ libav? ( media-video/libav:0= ) |
860 |
+ ) |
861 |
+ bidi? ( dev-libs/fribidi:0 ) |
862 |
+ bluray? ( >=media-libs/libbluray-0.6.2:0 ) |
863 |
+ cddb? ( >=media-libs/libcddb-1.2:0 ) |
864 |
+ chromaprint? ( >=media-libs/chromaprint-0.6:0 ) |
865 |
+ chromecast? ( >=dev-libs/protobuf-2.5.0 ) |
866 |
+ dbus? ( >=sys-apps/dbus-1.6:0 ) |
867 |
+ dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) |
868 |
+ directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) |
869 |
+ dts? ( >=media-libs/libdca-0.0.5:0 ) |
870 |
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) |
871 |
+ dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) |
872 |
+ elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
873 |
+ faad? ( >=media-libs/faad2-2.6.1:0 ) |
874 |
+ fdk? ( media-libs/fdk-aac:0 ) |
875 |
+ flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) |
876 |
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) |
877 |
+ fontconfig? ( media-libs/fontconfig:1.0 ) |
878 |
+ gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) |
879 |
+ gme? ( media-libs/game-music-emu:0 ) |
880 |
+ gnutls? ( >=net-libs/gnutls-3.2.0:0 ) |
881 |
+ gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
882 |
+ ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) |
883 |
+ jack? ( >=media-sound/jack-audio-connection-kit-0.120.1:0 ) |
884 |
+ jpeg? ( virtual/jpeg:0 ) |
885 |
+ kate? ( >=media-libs/libkate-0.3:0 ) |
886 |
+ libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) |
887 |
+ libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) |
888 |
+ libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) |
889 |
+ libsamplerate? ( media-libs/libsamplerate:0 ) |
890 |
+ libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) |
891 |
+ libtiger? ( >=media-libs/libtiger-0.3.1:0 ) |
892 |
+ linsys? ( >=media-libs/zvbi-0.2.28:0 ) |
893 |
+ lirc? ( app-misc/lirc:0 ) |
894 |
+ live? ( >=media-plugins/live-2011.12.23:0 ) |
895 |
+ lua? ( >=dev-lang/lua-5.1:0 ) |
896 |
+ matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) |
897 |
+ modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) |
898 |
+ mp3? ( media-libs/libmad:0 ) |
899 |
+ mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) |
900 |
+ mtp? ( >=media-libs/libmtp-1:0 ) |
901 |
+ musepack? ( >=media-sound/musepack-tools-444:0 ) |
902 |
+ ncurses? ( sys-libs/ncurses:0=[unicode] ) |
903 |
+ ogg? ( >=media-libs/libogg-1:0 ) |
904 |
+ opencv? ( >media-libs/opencv-2:0 ) |
905 |
+ opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) |
906 |
+ opus? ( >=media-libs/opus-1.0.3:0 ) |
907 |
+ png? ( media-libs/libpng:0= sys-libs/zlib:0 ) |
908 |
+ postproc? ( |
909 |
+ !libav? ( >=media-video/ffmpeg-3.1.3:0= ) |
910 |
+ libav? ( media-libs/libpostproc:0= ) |
911 |
+ ) |
912 |
+ projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
913 |
+ pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
914 |
+ !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) |
915 |
+ qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
916 |
+ rdp? ( >=net-misc/freerdp-1.0.1:0= ) |
917 |
+ samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) |
918 |
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) |
919 |
+ sdl? ( >=media-libs/libsdl-1.2.10:0 |
920 |
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) |
921 |
+ sftp? ( net-libs/libssh2:0 ) |
922 |
+ shout? ( >=media-libs/libshout-2.1:0 ) |
923 |
+ sid? ( media-libs/libsidplay:2 ) |
924 |
+ skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
925 |
+ speex? ( media-libs/speex:0 ) |
926 |
+ svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
927 |
+ swscale? ( |
928 |
+ !libav? ( media-video/ffmpeg:0= ) |
929 |
+ libav? ( media-video/libav:0= ) |
930 |
+ ) |
931 |
+ taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) |
932 |
+ theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
933 |
+ tremor? ( media-libs/tremor:0 ) |
934 |
+ truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 |
935 |
+ !fontconfig? ( media-fonts/dejavu:0 ) ) |
936 |
+ twolame? ( media-sound/twolame:0 ) |
937 |
+ udev? ( >=virtual/udev-142:0 ) |
938 |
+ upnp? ( net-libs/libupnp:0 ) |
939 |
+ v4l? ( media-libs/libv4l:0 ) |
940 |
+ vaapi? ( |
941 |
+ x11-libs/libva:0[X,drm] |
942 |
+ !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
943 |
+ libav? ( media-video/libav:0=[vaapi] ) |
944 |
+ ) |
945 |
+ vcd? ( >=dev-libs/libcdio-0.78.2:0 ) |
946 |
+ zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) |
947 |
" |
948 |
|
949 |
# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; |
950 |
# thus we'll have to wait for a new release there. |
951 |
RDEPEND="${RDEPEND} |
952 |
- vdpau? ( |
953 |
- >=x11-libs/libvdpau-0.6:0 |
954 |
- !libav? ( |
955 |
- >=media-video/ffmpeg-2.2:0= |
956 |
- <media-video/ffmpeg-2.9:0= |
957 |
- ) |
958 |
- libav? ( >=media-video/libav-10:0= ) |
959 |
- ) |
960 |
- vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
961 |
- vorbis? ( >=media-libs/libvorbis-1.1:0 ) |
962 |
- vpx? ( media-libs/libvpx:0= ) |
963 |
- X? ( x11-libs/libX11:0 ) |
964 |
- x264? ( >=media-libs/x264-0.0.20090923:0= ) |
965 |
- x265? ( media-libs/x265:0= ) |
966 |
- xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) |
967 |
- xml? ( >=dev-libs/libxml2-2.5:2 ) |
968 |
- zvbi? ( >=media-libs/zvbi-0.2.28:0 ) |
969 |
+ vdpau? ( |
970 |
+ x11-libs/libvdpau:0 |
971 |
+ !libav? ( media-video/ffmpeg:0= ) |
972 |
+ libav? ( >=media-video/libav-10:0= ) |
973 |
+ ) |
974 |
+ vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
975 |
+ vorbis? ( media-libs/libvorbis:0 ) |
976 |
+ vpx? ( media-libs/libvpx:0= ) |
977 |
+ X? ( x11-libs/libX11:0 ) |
978 |
+ x264? ( media-libs/x264:0= ) |
979 |
+ x265? ( media-libs/x265:0= ) |
980 |
+ xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) |
981 |
+ xml? ( dev-libs/libxml2:2 ) |
982 |
+ zvbi? ( media-libs/zvbi:0 ) |
983 |
" |
984 |
|
985 |
DEPEND="${RDEPEND} |
986 |
- kde? ( >=kde-base/kdelibs-4:4 ) |
987 |
+ !qt5? ( kde? ( kde-base/kdelibs:4 ) ) |
988 |
xcb? ( x11-proto/xproto:0 ) |
989 |
app-arch/xz-utils:0 |
990 |
dev-lang/yasm:* |
991 |
@@ -200,15 +196,28 @@ REQUIRED_USE=" |
992 |
libcaca? ( X ) |
993 |
libtar? ( skins ) |
994 |
libtiger? ( kate ) |
995 |
- qt4? ( X !qt5 ) |
996 |
- qt5? ( X !qt4 ) |
997 |
+ qt4? ( X ) |
998 |
+ qt5? ( X ) |
999 |
sdl? ( X ) |
1000 |
- skins? ( truetype X ^^ ( qt4 qt5 ) ) |
1001 |
+ skins? ( truetype X || ( qt4 qt5 ) ) |
1002 |
vaapi? ( avcodec X ) |
1003 |
vlm? ( encode ) |
1004 |
xv? ( xcb ) |
1005 |
" |
1006 |
|
1007 |
+PATCHES=( |
1008 |
+ # Fix build system mistake. |
1009 |
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
1010 |
+ |
1011 |
+ # Patch up incompatibilities and reconfigure autotools. |
1012 |
+ "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch |
1013 |
+ |
1014 |
+ # Fix up broken audio when skipping using a fixed reversed bisected commit. |
1015 |
+ "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
1016 |
+) |
1017 |
+ |
1018 |
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) |
1019 |
+ |
1020 |
S="${WORKDIR}/${MY_P}" |
1021 |
|
1022 |
pkg_setup() { |
1023 |
@@ -252,15 +261,6 @@ src_prepare() { |
1024 |
|
1025 |
default |
1026 |
|
1027 |
- # Fix build system mistake. |
1028 |
- epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
1029 |
- |
1030 |
- # Patch up incompatibilities and reconfigure autotools. |
1031 |
- epatch "${FILESDIR}"/${P}-libva-1.2.1-compat.patch |
1032 |
- |
1033 |
- # Fix up broken audio when skipping using a fixed reversed bisected commit. |
1034 |
- epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
1035 |
- |
1036 |
# Don't use --started-from-file when not using dbus. |
1037 |
if ! use dbus ; then |
1038 |
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die |
1039 |
@@ -271,16 +271,18 @@ src_prepare() { |
1040 |
# Disable automatic running of tests. |
1041 |
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die |
1042 |
|
1043 |
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. |
1044 |
- # Setting QT_SELECT environment variable will enforce correct binaries. |
1045 |
- if use qt4; then |
1046 |
- export QT_SELECT=qt4 |
1047 |
- elif use qt5; then |
1048 |
+ # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt |
1049 |
+ # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
1050 |
+ if use qt5; then |
1051 |
export QT_SELECT=qt5 |
1052 |
+ elif use qt4; then |
1053 |
+ export QT_SELECT=qt4 |
1054 |
fi |
1055 |
} |
1056 |
|
1057 |
src_configure() { |
1058 |
+ local myconf |
1059 |
+ |
1060 |
# Compatibility fix for Samba 4. |
1061 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
1062 |
|
1063 |
@@ -303,9 +305,12 @@ src_configure() { |
1064 |
--with-default-monospace-font-family=Monospace" |
1065 |
fi |
1066 |
|
1067 |
- local qt_flag="" |
1068 |
if use qt4 || use qt5 ; then |
1069 |
- qt_flag="--enable-qt" |
1070 |
+ myconf+=" --enable-qt" |
1071 |
+ fi |
1072 |
+ |
1073 |
+ if ! use qt5 && use kde ; then |
1074 |
+ myconf+=" --with-kde-solid" |
1075 |
fi |
1076 |
|
1077 |
econf \ |
1078 |
@@ -353,7 +358,6 @@ src_configure() { |
1079 |
$(use_enable jack) \ |
1080 |
$(use_enable jpeg) \ |
1081 |
$(use_enable kate) \ |
1082 |
- $(use_with kde kde-solid) \ |
1083 |
$(use_enable libass) \ |
1084 |
$(use_enable libcaca caca) \ |
1085 |
$(use_enable libnotify notify) \ |
1086 |
@@ -385,7 +389,6 @@ src_configure() { |
1087 |
$(use_enable postproc) \ |
1088 |
$(use_enable projectm) \ |
1089 |
$(use_enable pulseaudio pulse) \ |
1090 |
- ${qt_flag} \ |
1091 |
$(use_enable rdp freerdp) \ |
1092 |
$(use_enable rtsp realrtsp) \ |
1093 |
$(use_enable run-as-root) \ |
1094 |
@@ -458,16 +461,14 @@ src_configure() { |
1095 |
} |
1096 |
|
1097 |
src_test() { |
1098 |
- Xemake check-TESTS |
1099 |
+ virtx emake check-TESTS |
1100 |
} |
1101 |
|
1102 |
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt" |
1103 |
- |
1104 |
src_install() { |
1105 |
default |
1106 |
|
1107 |
# Punt useless libtool's .la files |
1108 |
- find "${D}" -name '*.la' -delete |
1109 |
+ find "${D}" -name '*.la' -delete || die |
1110 |
} |
1111 |
|
1112 |
pkg_postinst() { |