[gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-9999.ebuild ChangeLog

["Tom Wijsman (tomwij)" <tomwij@gentoo.org>]

tomwij      14/06/07 15:36:57

  Modified:             vlc-9999.ebuild ChangeLog
  Log:
  Fix up more dependencies, a more thorough check follows later.
  
  (Portage version: 2.2.10_p125/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

Revision  Changes    Path
1.222                media-video/vlc/vlc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.222&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.222&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.221&r2=1.222

Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- vlc-9999.ebuild	7 Jun 2014 14:44:08 -0000	1.221
+++ vlc-9999.ebuild	7 Jun 2014 15:36:57 -0000	1.222
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.221 2014/06/07 14:44:08 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.222 2014/06/07 15:36:57 tomwij Exp $
 
 EAPI="5"
 
@@ -114,7 +114,7 @@
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
 		postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
+		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
 		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
 		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 dev-qt/qtwidgets:5 )
 		rdp? ( >=net-misc/freerdp-1.0.1:0= )
@@ -127,7 +127,7 @@
 		sid? ( media-libs/libsidplay:2 )
 		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
 		speex? ( media-libs/speex:0 )
-		svg? ( >=gnome-base/librsvg-2.9:2 )
+		svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
 		swscale? ( virtual/ffmpeg:0 )
 		taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
@@ -144,7 +144,13 @@
 # Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
 # thus we'll have to wait for a new release there.
 RDEPEND="${RDEPEND}
-		vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 !<media-video/ffmpeg-9999 )
+		vdpau? (
+			>=x11-libs/libvdpau-0.6:0
+			|| (
+				>=media-video/ffmpeg-1.2:0=
+				>=media-video/libav-10:0=
+			)
+		)
 		vnc? ( >=net-libs/libvncserver-0.9.9:0 )
 		vorbis? ( >=media-libs/libvorbis-1.1:0 )
 		vpx? ( media-libs/libvpx:0 )
@@ -372,6 +378,7 @@
 		$(use_enable speex) \
 		$(use_enable sse) \
 		$(use_enable svg) \
+		$(use_enable svg svgdec) \
 		$(use_enable swscale) \
 		$(use_enable taglib) \
 		$(use_enable theora) \
@@ -408,6 +415,8 @@
 		--disable-maintainer-mode \
 		--disable-merge-ffmpeg \
 		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
 		--disable-opensles \
 		--disable-oss \
 		--disable-quicktime \



1.905                media-video/vlc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.905&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.905&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.904&r2=1.905

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- ChangeLog	7 Jun 2014 14:44:08 -0000	1.904
+++ ChangeLog	7 Jun 2014 15:36:57 -0000	1.905
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.904 2014/06/07 14:44:08 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.905 2014/06/07 15:36:57 tomwij Exp $
+
+  07 Jun 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
+  Fix up more dependencies, a more thorough check follows later.
 
   07 Jun 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
   Remove EGL / Mac OS X from ebuild as their configure options were removed; it