Add dirac and schroedinger useflags that were automagic, thanks to Hanno Boeck <hanno@gentoo.org> for reporting in bug #234775.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

4 files changed, 22 insertions, 10 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 34814748e04a..9081344f242e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.585 2008/08/17 14:50:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.586 2008/08/17 17:12:57 aballier Exp $
+
+  17 Aug 2008; Alexis Ballier <aballier@gentoo.org> metadata.xml,
+  mplayer-1.0_rc2_p27458.ebuild:
+  Add dirac and schroedinger useflags that were automagic, thanks to Hanno
+  Boeck <hanno@gentoo.org> for reporting in bug #234775.
 
   17 Aug 2008; Alexis Ballier <aballier@gentoo.org>
   mplayer-1.0_rc2_p27458.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c9a185e15158..ccd727964681 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -23,13 +23,13 @@ EBUILD mplayer-1.0_rc2_p26258.ebuild 16334 RMD160 11cfd3073c7a36209a67f5fc91f2f7
 EBUILD mplayer-1.0_rc2_p26753-r1.ebuild 16887 RMD160 7e1b1669fab161e90c0314173b09fa3558f578f8 SHA1 d583470f73319967440a2eedc6f07ba2d2a17910 SHA256 8054aa4491fe7a9013103ecc5ffd1b5b7f85ebb169d37b594be669d5b6404fd2
 EBUILD mplayer-1.0_rc2_p26753.ebuild 16497 RMD160 9e0221b1530d680b4cc7f984157b31662de02e38 SHA1 f08b82a5a87b73cd7c42237366fbff22caf7601f SHA256 65273012feb3b2d7450db196f97bdaabaeb846a67a0079dd73a0b16720316db5
 EBUILD mplayer-1.0_rc2_p27120-r1.ebuild 17539 RMD160 6e5a6b47014f42cbe76b5c2fd8b0c16d6d3d49b7 SHA1 b6867284b32092a12ba7a66585f4d686a48d3d3f SHA256 638e7302b212306297ebcd3e8fd0526dd46029be4c41d534b73c074a6a2a37ea
-EBUILD mplayer-1.0_rc2_p27458.ebuild 17456 RMD160 7616349a1eb636286d2c2c00afce8ee85bc7130a SHA1 e5414a3fc5c5cbfea75b64ec8d84490763ccd15f SHA256 7b628ead8254e76f21ca618dc5f27f92c5a14dbe2a75e849c3641745f238ab36
-MISC ChangeLog 103165 RMD160 17c5ca0cbfd8e1b99c7dff94015f3a1d08e4cc6a SHA1 8c23362afca6bdc2003a8bf3804ad243caf15e8a SHA256 8a2d1a61b5e1f022ed46f3d2617997944473bfe351cef12408423b7d24c0fe74
-MISC metadata.xml 2632 RMD160 e3b781273c41b234cf3bdacdc03d5538aaab6539 SHA1 08b28f15109f6049cce48a17ce5f766a1178a72c SHA256 404fa1c9b5dc4591ff2e1d6a6adb2680d921be126f794f3d5bbb9550b9e35f54
+EBUILD mplayer-1.0_rc2_p27458.ebuild 17653 RMD160 115ffa9ca0d0a077b03f2a77970c544d777b5eb9 SHA1 6ab9b8f81ab861f284ca1af9fcaf2e35b71cdf2e SHA256 064427005e4775980d161417d9b47e0f0dbec8ed8342d66cdeb37a8fd36eab68
+MISC ChangeLog 103397 RMD160 10d15923f03a02474577f8af6536e471921c93bc SHA1 9fe748fdc03c1277ae09d3a880094ec41e79417e SHA256 fa0c6d14f144d36ea042110f82a36f7080244ce0ae207edc17c2565e560f8e35
+MISC metadata.xml 2961 RMD160 86aff446ebfaea9a09d3ffd4dabf76a9409f175a SHA1 9ba6e42c4b4d235998bd2ae12fea189baef24ee3 SHA256 b81013120531993db55edf278d5a257c2c50a4f6994b2069710355790e90de14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkioOskACgkQvFcC4BYPU0rXRQCgoL+40/KS5goHRvVnkseXgalH
-IfIAn3JpVpvnb9TBoI/xZ9b43rK183j+
-=qENh
+iEYEARECAAYFAkioXB8ACgkQvFcC4BYPU0olSQCaA2dy1wX4qM8J9heg7/+iHvpk
+S/EAoKI8zERnTKcX7FyOlRfKiZCg2O2I
+=A7iR
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index be8d51c293e6..798f80a4cbfd 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="cpudetection">Enables runtime cpudetection (useful for bindist, compatability on other CPUs)</flag>
     <flag name="custom-cflags">Enables custom CFLAGS (UNSUPPORTED)</flag>
     <flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag>
+	<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
     <flag name="dxr2">Enable DXR2 video output</flag>
     <flag name="dxr3">Enable DXR3/H+ video output</flag>
     <flag name="enca">Enables support for charset discovery and conversion</flag>
@@ -29,6 +30,7 @@
     <flag name="rar">Enable Unique RAR File Library</flag>
     <flag name="real">Adds real video support</flag>
     <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
+    <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="srt">Internal SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag>
     <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
     <flag name="teletext">Support for TV teletext interface</flag>
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p27458.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p27458.ebuild
index 7c57082ae556..53482efc4401 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p27458.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p27458.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p27458.ebuild,v 1.3 2008/08/17 14:50:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p27458.ebuild,v 1.4 2008/08/17 17:12:57 aballier Exp $
 
 EAPI="1"
 
@@ -11,10 +11,10 @@ MPLAYER_REVISION=27458
 
 IUSE="3dnow 3dnowext +a52 aac -aalib +alsa altivec amrnb amrwb -arts bidi bl
 bindist cddb cdio cdparanoia -cpudetection -custom-cflags -custom-cpuopts debug
-dga doc dts dvb directfb +dvd dv dxr2 dxr3 enca encode esd -fbcon ftp -gif ggi
+dga dirac doc dts dvb directfb +dvd dv dxr2 dxr3 enca encode esd -fbcon ftp -gif ggi
 -gtk iconv ipv6 jack joystick -jpeg kernel_linux ladspa -libcaca lirc live lzo
 +mad -md5sum +mmx mmxext mp2 +mp3 musepack nas nemesi +vorbis opengl
-openal oss -png -pnm pulseaudio -pvr quicktime radio -rar real rtc -samba sdl
+openal oss -png -pnm pulseaudio -pvr quicktime radio -rar real rtc -samba schroedinger sdl
 speex srt sse sse2 ssse3 svga teletext tga +theora +truetype unicode v4l v4l2 vidix win32codecs +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -57,6 +57,7 @@ RDEPEND="sys-libs/ncurses
 	bidi? ( dev-libs/fribidi )
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( media-sound/cdparanoia )
+	dirac? ( >=media-video/dirac-0.10.0 )
 	directfb? ( dev-libs/DirectFB )
 	dga? ( x11-libs/libXxf86dga  )
 	dts? ( media-libs/libdca )
@@ -91,6 +92,7 @@ RDEPEND="sys-libs/ncurses
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( net-fs/samba )
+	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
 	speex? ( >=media-libs/speex-1.1.7 )
 	srt? ( >=media-libs/freetype-2.1
@@ -324,6 +326,9 @@ src_compile() {
 	for x in gif jpeg live mad musepack pnm speex tga theora xanim; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
+	for x in dirac schroedinger ; do
+		use ${x} || myconf="${myconf} --disable-lib${x}-lavc"
+	done
 	use amrnb || myconf="${myconf} --disable-libamr_nb"
 	use amrwb || myconf="${myconf} --disable-libamr_wb"
 	use dts || myconf="${myconf} --disable-libdca"