[gentoo-commits] gentoo-x86 commit in media-libs/xine-lib: ChangeLog xine-lib-1.2.0.ebuild xine-lib-1.2.9999.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    12/01/03 22:44:39

  Modified:             ChangeLog xine-lib-1.2.0.ebuild
                        xine-lib-1.2.9999.ebuild
  Log:
  Block media-libs/libbluray-xine because both provide plug-in xineplug_inp_bluray.so
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.653                media-libs/xine-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/ChangeLog?rev=1.653&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/ChangeLog?rev=1.653&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/ChangeLog?r1=1.652&r2=1.653

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- ChangeLog	3 Jan 2012 20:04:18 -0000	1.652
+++ ChangeLog	3 Jan 2012 22:44:39 -0000	1.653
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.652 2012/01/03 20:04:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.653 2012/01/03 22:44:39 ssuominen Exp $
+
+  03 Jan 2012; Samuli Suominen <ssuominen@g.o> xine-lib-1.2.0.ebuild,
+  xine-lib-1.2.9999.ebuild:
+  Block media-libs/libbluray-xine because both provide plug-in
+  xineplug_inp_bluray.so
 
   03 Jan 2012; Samuli Suominen <ssuominen@g.o> xine-lib-1.2.9999.ebuild:
   Remove USE="nls" from 1.2.9999 because sys-devel/gettext is always required



1.4                  media-libs/xine-lib/xine-lib-1.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild?r1=1.3&r2=1.4

Index: xine-lib-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xine-lib-1.2.0.ebuild	3 Jan 2012 19:51:57 -0000	1.3
+++ xine-lib-1.2.0.ebuild	3 Jan 2012 22:44:39 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild,v 1.3 2012/01/03 19:51:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild,v 1.4 2012/01/03 22:44:39 ssuominen Exp $
 
 EAPI=4
 
@@ -59,8 +59,14 @@
 		)
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype:2
@@ -89,18 +95,19 @@
 	app-arch/xz-utils
 	dev-util/pkgconfig
 	>=sys-devel/libtool-2.2.6b
+	bluray? ( !media-libs/libbluray-xine )
 	nls? ( sys-devel/gettext )
+	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
 		x11-libs/libXt
-		x11-proto/videoproto
 		x11-proto/xf86vidmodeproto
 		x11-proto/xproto
 		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
 	xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="speex? ( vorbis )
-	theora? ( vorbis )
-	vidix? ( || ( X fbcon ) )
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
 	xv? ( X )
 	xinerama? ( X )"
 



1.8                  media-libs/xine-lib/xine-lib-1.2.9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild?r1=1.7&r2=1.8

Index: xine-lib-1.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-1.2.9999.ebuild	3 Jan 2012 20:04:18 -0000	1.7
+++ xine-lib-1.2.9999.ebuild	3 Jan 2012 22:44:39 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.7 2012/01/03 20:04:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.8 2012/01/03 22:44:39 ssuominen Exp $
 
 EAPI=4
 
@@ -59,8 +59,14 @@
 		)
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype:2
@@ -90,17 +96,18 @@
 	dev-util/pkgconfig
 	sys-devel/gettext
 	>=sys-devel/libtool-2.2.6b
+	bluray? ( !media-libs/libbluray-xine )
+	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
 		x11-libs/libXt
-		x11-proto/videoproto
 		x11-proto/xf86vidmodeproto
 		x11-proto/xproto
 		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
 	xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="speex? ( vorbis )
-	theora? ( vorbis )
-	vidix? ( || ( X fbcon ) )
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
 	xv? ( X )
 	xinerama? ( X )"