Add support for external libass libraries, bug 327733

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 30 insertions, 9 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index fa945e1dd930..39a5c4d64556 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.755 2010/07/17 03:09:48 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.756 2010/07/17 03:47:20 beandog Exp $
+
+  17 Jul 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Add support for external libass libraries, bug 327733
 
   17 Jul 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
   Add bluray use flag for playback through libbluray
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b8b97e7d7a4c..eea0947f40a1 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -10,6 +10,6 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18995 RMD160 fa5ca9232abb6950549ca6c2451dac48df3ebd62 SHA1 32f991515d16adacd04d0f4e11a601de0ea0e972 SHA256 72ae257b4c3d903d3fef8953691f39b256a64c6ffa3b62711c5a341ec2b20d82
 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20273 RMD160 e55bf61b411d66b2b8f26c237feb3217415df44e SHA1 7bee75c501fadb2fe7a2c406e441faf3ac0bf638 SHA256 3eb7a7cc77d11c17bd6641be595d9037b24ac19096eefc7807dd661562baba14
 EBUILD mplayer-1.0_rc4_p20100612.ebuild 20255 RMD160 f3e11ef97eed0f62f507ca209bfdcc9edbbf853d SHA1 39deee8a1ffcb78f6795319f5c1bad89e1ff08be SHA256 4dac0c77e803da44f86b15080d924b87f3c4dc4037c167bbf86c4241e2e0c5e6
-EBUILD mplayer-9999.ebuild 20136 RMD160 f2aa7873997ed7d69ce70470fb0c51e87eff8f54 SHA1 d8cac7bf39cc673f2254a94919429282975c220d SHA256 ba1fd1b418d84a0d16d4c89ba90bc652152a280f7e2fe0b99b0193ab14575bde
-MISC ChangeLog 133074 RMD160 110047c4f0d366efc8f036f1c1298b4cd95854ae SHA1 d0eff08dce66edb54ecc3fc9bf19e727c496d4e7 SHA256 846ba45cb9595cf6ce843c272984c375588272da19fa2396405deb519039340c
-MISC metadata.xml 3720 RMD160 932d95caa29db41c6286c477fe6b18a9b166f124 SHA1 5a41e5d65cb9f56674b9b14e9016735b8518d6a1 SHA256 a5f3a0de98ef16ce7004b9b889c29784f5aad57c5399643a8ec8894a196437d6
+EBUILD mplayer-9999.ebuild 20467 RMD160 6894ae1bf2bc586b5ee189787be4e7b3b40db68a SHA1 c5229171b6061c0848d439d6f825f7beb2fd1adb SHA256 231e05fdc459563fced9f94345f9bbefef0c13bc2fba9bfece134c953b6622b2
+MISC ChangeLog 133215 RMD160 66d594821f6685afeb82969f1338851c1d99f683 SHA1 b25742b644d7cde8b74ccecf33cc83fa73f7912e SHA256 03c76d71c340f559c03d199a9007ce48e9acf689d8d53a8a2682d0c3f9f576d0
+MISC metadata.xml 3832 RMD160 f471f5beb863cfd64ebf1c7ef9854db52feca95c SHA1 cf0d5af692408b976be5c7c98c98c097ccb932cc SHA256 9f5f48684ed4320dc05fc5d91e6979c4444a6f67e522bb56a327a28ba8a99793
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index e2d79770bfe4..71b530f7238d 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -23,6 +23,7 @@
     <flag name="faac">Use external faac library for AAC encoding</flag>
     <flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>
+    <flag name="libass">External SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support through libass</flag>
     <flag name="live">Enables live.com streaming media support</flag>
     <flag name="md5sum">Enables md5sum video output</flag>
     <flag name="mmxext">Enables mmx2 support</flag>
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 95012bf9b40e..eb9068a64d44 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.71 2010/07/17 03:09:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.72 2010/07/17 03:47:20 beandog Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
+libass libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
@@ -93,7 +93,7 @@ RDEPEND+="
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
-	ass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
+	ass? ( ${FONT_RDEPS} )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
@@ -121,6 +121,7 @@ RDEPEND+="
 	jpeg? ( media-libs/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live )
@@ -284,9 +285,8 @@ src_configure() {
 		$(use_enable network)
 		$(use_enable joystick)
 	"
-	uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
+	uses="bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
 	myconf+=" --disable-nemesi" # nemesi automagic disable
-	myconf+=" --disable-ass-internal" # always use system libass
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -303,6 +303,22 @@ src_configure() {
 			--disable-apple-ir
 		"
 	fi
+	
+	###########
+	#Subtitles#
+	###########
+
+	# ASS/SSA support
+
+	# MPlayer ships with an internal copy, or the user can choose
+	# to build against external libass.
+
+	# You need to disable internal support to enable external.
+	use libass && myconf+=" --disable-ass-internal"
+
+	if ! use ass && ! use libass; then
+		myconf+=" --disable-ass-internal --disable-ass"
+	fi
 
 	# libcdio support: prefer libcdio over cdparanoia
 	# don't check for cddb w/cdio