Add support for drawtext

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index a5f1463bdbc78f4683e8221a61c1661de57be6b5..bb9da4c3e5613c67653567726f0b13aa7894b13d 100644 (file)
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.31 2011/11/01 00:45:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.32 2011/11/08 20:40:30 lu_zero Exp $
+
+  08 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild:
+  Add support for drawtext
 
   01 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> libav-0.6.2.ebuild,
   libav-0.6.9999.ebuild, libav-0.7.2.ebuild, libav-0.7.9999.ebuild,
@@ -8,7 +11,7 @@
   Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt
   #385241
 
-  07 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  07 Oct 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org>
   -libav-0.7_pre20110327.ebuild, -libav-0.7.ebuild, -libav-0.7.1.ebuild:
   Drop quite few overshadowed versions.
 
@@ -57,27 +60,27 @@
 *libav-0.7.9999 (21 Jun 2011)
 *libav-0.7 (21 Jun 2011)
 
-  21 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.7_rc1.ebuild,
+  21 Jun 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> -libav-0.7_rc1.ebuild,
   +libav-0.7.ebuild, +libav-0.7.9999.ebuild:
   Version bump to final 0.7 release. Remove older RC. Add 0.7 branch live
   ebuild.
 
 *libav-0.7_rc1 (15 Jun 2011)
 
-  15 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.7_beta2.ebuild,
+  15 Jun 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> -libav-0.7_beta2.ebuild,
   +libav-0.7_rc1.ebuild:
   Version bump to rc1, drop older beta.
 
-  24 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild:
+  24 May 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> libav-9999.ebuild:
   Bump dependency over x264.
 
 *libav-0.7_beta2 (13 May 2011)
 
-  13 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.7_beta1.ebuild,
+  13 May 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> -libav-0.7_beta1.ebuild,
   +libav-0.7_beta2.ebuild, libav-9999.ebuild:
   Version bump to beta2 drop beta1.
 
-  20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.9999.ebuild,
+  20 Apr 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> libav-0.6.9999.ebuild,
   libav-9999.ebuild:
   Migrate to git-2 eclass.
 
@@ -86,18 +89,18 @@
   19 Apr 2011; Luca Barbato <lu_zero@gentoo.org> +libav-0.7_beta1.ebuild:
   Prerelease
 
-  12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild,
+  12 Apr 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> libav-9999.ebuild,
   metadata.xml:
   Try to split up gpl code so user can compile just LGPL version.
 
-  12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild:
+  12 Apr 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> libav-9999.ebuild:
   Update deps to match latest reality.
 
   11 Apr 2011; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
   libav-9999.ebuild:
   Add support for the Google/VisualOn encoders for aac and amrwb
 
-  01 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.2.ebuild,
+  01 Apr 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> libav-0.6.2.ebuild,
   libav-0.6.9999.ebuild:
   Drop frei0r option that is availible only in trunk.
 
@@ -108,7 +111,7 @@
   libav-0.6.9999.ebuild, libav-0.7_pre20110327.ebuild, libav-9999.ebuild:
   Add Gentoo Prefix support
 
-  27 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.9999.ebuild,
+  27 Mar 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> libav-0.6.9999.ebuild,
   libav-0.7_pre20110327.ebuild, libav-9999.ebuild:
   Fixup version settings in snapshot. Remove useless quoting. Handle branching
   magically.
@@ -129,7 +132,7 @@
   libav-0.6.9999.ebuild, libav-9999.ebuild:
   Typo fix
 
-  22 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
+  22 Mar 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org> metadata.xml:
   Fix whitespace in metadata.xml to be nicer. Drop unused flag (result of copy
   from ffmpeg).
 
@@ -137,7 +140,7 @@
 *libav-0.6.9999 (22 Mar 2011)
 *libav-0.6.2 (22 Mar 2011)
 
-  22 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  22 Mar 2011; TomÃ\83¡Ã\85¡ ChvÃ\83¡tal <scarabeus@gentoo.org>
   +files/0.6.2-fix_enable_hardcoded_tables.patch, +libav-9999.ebuild,
   +files/0.6.2-float_arrays.patch, +libav-0.6.2.ebuild, +libav-0.6.9999.ebuild,
   +metadata.xml:

diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 8728c72cba461dc1aaa530d76f606fe5186b431b..4091edfb88f4a588774d1edc203756a63d156052 100644 (file)
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.6.2-fix_enable_hardcoded_tables.patch 1387 RMD160 3ccd0be1f6612ad45dcd78dee17817cf03bcda87 SHA1 13d1e51c17c25ba9adfb9d878334343746f917e0 SHA256 2e72e53be9df93128fc75ad4adfa9208d31f496c7bb9924c8a2e14ee2cb8d9f6
 AUX 0.6.2-float_arrays.patch 1611 RMD160 960188d97261729526187c53a281a03c31a6a95a SHA1 92bb3062933cd9540eb8b05efc6cbebb38e94a0c SHA256 311e255309dfd6a045e38303d80b534aec9444cfe314d0b4d585688075c7dd7d
 DIST libav-0.6.2.tar.bz2 3639862 RMD160 fbdee25614940253e018e42a633da579704146fd SHA1 b79dc56a08f4ef07b41d1a78b2251f21fde8b81d SHA256 eb13f20bfa09664559e81ff9691cebcb77a763320ddf63c47a402351409697af
@@ -11,17 +8,6 @@ EBUILD libav-0.6.9999.ebuild 7551 RMD160 b939f2a68e9bd9a7da4811c56432fba92c8e415
 EBUILD libav-0.7.2.ebuild 7997 RMD160 ffe4f995d2effccc27489b94589429684dab461f SHA1 a10ee4c1597be2f21715bda28718adf7bfa58118 SHA256 6f55a7e9e5e49767ff25740b29a5f61ced41f0eb518096e5dae9644bf02250db
 EBUILD libav-0.7.9999.ebuild 7947 RMD160 a67ea8d26ccffe866e4a3edc11076da4ad53d5e6 SHA1 d297581ec2cbb9e1a71199164f6107582d765686 SHA256 cb3fe767d8a836d758355daab4a20865d21cde3f8efd7480025d3b638ee5c9bd
 EBUILD libav-0.8_pre20110818.ebuild 8363 RMD160 819a6683c1a974e05423e90bc7b673c0efe69300 SHA1 d9d54bcf788aff84b612346d8061b729031cad1d SHA256 6592548fd9b633acfcae1686da5377743730c200b414fbb95574c6dd5ca5cd97
-EBUILD libav-9999.ebuild 8388 RMD160 5decb92a1d414047cf00c6c2a473543dfaaa760b SHA1 8f635fe48614db3c230cfcb9a8829bef59b589a2 SHA256 2645599a6e9390b61e7409260afe3a5ac3b7b119442d894c5be7bc376f768a69
-MISC ChangeLog 5259 RMD160 9311cd042fb914019bb35fed09f1f280fc939f74 SHA1 58ca3bf26a295019c49682be0b85337ac1cd5d62 SHA256 ac53e68d8f29c35a20098a22d42c481da8ce5ee13907cb41ce596f0cacc87241
+EBUILD libav-9999.ebuild 8495 RMD160 d4dbc8080ce99c553bb13f06f646b731cb626e93 SHA1 182804a64d75d59a1e269ad9434487ed92a82406 SHA256 351c6da3d94a8ab9fc8b9b889dd679237370b6eb1f8e92a455a2a636b79c91f1
+MISC ChangeLog 5425 RMD160 9e19a17a414a17469377810a78ba644e669125f2 SHA1 4b0118136cee5369f2f26cdb1206ffa36ce48b26 SHA256 9f3d98dd782013beb380537b337ad3cf42ff0739aa33d926c2cde25869bc7de4
 MISC metadata.xml 2343 RMD160 beadccfc0b455869a2810504ee185f622de04961 SHA1 421b87ca6c05fbde61a429dee1c90dcb88e7751a SHA256 daf4da36c94dbd7dd4e44dc643dda9420bafcec1824014ecdcb5c9067d5096b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJOr0EwAAoJEEdUh39IaPFNEYIIAJPw8TCmfF05/bJSni7G/mCf
-2n/fAnjQzx9iLgAXEqw2UwBa19aasO24QYTACeC6FOVoax0aEMD+NoYSPLpnq7uK
-ZUUwme72vBHNpxFII/o7QKXOwVybI5xtEfIMAwyDc3LF84aeyhlnk6ZyVOmjXWYe
-NvJr32KTyaWfvKZxMAIiOGCkrglpZo9Q2NtJYTX+pqmdku8905yzxRoFpRbmLKUE
-K6PMImfHGAQLGujkLv6DmLuSKUPazyGYPrEDdMurSEauctvILqPVu2BqAI4+MU1E
-gKDzNMEem2VmnG+JLNGriKC6xFYqDw0HK9pSB2JBWY9DyJOYwddLH9sODlQ5OuU=
-=p6l4
------END PGP SIGNATURE-----

diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 17de0ffe2733f0c2dde996d329df51b88e56fa56..e3f79426d3b977dda8111f57f1f7d78a26bc8d32 100644 (file)
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.18 2011/11/01 00:45:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.19 2011/11/08 20:40:30 lu_zero Exp $
 
 EAPI=4
 
@@ -27,7 +27,11 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection
+         custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+      +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss
+         pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test
+         theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -50,6 +54,7 @@ RDEPEND="
                x264? ( >=media-libs/x264-0.0.20110426 )
                xvid? ( >=media-libs/xvid-1.1.0 )
        )
+       truetype? ( media-libs/truetype )
        frei0r? ( media-plugins/frei0r-plugins )
        gsm? ( >=media-sound/gsm-1.0.12-r1 )
        ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
@@ -152,6 +157,7 @@ src_configure() {
        done
        # libavfilter options
        use frei0r && myconf+=" --enable-frei0r"
+       use truetype &&  myconf+=" --enable-libfreetype"
 
        # Threads; we only support pthread for now but ffmpeg supports more
        use threads && myconf+=" --enable-pthreads"