diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-03 22:44:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-03 22:44:39 +0000 |
| commit | 9e3ce4dba43579532380a6c307c2e59e44b17ef5 (patch) | |
| tree | ab5ddc48fa6dcb11ec5b5bc0984f736149c5c4cf /media-libs | |
| parent | Revbump with major changes: remove USE=qml and always depend on qt-declarative (diff) | |
| download | gentoo-2-9e3ce4dba43579532380a6c307c2e59e44b17ef5.tar.gz gentoo-2-9e3ce4dba43579532380a6c307c2e59e44b17ef5.tar.bz2 gentoo-2-9e3ce4dba43579532380a6c307c2e59e44b17ef5.zip | |
Block media-libs/libbluray-xine because both provide plug-in xineplug_inp_bluray.so
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.0.ebuild | 21 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 21 |
3 files changed, 34 insertions, 15 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index ce251f085b4d..1d834e467974 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -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@gentoo.org> 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@gentoo.org> xine-lib-1.2.9999.ebuild: Remove USE="nls" from 1.2.9999 because sys-devel/gettext is always required diff --git a/media-libs/xine-lib/xine-lib-1.2.0.ebuild b/media-libs/xine-lib/xine-lib-1.2.0.ebuild index d8300f969489..13b39cae8bf7 100644 --- a/media-libs/xine-lib/xine-lib-1.2.0.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.0.ebuild @@ -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 @@ RDEPEND="dev-libs/libxdg-basedir ) 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 @@ DEPEND="${RDEPEND} 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 )" diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index 6527c83a6faa..477148bf9364 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -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 @@ RDEPEND="dev-libs/libxdg-basedir ) 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 @@ DEPEND="${RDEPEND} 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 )" |