| 1 |
tomwij 14/06/07 15:36:57 |
| 2 |
|
| 3 |
Modified: vlc-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix up more dependencies, a more thorough check follows later. |
| 6 |
|
| 7 |
(Portage version: 2.2.10_p125/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.222 media-video/vlc/vlc-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.222&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.222&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.221&r2=1.222 |
| 15 |
|
| 16 |
Index: vlc-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v |
| 19 |
retrieving revision 1.221 |
| 20 |
retrieving revision 1.222 |
| 21 |
diff -u -r1.221 -r1.222 |
| 22 |
--- vlc-9999.ebuild 7 Jun 2014 14:44:08 -0000 1.221 |
| 23 |
+++ vlc-9999.ebuild 7 Jun 2014 15:36:57 -0000 1.222 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.221 2014/06/07 14:44:08 tomwij Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.222 2014/06/07 15:36:57 tomwij Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -114,7 +114,7 @@ |
| 33 |
png? ( media-libs/libpng:0= sys-libs/zlib:0 ) |
| 34 |
postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) ) |
| 35 |
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
| 36 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 ) |
| 37 |
+ pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
| 38 |
qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) |
| 39 |
qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 dev-qt/qtwidgets:5 ) |
| 40 |
rdp? ( >=net-misc/freerdp-1.0.1:0= ) |
| 41 |
@@ -127,7 +127,7 @@ |
| 42 |
sid? ( media-libs/libsidplay:2 ) |
| 43 |
skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
| 44 |
speex? ( media-libs/speex:0 ) |
| 45 |
- svg? ( >=gnome-base/librsvg-2.9:2 ) |
| 46 |
+ svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
| 47 |
swscale? ( virtual/ffmpeg:0 ) |
| 48 |
taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) |
| 49 |
theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
| 50 |
@@ -144,7 +144,13 @@ |
| 51 |
# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; |
| 52 |
# thus we'll have to wait for a new release there. |
| 53 |
RDEPEND="${RDEPEND} |
| 54 |
- vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 !<media-video/ffmpeg-9999 ) |
| 55 |
+ vdpau? ( |
| 56 |
+ >=x11-libs/libvdpau-0.6:0 |
| 57 |
+ || ( |
| 58 |
+ >=media-video/ffmpeg-1.2:0= |
| 59 |
+ >=media-video/libav-10:0= |
| 60 |
+ ) |
| 61 |
+ ) |
| 62 |
vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
| 63 |
vorbis? ( >=media-libs/libvorbis-1.1:0 ) |
| 64 |
vpx? ( media-libs/libvpx:0 ) |
| 65 |
@@ -372,6 +378,7 @@ |
| 66 |
$(use_enable speex) \ |
| 67 |
$(use_enable sse) \ |
| 68 |
$(use_enable svg) \ |
| 69 |
+ $(use_enable svg svgdec) \ |
| 70 |
$(use_enable swscale) \ |
| 71 |
$(use_enable taglib) \ |
| 72 |
$(use_enable theora) \ |
| 73 |
@@ -408,6 +415,8 @@ |
| 74 |
--disable-maintainer-mode \ |
| 75 |
--disable-merge-ffmpeg \ |
| 76 |
--disable-mfx \ |
| 77 |
+ --disable-mmal-codec \ |
| 78 |
+ --disable-mmal-vout \ |
| 79 |
--disable-opensles \ |
| 80 |
--disable-oss \ |
| 81 |
--disable-quicktime \ |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.905 media-video/vlc/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.905&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.905&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.904&r2=1.905 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 94 |
retrieving revision 1.904 |
| 95 |
retrieving revision 1.905 |
| 96 |
diff -u -r1.904 -r1.905 |
| 97 |
--- ChangeLog 7 Jun 2014 14:44:08 -0000 1.904 |
| 98 |
+++ ChangeLog 7 Jun 2014 15:36:57 -0000 1.905 |
| 99 |
@@ -1,6 +1,9 @@ |
| 100 |
# ChangeLog for media-video/vlc |
| 101 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.904 2014/06/07 14:44:08 tomwij Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.905 2014/06/07 15:36:57 tomwij Exp $ |
| 104 |
+ |
| 105 |
+ 07 Jun 2014; Tom Wijsman <TomWij@g.o> vlc-9999.ebuild: |
| 106 |
+ Fix up more dependencies, a more thorough check follows later. |
| 107 |
|
| 108 |
07 Jun 2014; Tom Wijsman <TomWij@g.o> vlc-9999.ebuild: |
| 109 |
Remove EGL / Mac OS X from ebuild as their configure options were removed; it |
Archives