media-video/ffmpeg-1.2.6-r1: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 7 insertions, 110 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e810b1f..b9bc037 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,12 +1,10 @@
 AUX ffmpeg-0.10.10-freetype251.patch 1841 SHA256 523e34408a435958c48021a85b366468062eff5e523b15499f7693c862135017 SHA512 082249f8fde79e1a658156901b68cee80ef1152f6b94927d235d1fb4dfb5acf7b51809af8e405984692536dee2e205357701043438f81b892163db6e592a4005 WHIRLPOOL 2c90c2f9b9f80b039797ac63329b8d6e8c9acca79d288d7cbb971c7275db84f28a7b2588890799ef03cd75614d4e148697e381c69d440639de676eb8f607cc39
 AUX ffmpeg-1.0.8-freetype251.patch 2008 SHA256 b52b832ad8b35ba79a1cbc5c592510d874e321de2ce80bfa52e21cd74aec6404 SHA512 e56c68980a52d9ff65e92267cf23ca5170c7ea7ec3100012af19f598c4fe64e6afac53100486edd5fc14ace31baaea01ddf552c74b9138c067cf95672e86c17e WHIRLPOOL 7a8084726afae99de24da2ba04889bb11993b59b070316ab2c9b20a38c59d61abdfa625888433e253be0c948cec39127c8b43d66f695ea48bedfd215cd03e392
-AUX ffmpeg-1.2.4-freetype251.patch 1992 SHA256 33108aa78dc6195ad94311b86d165fdcf946a1a7e98e20a2cac8824c1fe76513 SHA512 410dadabf940f54b03d8437f11e9d65ad2c4a254d650d9a519bd994cc1942a678da6470c6b7713379938b46188b1e9545e028fb39896da79410f86e3870eb1dc WHIRLPOOL aaa28731bab000a4419912e97cf69182e46f9bb09059c27de874183a4b3776ad5ec06095737640e6dbdbe02dbfcfb820e4faedb835cd37657bfeea2221d97c24
-AUX ffmpeg-2.0.2-freetype251.patch 2040 SHA256 f7478552a7b29d1420ff609fa5fc5fd20413224624da4c9e4e42358ab5ac8260 SHA512 34b736207172f1bc95734d5ce71282d96cadc2925879c8cda45acce1ac8c8f2c44d59a7e6f368f8c7a987b8ca967d4ab7ee4da765baa60d060ec7a91d3d9cc27 WHIRLPOOL f7af767d60556c4a09f5086c16855b9ab987d8015c4acc1cdcc779086cfdd6631cabe59203cc05d89e7ed008218817220408e666d46cf48f2e8f041dd376711e
 AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
-DIST ffmpeg-1.2.4.tar.bz2 5967562 SHA256 3b96c8ce1b86575cd74f540e5b7a52681554289017d4b974e4efad2a09290ddf SHA512 9c3bf2b31cc0d0028cb83b9c4821073b7c11a0c24ca44f6353086e67c208c45840e71810d70309b655fb1e7b8bbe073f9ab7f336d8064c0e6130244a806a10b2 WHIRLPOOL ad1f10a5191a185c08022f80aa8861eede4680b083224e9181328b2f62a78d3a69c96b53a638125ac44ee68a949a96bd17b913955393d135293fb3ae2174651b
 DIST ffmpeg-1.2.5.tar.bz2 5971768 SHA256 9cfcdfe1949f8781b1b473fe668b8f2ab6befc2cffefd159840c62273e3e41a9 SHA512 71fa01f1eb96cfdf5bf628f4c2999e0f157aae423316cdecdc3c81c36ca438996c5d4751871611ada9b31e6542ca08c0f5f61bee9170b1336ee5a8fe1db8eb06 WHIRLPOOL 386ef933a890b565ded79f1109c09aac7d553c8af4d927dc8d6585c77a63d396a2b7484810178552ec66e95e13a85942891ed0fcb947fd793dfe72bb8816ec21
-EBUILD ffmpeg-1.2.4-r1.ebuild 10277 SHA256 095acc3bcc40b4252c775cfda079fb6ed48a4e363ce5e35b59db8cb54db24113 SHA512 5ea88b52240ffe8fd8b3c8a6a93e777b66ed4f0ebcb70729d8f6b58c2fc722a75d7a6ea19956d44b1ed2ab506ca7c17e2f2d70f15ab6b526996ae5d4de621f6a WHIRLPOOL c2a7424d6b338b92610ad0a9468994df5f1c51c41d27b4860609553d3bead18dc26cc1b39ee96ca6b599469a65324f4d2e77d5334f788de99922c5086818b91b
+DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 EBUILD ffmpeg-1.2.5-r1.ebuild 10217 SHA256 f85ca2f99162bbe47409acaa18759d51d5720dba06fcbc59755e4e52d8619330 SHA512 338226a6a695e55d8e47308781f898c4d18f618a9da8109fada123797e7b95c24f32a7439c49d074b93a91176dcac80024ca4a07d74e422bafd1c261627da1f2 WHIRLPOOL 812d794ec82b30388171889996e8bda05699e2a3342a5d4a20d0e1ee523c7c8b07972ae2505c7b11331a2cfbcd9fd597ced8fcdee674d7c7abf968df2d7c99e9
+EBUILD ffmpeg-1.2.6-r1.ebuild 10217 SHA256 f85ca2f99162bbe47409acaa18759d51d5720dba06fcbc59755e4e52d8619330 SHA512 338226a6a695e55d8e47308781f898c4d18f618a9da8109fada123797e7b95c24f32a7439c49d074b93a91176dcac80024ca4a07d74e422bafd1c261627da1f2 WHIRLPOOL 812d794ec82b30388171889996e8bda05699e2a3342a5d4a20d0e1ee523c7c8b07972ae2505c7b11331a2cfbcd9fd597ced8fcdee674d7c7abf968df2d7c99e9
 MISC ChangeLog 96751 SHA256 ee960bfb4ae6281a984772e1b5eddaef59a596ceca4a0155bb6f61343c25d82f SHA512 1f3e989ee5293e0acc044d79ad9186e57a1e8fa0c7735f73fd7e3522aaeadbe2645bc776be3dabf209d326d440bb8b03b4eb5652ae8d28d810ab563c5266fbfe WHIRLPOOL b564955bfbe695ede24004f944357d95c9c63b39e0e791cbf9108b61d189271c7d8168813944c8e2401686aeda49979ce005a6555123f71cf5bc951a3f5a636e
 MISC metadata.xml 4146 SHA256 474b6b289c999523a070334dfa7ee06f58a3264704c7352a3a1ae47b71daf46f SHA512 c3f32b37a9a250d1af577e6b78b450625e2b9b891b7c5eb7ee021f0c15cd599f893dce2f16b0b6bf2f58fd6e67bec6bd629e053c5d84d1e95ce355f2baea8da4 WHIRLPOOL 39e5994f1daf7ca5057275cf20b5e24a4ef277ef5687ecdde5987335432f8efbb02beea7d4fbc5c4e554c589e5edeecb19291b74a7b7972d72fbdc7b0d514de8
diff --git a/media-video/ffmpeg/ffmpeg-1.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
index 77a3598..6636870 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -52,8 +52,6 @@ for i in ${FFTOOLS}; do
 done
 
 RDEPEND="
-	abi_x86_32? ( >=app-emulation/emul-linux-x86-medialibs-20131008-r2[abi_x86_32]
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
 	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )
@@ -112,6 +110,10 @@ RDEPEND="
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 	!media-video/qt-faststart
 	!media-libs/libpostproc
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-medialibs-20131008-r1
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+	)
 "
 
 DEPEND="${RDEPEND}
@@ -146,7 +148,6 @@ src_prepare() {
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 
-	epatch "${FILESDIR}"/${PN}-1.2.4-freetype251.patch
 	epatch_user
 }
 
diff --git a/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch
deleted file mode 100644
index c809ff1..0000000
--- a/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch based on
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
-
---- ffmpeg-1.2.4/configure
-+++ ffmpeg-1.2.4/configure
-@@ -1075,6 +1075,26 @@
-     add_extralibs $(get_safe ${pkg}_libs)
- }
- 
-+require_libfreetype(){
-+    log require_libfreetype "$@"
-+    pkg="freetype2"
-+    check_cmd $pkg_config --exists --print-errors $pkg \
-+      || die "ERROR: $pkg not found"
-+    pkg_cflags=$($pkg_config --cflags $pkg)
-+    pkg_libs=$($pkg_config --libs $pkg)
-+    {
-+        echo "#include <ft2build.h>"
-+        echo "#include FT_FREETYPE_H"
-+        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
-+        echo "int main(void) { return 0; }"
-+    } | check_ld "cc" $pkg_cflags $pkg_libs \
-+      && set_safe ${pkg}_cflags $pkg_cflags \
-+      && set_safe ${pkg}_libs   $pkg_libs \
-+      || die "ERROR: $pkg not found"
-+    add_cflags    $(get_safe ${pkg}_cflags)
-+    add_extralibs $(get_safe ${pkg}_libs)
-+}
-+
- hostcc_o(){
-     eval printf '%s\\n' $HOSTCC_O
- }
-@@ -3902,7 +3922,7 @@
- enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
- flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
- enabled libflite   && require2 libflite "flite/flite.h" flite_init $flite_libs
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_libfreetype
- enabled libgsm     && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-                             check_lib "${gsm_hdr}" gsm_create -lgsm && break;
-                         done || die "ERROR: libgsm not found"; }
---- ffmpeg-1.2.4/libavfilter/vf_drawtext.c
-+++ ffmpeg-1.2.4/libavfilter/vf_drawtext.c
-@@ -48,7 +48,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG
diff --git a/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch
deleted file mode 100644
index 3b88c3a..0000000
--- a/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch based on 
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
-
---- ffmpeg-2.0.2/configure
-+++ ffmpeg-2.0.2/configure
-@@ -1096,6 +1096,26 @@
-     add_extralibs $(get_safe ${pkg}_libs)
- }
- 
-+require_libfreetype(){
-+    log require_libfreetype "$@"
-+    pkg="freetype2"
-+    check_cmd $pkg_config --exists --print-errors $pkg \
-+      || die "ERROR: $pkg not found"
-+    pkg_cflags=$($pkg_config --cflags $pkg)
-+    pkg_libs=$($pkg_config --libs $pkg)
-+    {
-+        echo "#include <ft2build.h>"
-+        echo "#include FT_FREETYPE_H"
-+        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
-+        echo "int main(void) { return 0; }"
-+    } | check_ld "cc" $pkg_cflags $pkg_libs \
-+      && set_safe ${pkg}_cflags $pkg_cflags \
-+      && set_safe ${pkg}_libs   $pkg_libs \
-+      || die "ERROR: $pkg not found"
-+    add_cflags    $(get_safe ${pkg}_cflags)
-+    add_extralibs $(get_safe ${pkg}_libs)
-+}
-+
- hostcc_o(){
-     eval printf '%s\\n' $HOSTCC_O
- }
-@@ -4143,7 +4163,7 @@
- enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
- flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
- enabled libflite          && require2 libflite "flite/flite.h" flite_init $flite_libs
--enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype       && require_libfreetype
- enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme
- enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
---- ffmpeg-2.0.2/libavfilter/vf_drawtext.c
-+++ ffmpeg-2.0.2/libavfilter/vf_drawtext.c
-@@ -48,7 +48,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG