Add subtitles USE flag, notes about freetype, iconv

Package-Manager: portage-2.1.1-r1

3 files changed, 25 insertions, 13 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f7330e7e6855..5f737fa6eaf7 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.426 2006/10/26 10:57:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.427 2006/10/27 05:54:36 beandog Exp $
+
+  27 Oct 2006; Steve Dibb <beandog@gentoo.org> mplayer-1.0_rc1.ebuild:
+  Add subtitles USE flag, notes about freetype, iconv
 
   26 Oct 2006; Vlastimil Babka <caster@gentoo.org> mplayer-1.0_rc1.ebuild:
   Apply the previous patch in $S. Fixes bug #152842.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 8a4d35b93bfd..b38a8d4aa52a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -37,14 +37,14 @@ EBUILD mplayer-1.0_pre8.ebuild 15541 RMD160 0b22cf41292812709441c212c11712759400
 MD5 ef3d1a1a7af9963d01028c6797b6069f mplayer-1.0_pre8.ebuild 15541
 RMD160 0b22cf41292812709441c212c11712759400ee6f mplayer-1.0_pre8.ebuild 15541
 SHA256 c044d640c161a1bf44f05880288bdc6ba2f6a2a52cc71aad0ff4ce1af492fdad mplayer-1.0_pre8.ebuild 15541
-EBUILD mplayer-1.0_rc1.ebuild 15280 RMD160 eaf10d5b05cd456c7320dddd0b3f9d0322427394 SHA1 218b20db30c32503f93af3dbd06bd2dde9e51c59 SHA256 d2af167b63b2940e1540441a18b15c554ff39b58c8124e9cd186dc0fa6f5734d
-MD5 51ab89114c18114cd752c5012f010312 mplayer-1.0_rc1.ebuild 15280
-RMD160 eaf10d5b05cd456c7320dddd0b3f9d0322427394 mplayer-1.0_rc1.ebuild 15280
-SHA256 d2af167b63b2940e1540441a18b15c554ff39b58c8124e9cd186dc0fa6f5734d mplayer-1.0_rc1.ebuild 15280
-MISC ChangeLog 77108 RMD160 e7e736c6e003171341b214456eee73176e664ae7 SHA1 361d6fbe314dd1c5f52499f3b1f1b286e039d46f SHA256 e37ba370add91696c621a33907d81c71e3753d37f40ff1331f4ab6c1678ea94a
-MD5 9dcb8ebd9a528720efba6bdd599749c5 ChangeLog 77108
-RMD160 e7e736c6e003171341b214456eee73176e664ae7 ChangeLog 77108
-SHA256 e37ba370add91696c621a33907d81c71e3753d37f40ff1331f4ab6c1678ea94a ChangeLog 77108
+EBUILD mplayer-1.0_rc1.ebuild 15737 RMD160 eed73b60f1ad1300202b21df05377b2746f8792b SHA1 fccc3b5e74d5c61f55435134040238deace35f08 SHA256 d599a7fb87883589e475b535da9e55b5a2621d45a00b508412793e4b87d589b3
+MD5 13bfdfbf4e4385df3b1b5c0baced11eb mplayer-1.0_rc1.ebuild 15737
+RMD160 eed73b60f1ad1300202b21df05377b2746f8792b mplayer-1.0_rc1.ebuild 15737
+SHA256 d599a7fb87883589e475b535da9e55b5a2621d45a00b508412793e4b87d589b3 mplayer-1.0_rc1.ebuild 15737
+MISC ChangeLog 77235 RMD160 639f83bee5719b9c28075f1cc91909fc1ff5b50f SHA1 08ce2f49086971a1e538a56ef7b1ee492b227d04 SHA256 a62ed6c28ed90dd01d07984c6b58442a028ab655c474dcff9feb6931aa344915
+MD5 50e887ee13d8042f977749343aac1270 ChangeLog 77235
+RMD160 639f83bee5719b9c28075f1cc91909fc1ff5b50f ChangeLog 77235
+SHA256 a62ed6c28ed90dd01d07984c6b58442a028ab655c474dcff9feb6931aa344915 ChangeLog 77235
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/mplayer/mplayer-1.0_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index 38019fa5136f..9a5f15602f17 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.6 2006/10/26 10:53:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.7 2006/10/27 05:54:36 beandog Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,9 +9,8 @@ IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
 cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
 dv dvdread enca encode esd fbcon gif ggi gtk iconv ipv6 jack joystick jpeg
 libcaca lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode
-vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
-theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid
-xvmc"
+vorbis opengl openal oss png real rtc samba sdl speex sse sse2 subtitles svga
+tga theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc"
 
 LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
 zh_TW"
@@ -126,6 +125,15 @@ pkg_setup() {
 	if use real && use x86; then
 		REALLIBDIR="/opt/RealPlayer/codecs"
 	fi
+
+	if use subtitles && ! ( use iconv && use truetype ); then
+		ewarn "If you want to enable support for SSA/ASS subtitles, then"
+		ewarn "you will need to enable both the 'truetype' and the 'iconv'"
+		ewarn "USE flags for this package."
+	elif use truetype && ! use iconv; then
+		ewarn "You enabled the 'truetype' USE flag, but support will be"
+		ewarn "disabled unless you also use 'iconv'."
+	fi
 }
 
 src_unpack() {
@@ -262,6 +270,7 @@ src_compile() {
 	use v4l  || myconf="${myconf} --disable-tv-v4l1"
 	use v4l2 || myconf="${myconf} --disable-tv-v4l2"
 	use jack || myconf="${myconf} --disable-jack"
+	use subtitles || myconf="${myconf} --disable-ass"
 
 	#########
 	# Codecs #