summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/ChangeLog7
-rw-r--r--media-libs/xine-lib/metadata.xml10
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild16
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.2.ebuild14
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.9999.ebuild16
5 files changed, 20 insertions, 43 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index a30e7133f1ad..8ccee180e9ce 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.691 2013/01/18 09:54:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.692 2013/05/16 18:41:45 ulm Exp $
+
+ 16 May 2013; Ulrich Müller <ulm@gentoo.org> xine-lib-1.2.1-r1.ebuild,
+ xine-lib-1.2.2.ebuild, xine-lib-1.2.9999.ebuild, metadata.xml:
+ Remove real and win32codecs USE flags, because dependencies have been
+ last-rited, bug 468406.
18 Jan 2013; Agostino Sarubbo <ago@gentoo.org> xine-lib-1.2.2.ebuild:
Stable for x86, wrt bug #451350
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index efbc04fac492..6c2ee8ac9e34 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -40,11 +40,6 @@
the file's data. mmap() access should be faster, but might misbehave if the
device where the file resides in is removed during playback.
</flag>
- <flag name="real">
- Enable support for loading and using RealPlayer binary codecs on x86 and
- amd64 Linux. Enabling this USE flag might make the package
- non-redistributable in binary form.
- </flag>
<flag name="truetype">
Use <pkg>media-libs/freetype</pkg> for font rendering and
<pkg>media-libs/fontconfig</pkg> for font discovery. Enabling this USE flag
@@ -53,11 +48,6 @@
is still experimental, and might not be as good looking as the bitmap fonts
used with this USE flag disabled.
</flag>
- <flag name="win32codecs">
- Enable support for loading and using Windows 32-bit binary codecs on x86
- Linux and FreeBSD. Enabling this USE flag might make the package
- non-redistributable in binary form.
- </flag>
<flag name="vdr">
Build the VDR plugin
</flag>
diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
index 085c0fba4e89..665199e20e1a 100644
--- a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1-r1.ebuild,v 1.13 2012/12/24 07:49:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.14 2013/05/16 18:41:45 ulm Exp $
EAPI=4
@@ -19,7 +19,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc"
RDEPEND="dev-libs/libxdg-basedir
media-libs/libdvdnav
@@ -52,11 +52,6 @@ RDEPEND="dev-libs/libxdg-basedir
virtual/opengl
)
pulseaudio? ( media-sound/pulseaudio )
- real? (
- amd64? ( media-libs/amd64codecs )
- x86? ( media-libs/win32codecs )
- x86-fbsd? ( media-libs/win32codecs )
- )
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl )
speex? (
@@ -82,7 +77,6 @@ RDEPEND="dev-libs/libxdg-basedir
media-libs/libvorbis
)
wavpack? ( media-sound/wavpack )
- win32codecs? ( media-libs/win32codecs )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -167,8 +161,8 @@ src_configure() {
$(use_enable modplug) \
$(use_enable musepack) \
$(use_enable mng) \
- $(use_enable real real-codecs) \
- $(use_enable win32codecs w32dll) \
+ --disable-real-codecs \
+ --disable-w32dll \
$(use_with truetype freetype) $(use_with truetype fontconfig) \
$(use_with X x) \
$(use_with alsa) \
diff --git a/media-libs/xine-lib/xine-lib-1.2.2.ebuild b/media-libs/xine-lib/xine-lib-1.2.2.ebuild
index 3f215a9c0b8a..774e056c307b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.2.ebuild,v 1.7 2013/01/18 09:54:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.2.ebuild,v 1.8 2013/05/16 18:41:45 ulm Exp $
EAPI=4
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -58,11 +58,6 @@ RDEPEND="${NLS_RDEPEND}
virtual/opengl
)
pulseaudio? ( media-sound/pulseaudio )
- real? (
- amd64? ( media-libs/amd64codecs )
- x86? ( media-libs/win32codecs )
- x86-fbsd? ( media-libs/win32codecs )
- )
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl )
speex? (
@@ -88,7 +83,6 @@ RDEPEND="${NLS_RDEPEND}
media-libs/libvorbis
)
wavpack? ( media-sound/wavpack )
- win32codecs? ( media-libs/win32codecs )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -171,8 +165,8 @@ src_configure() {
$(use_enable modplug) \
$(use_enable musepack) \
$(use_enable mng) \
- $(use_enable real real-codecs) \
- $(use_enable win32codecs w32dll) \
+ --disable-real-codecs \
+ --disable-w32dll \
$(use_with truetype freetype) $(use_with truetype fontconfig) \
$(use_with X x) \
$(use_with alsa) \
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 b18b352d2df3..4f0562e2dddd 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
+# Copyright 1999-2013 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.20 2012/12/24 07:49:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.21 2013/05/16 18:41:45 ulm Exp $
EAPI=4
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -58,11 +58,6 @@ RDEPEND="${NLS_RDEPEND}
virtual/opengl
)
pulseaudio? ( media-sound/pulseaudio )
- real? (
- amd64? ( media-libs/amd64codecs )
- x86? ( media-libs/win32codecs )
- x86-fbsd? ( media-libs/win32codecs )
- )
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl )
speex? (
@@ -88,7 +83,6 @@ RDEPEND="${NLS_RDEPEND}
media-libs/libvorbis
)
wavpack? ( media-sound/wavpack )
- win32codecs? ( media-libs/win32codecs )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -171,8 +165,8 @@ src_configure() {
$(use_enable modplug) \
$(use_enable musepack) \
$(use_enable mng) \
- $(use_enable real real-codecs) \
- $(use_enable win32codecs w32dll) \
+ --disable-real-codecs \
+ --disable-w32dll \
$(use_with truetype freetype) $(use_with truetype fontconfig) \
$(use_with X x) \
$(use_with alsa) \