diff options
| -rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 24 | ||||
| -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 |
8 files changed, 55 insertions, 56 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/Manifest b/media-video/mplayer/Manifest index 027de58e3d19..ad22f6013c5b 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX dump_ffmpeg.sh 2489 RMD160 730700e9fdb63a27aa5ea51ba76c25919b0ce8df SHA1 bfb6dc19100793b4fc0e7e8f1104f30d3b620ff6 SHA256 c714e2faa2128f1c94ac046ff106a5f845347d18e1099f6aeab90aff2326e98e AUX ffmpeg.patch 650 RMD160 1eff7d1cb9b39a3add2754cadba9441853ee7219 SHA1 280a253b707c4da5b1e3055c0502530a995160de SHA256 70170f747f6f26700394a7646c8258aab5dcd9b96c17cb797d9d6e7d7bb02f52 AUX ffmpeg2.patch 805 RMD160 e9517f235640729eb88d68167bc1d6c5df3e2121 SHA1 302a8a6b158cd590e7b607b0ac2f1e148be5a9ef SHA256 41a7602b579bdfc8ea3078e1023fcb73de017354dd40148255411ad55bdbc3fa @@ -16,18 +13,11 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d14 DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08a4dfafdc17d09 SHA1 3f60cf0ce8c910e3628e425167cb6a46bb4a29a3 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5 DIST mplayer-1.0_rc4_p20120213.tar.xz 5451168 RMD160 ebfa2e7f4ab5bc180eea0b2206e6194d678befa5 SHA1 846ab4a7624987d30d64a546a78952fe6f36203d SHA256 28080ae63b282d717ad85a30ab8f481c1d965c8400621528ee87c7bc7d6bc890 DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 RMD160 e1286c02bda77d7e771cc36d043e1af993a99b6b SHA1 111d3e5e1a89bd9b9143e050bd0ee19e18f8f0ea SHA256 8da4ad1daa5c9b70884f775406c071c508b1bf5227084c895d840d08a115cc86 -EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20366 RMD160 8965a722285c50f92c921916ec15c7e1db04e490 SHA1 46954bb8cee51c069c4b89b006c2cc5b909cc470 SHA256 b0aaf526c95590585cd07aa17b99774997b0af2a0c5ec89140c56bf62881cfb3 -EBUILD mplayer-1.0_rc4_p20120213.ebuild 17764 RMD160 534ea5a2120539d3232d81103ad4b8a2de6f7af5 SHA1 cae5cd6a2a328542f624ed91d6e11d2e34b15256 SHA256 7e1c630fab520fb3c5a9571e15615b51a3e2040014f91679b1c67400d9a20b87 -EBUILD mplayer-1.0_rc4_p20120405.ebuild 17864 RMD160 c6125f166b75f628d04eb17bcedb388916d88234 SHA1 2c2792d6045548286171af4e4a8b733bf3c74af6 SHA256 6b2749ad061d3797a3ea5a0106423de07d50c9d5b50a76cda3c73b15371cfe04 -EBUILD mplayer-1.1-r1.ebuild 18074 RMD160 7185642202c07525b04b856559d60766e1b4ac16 SHA1 298801dc9117df42842f370f0c369e9317bd50fc SHA256 946e0ab3c184ea6afca3418ce501e311c7c772234a69fe67299683e6c5a81ac6 -EBUILD mplayer-9999.ebuild 17972 RMD160 45923b743d296283d48424cd3a392a1c1f8d9a2e SHA1 4ac38f510c4547654691c06b5c63bbab1bf0e48c SHA256 ddf46b39335481c14365276ec7e0929864ce4a6fcc196068213b04087e4cfce0 -MISC ChangeLog 42343 RMD160 43f1024431bd477c9be8f2500b678a8842de6295 SHA1 33d1d3d143f3993eee98673ea3ce8d800ad8891a SHA256 a8431edd2d8f25dc79ff1eb27de497730c0de2b9469b03e66121f71734761a64 +EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 RMD160 d56b841ac39c9a3e90a00bee8613eb21b25beb61 SHA1 83e03154f1cdbee92501b850697d4b590ad228ee SHA256 6041d8cffc438f974c5dbe4a288c1d1150f4e57580350b157aac331c889a8f5e +EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 RMD160 9641e8521689dcb6dc8f6c090249560d18e2ca2b SHA1 791940c7ce510e9ef91553fc70fd150af41ce7db SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d +EBUILD mplayer-1.0_rc4_p20120405.ebuild 17912 RMD160 5468e01dda946486c59114cb366b611a1876656a SHA1 42330104516751796283df96428ef179965debd7 SHA256 f66ab22b873cba7770da6e66c156c1355be357aec2a6c0f6eb97ab900f14d594 +EBUILD mplayer-1.1-r1.ebuild 18120 RMD160 b1aab59643dca9f86bc23972be7c1c7813dbc323 SHA1 038ad7ee782cfff92c84714fc978a6b1289f919c SHA256 2c0e978c214c5f0e0cf3c3a6bed09cd5183a7978d74506f54c5358a613eeb744 +EBUILD mplayer-9999.ebuild 18018 RMD160 e9df9e7b6a8994af68cf5eafe771f31e1f6f105e SHA1 1f5c376bf32730a49a3332d006020a9b526c96c9 SHA256 279b14464b2c25eb4c9fd9e53def2e51c52ae12f02dbd1f06cf18510d3b50a14 +MISC ChangeLog 42621 RMD160 2981d47ef83138dc2232a85fc4390f4d276f3fb2 SHA1 f903763e8c2b60b04ee1ae6c4ec0051a4ce79c4d SHA256 d67bea3f0c2dba0282ab8e649109cd4a3753b0de3e9cd4ac761d4f48d2e21391 MISC ChangeLog-2008 107064 RMD160 146604862227a837d1f463a96af6fe94d17421bf SHA1 5a18c910edcf540877f3b803fc85a9b74b503dd2 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b -MISC metadata.xml 3738 RMD160 774f4bbf001584d46c477c241c0bddf72340283b SHA1 ba7e1be9dbdcd38403059b9d29f8a710d3d68663 SHA256 78acd6956eee0def16d1953c52ce6f5bbb101a4a66caa0d3c7846f85ac7915e4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEARECAAYFAk/V6UIACgkQvFcC4BYPU0rckwCfc+vDVdBjhlb8snBVg0c6ui8f -1nUAn1TMsmp6GyaN2zgYlunwWfxnM37x -=+rVO ------END PGP SIGNATURE----- +MISC metadata.xml 3656 RMD160 279a777fdac5399d578552d03cad2a55d0d44800 SHA1 54441f5e0245ac0a2e9b1c489aa6401be25435ed SHA256 c24294ec6e43cde01922b7b2d705e35a8a85fd2d8aca70a291f00ee0d10b9b1b 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" |