diff options
author | Ben de Groot <yngwin@gentoo.org> | 2012-06-17 05:19:59 +0000 |
---|---|---|
committer | Ben de Groot <yngwin@gentoo.org> | 2012-06-17 05:19:59 +0000 |
commit | 7cb32147dc1b77da7c646887bbaa93eee3d688ab (patch) | |
tree | 463070f92f7040abd518e62fbfdfa9b0ee36d30a | |
parent | Use global USE flag "postscript" instead of local USE flag "ps" for PostScrip... (diff) | |
download | gentoo-2-7cb32147dc1b77da7c646887bbaa93eee3d688ab.tar.gz gentoo-2-7cb32147dc1b77da7c646887bbaa93eee3d688ab.tar.bz2 gentoo-2-7cb32147dc1b77da7c646887bbaa93eee3d688ab.zip |
Move USE=ass usage to new global libass useflag (bug #328245)
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
-rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/mplayer/metadata.xml | 1 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild | 27 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild | 13 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild | 13 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.1-r1.ebuild | 13 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 13 |
7 files changed, 48 insertions, 39 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index fb22bdb9d6f4..2be571dc093f 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.852 2012/06/11 12:49:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.853 2012/06/17 05:19:59 yngwin Exp $ + + 17 Jun 2012; Ben de Groot <yngwin@gentoo.org> metadata.xml, + mplayer-1.0_rc4_p20110322-r1.ebuild, mplayer-1.0_rc4_p20120213.ebuild, + mplayer-1.0_rc4_p20120405.ebuild, mplayer-1.1-r1.ebuild, mplayer-9999.ebuild: + Move USE=ass usage to new global libass useflag (bug #328245) *mplayer-1.1-r1 (11 Jun 2012) diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index a36caa854219..0801e2694707 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="3dnowext">Enable 3dnowext cpu instructions</flag> <flag name="amr">Enables Adaptive Multi-Rate format support</flag> - <flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag> <flag name="bl">Blinkenlights video output</flag> <flag name="bluray">Enable playback of Blu-ray filesystems</flag> <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag> diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild index 9abd07af2ec2..5b747d392c5f 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild,v 1.11 2012/05/05 08:58:52 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322-r1.ebuild,v 1.12 2012/06/17 05:19:59 yngwin Exp $ EAPI=4 @@ -14,16 +14,16 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} # BUMP ME PLZ, NO COOKIES OTHERWISE [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r33094 -IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray +IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode +faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas -+network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime -radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 -tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix -+vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc -zoran" ++libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 +nas +network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr ++quicktime radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex +sse sse2 ssse3 tga +theora +tremor +truetype +toolame +twolame +unicode +v4l vdpau vidix +vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver ++xv +xvid xvmc zoran" [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" VIDEO_CARDS="s3virge mga tdfx vesa" @@ -89,7 +89,6 @@ RDEPEND+=" aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) amr? ( !bindist? ( media-libs/opencore-amr ) ) - ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] ) bidi? ( dev-libs/fribidi ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) @@ -121,6 +120,7 @@ RDEPEND+=" jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) ladspa? ( media-libs/ladspa-sdk ) + libass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) @@ -297,13 +297,14 @@ src_configure() { $(use_enable network networking) $(use_enable joystick) " - uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild + uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild myconf+=" --disable-nemesi" # nemesi automagic disable for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done use bidi || myconf+=" --disable-fribidi" use ipv6 || myconf+=" --disable-inet6" + use libass || myconf+=" --disable-ass" use nut || myconf+=" --disable-libnut" use rar || myconf+=" --disable-unrarexec" use samba || myconf+=" --disable-smb" @@ -350,7 +351,7 @@ src_configure() { # SRT/ASS/SSA (subtitles) requires freetype support # freetype support requires iconv # iconv optionally can use unicode - if ! use ass && ! use truetype; then + if ! use libass && ! use truetype; then myconf+=" --disable-freetype" if ! use iconv; then myconf+=" @@ -688,7 +689,7 @@ src_install() { dohtml -r "${S}"/DOCS/HTML/* fi - if ! use ass && ! use truetype; then + if ! use libass && ! use truetype; then dodir /usr/share/mplayer/fonts # Do this generic, as the mplayer people like to change the structure # of their zips ... @@ -712,7 +713,7 @@ _EOF_ doins "${S}/etc/menu.conf" fi - if use ass || use truetype; then + if use libass || use truetype; then cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ fontconfig=1 subfont-osd-scale=4 diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild index d717010dff72..93743dbeaad5 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild,v 1.5 2012/05/05 08:58:52 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120213.ebuild,v 1.6 2012/06/17 05:19:59 yngwin Exp $ EAPI=4 @@ -10,11 +10,11 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray +IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas ++libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix @@ -66,7 +66,6 @@ RDEPEND+=" a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) - ass? ( >=media-libs/libass-0.9.10[enca?] ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) @@ -97,6 +96,7 @@ RDEPEND+=" jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) ladspa? ( media-libs/ladspa-sdk ) + libass? ( >=media-libs/libass-0.9.10[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) @@ -173,7 +173,7 @@ fi # xvmc requires xvideo support REQUIRED_USE="bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) - ass? ( truetype ) + libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) @@ -275,13 +275,14 @@ src_configure() { $(use_enable network networking) $(use_enable joystick) " - uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild + uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild myconf+=" --disable-nemesi" # nemesi automagic disable for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done use bidi || myconf+=" --disable-fribidi" use ipv6 || myconf+=" --disable-inet6" + use libass || myconf+=" --disable-ass" use nut || myconf+=" --disable-libnut" use rar || myconf+=" --disable-unrarexec" use samba || myconf+=" --disable-smb" diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild index 47310bb97ef1..fb8f716f852a 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v 1.5 2012/05/05 08:58:52 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v 1.6 2012/06/17 05:19:59 yngwin Exp $ EAPI=4 @@ -10,11 +10,11 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray +IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas ++libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix @@ -66,7 +66,6 @@ RDEPEND+=" a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) - ass? ( >=media-libs/libass-0.9.10[enca?] ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) @@ -97,6 +96,7 @@ RDEPEND+=" jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) ladspa? ( media-libs/ladspa-sdk ) + libass? ( >=media-libs/libass-0.9.10[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) @@ -173,7 +173,7 @@ fi # xvmc requires xvideo support REQUIRED_USE="bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) - ass? ( truetype ) + libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) @@ -279,13 +279,14 @@ src_configure() { $(use_enable network networking) $(use_enable joystick) " - uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild + uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild myconf+=" --disable-nemesi" # nemesi automagic disable for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done use bidi || myconf+=" --disable-fribidi" use ipv6 || myconf+=" --disable-inet6" + use libass || myconf+=" --disable-libass" use nut || myconf+=" --disable-libnut" use rar || myconf+=" --disable-unrarexec" use samba || myconf+=" --disable-smb" diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild index ea907f30a626..124cda9ace2c 100644 --- a/media-video/mplayer/mplayer-1.1-r1.ebuild +++ b/media-video/mplayer/mplayer-1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.1 2012/06/11 12:49:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.2 2012/06/17 05:19:59 yngwin Exp $ EAPI=4 @@ -10,11 +10,11 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray +IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas ++libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix @@ -70,7 +70,6 @@ RDEPEND+=" a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) - ass? ( >=media-libs/libass-0.9.10[enca?] ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) @@ -101,6 +100,7 @@ RDEPEND+=" jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) ladspa? ( media-libs/ladspa-sdk ) + libass? ( >=media-libs/libass-0.9.10[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) @@ -177,7 +177,7 @@ fi # xvmc requires xvideo support REQUIRED_USE="bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) - ass? ( truetype ) + libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) @@ -287,13 +287,14 @@ src_configure() { $(use_enable network networking) $(use_enable joystick) " - uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild + uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild myconf+=" --disable-nemesi" # nemesi automagic disable for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done use bidi || myconf+=" --disable-fribidi" use ipv6 || myconf+=" --disable-inet6" + use libass || myconf+=" --disable-libass" use nut || myconf+=" --disable-libnut" use rar || myconf+=" --disable-unrarexec" use samba || myconf+=" --disable-smb" diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 3587347e0944..d66c71fdcdc3 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.131 2012/06/11 12:47:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.132 2012/06/17 05:19:59 yngwin Exp $ EAPI=4 @@ -10,11 +10,11 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray +IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas ++libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix @@ -70,7 +70,6 @@ RDEPEND+=" a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) - ass? ( >=media-libs/libass-0.9.10[enca?] ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) @@ -101,6 +100,7 @@ RDEPEND+=" jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) ladspa? ( media-libs/ladspa-sdk ) + libass? ( >=media-libs/libass-0.9.10[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) @@ -177,7 +177,7 @@ fi # xvmc requires xvideo support REQUIRED_USE="bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) - ass? ( truetype ) + libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) @@ -282,13 +282,14 @@ src_configure() { $(use_enable network networking) $(use_enable joystick) " - uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild + uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild myconf+=" --disable-nemesi" # nemesi automagic disable for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done use bidi || myconf+=" --disable-fribidi" use ipv6 || myconf+=" --disable-inet6" + use libass || myconf+=" --disable-libass" use nut || myconf+=" --disable-libnut" use rar || myconf+=" --disable-unrarexec" use samba || myconf+=" --disable-smb" |