From 9563e741479d3524b5eab80c3660d03a9e45c682 Mon Sep 17 00:00:00 2001 From: Steve Dibb Date: Sat, 17 Jul 2010 16:36:23 +0000 Subject: [PATCH] Revert libass change; Always use external versions where possible --- media-video/mplayer/ChangeLog | 5 ++++- media-video/mplayer/Manifest | 4 ++-- media-video/mplayer/mplayer-9999.ebuild | 28 +++++++------------------ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 39a5c4d64556..89fa498aa7fc 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # 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.756 2010/07/17 03:47:20 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.757 2010/07/17 16:36:23 beandog Exp $ + + 17 Jul 2010; Steve Dibb mplayer-9999.ebuild: + Revert libass change; Always use external versions where possible 17 Jul 2010; Steve Dibb mplayer-9999.ebuild, metadata.xml: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index f1a378a0eb71..2681290455a1 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 20466 RMD160 c6de1b657fcfec219bd9f58afd5de922ad2face1 SHA1 7d2c208998c6245c9c5db66a3edf497c9a5f5a8e SHA256 abd58c420ea80d1a4f2306b661436aebb7959da891f062ccc6464cdf33d04c20 -MISC ChangeLog 133215 RMD160 66d594821f6685afeb82969f1338851c1d99f683 SHA1 b25742b644d7cde8b74ccecf33cc83fa73f7912e SHA256 03c76d71c340f559c03d199a9007ce48e9acf689d8d53a8a2682d0c3f9f576d0 +EBUILD mplayer-9999.ebuild 20245 RMD160 58065109f2567b9134b38120f5614bb2f96492ee SHA1 d8cf7432aeebae4de6bc6feb47e8f7a2af84cfb3 SHA256 a849f790a6c72a6624812c3a04ee4db60f3d35391b8870c2472ff0ccbb95ca06 +MISC ChangeLog 133352 RMD160 c2ddf2bd149c66ada43a6e140cc3fdb85476319e SHA1 22922e0252a61bc5a8b0ee69c5ffea01c2059161 SHA256 5d045af0e88ea72ca9fa2f9538e4f33c71aebd694b9a46d77e45a0351aabec5e MISC metadata.xml 3832 RMD160 f471f5beb863cfd64ebf1c7ef9854db52feca95c SHA1 cf0d5af692408b976be5c7c98c98c097ccb932cc SHA256 9f5f48684ed4320dc05fc5d91e6979c4444a6f67e522bb56a327a28ba8a99793 diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 3ab3a4d76194..1cbf11491f9c 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.73 2010/07/17 03:48:29 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.74 2010/07/17 16:36:23 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 -libass libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +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} ) + ass? ( ${FONT_RDEPS} media-libs/libass[enca?] ) bidi? ( dev-libs/fribidi ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) @@ -121,7 +121,6 @@ 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 ) @@ -285,8 +284,11 @@ src_configure() { $(use_enable network) $(use_enable joystick) " - uses="bl enca ftp rtc" # nemesi <- not working with in-tree ebuild + uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild myconf+=" --disable-nemesi" # nemesi automagic disable + # upstream includes an internal copy for lazy users. + # We want to always use external libs where possible. + myconf+=" --disable-ass-internal" # always use system libass for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done @@ -304,22 +306,6 @@ src_configure() { " 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 if use cdio; then -- 2.26.2