Fix build failures wrt bug 545700 ; Revbump to include the libav IUSE so we can rebuilt against libav/ffmpeg subslots

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

5 files changed, 123 insertions, 20 deletions

diff --git a/dev-php/ffmpeg-php/ChangeLog b/dev-php/ffmpeg-php/ChangeLog
index f6d286032602..41bf1d9c8c77 100644
--- a/dev-php/ffmpeg-php/ChangeLog
+++ b/dev-php/ffmpeg-php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/ffmpeg-php
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.18 2015/06/09 15:00:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.19 2015/06/24 01:02:47 grknight Exp $
+
+*ffmpeg-php-0.6.0-r4 (24 Jun 2015)
+
+  24 Jun 2015; Brian Evans <grknight@gentoo.org> +ffmpeg-php-0.6.0-r4.ebuild,
+  +files/ffmpeg-php-0.6.0-libav10.patch, ffmpeg-php-0.6.0-r3.ebuild:
+  Fix build failures wrt bug 545700 ; Revbump to include the libav IUSE so we
+  can rebuilt against libav/ffmpeg subslots
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-php/ffmpeg-php/Manifest b/dev-php/ffmpeg-php/Manifest
index 76fdfc549b30..5926e65fc9f8 100644
--- a/dev-php/ffmpeg-php/Manifest
+++ b/dev-php/ffmpeg-php/Manifest
@@ -1,33 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ffmpeg-php-0.6.0-api.patch 2623 SHA256 015804ac7f83cc1b33e564064334054a22708a1bea457cd136fac2b1c47ddbaf SHA512 b9afb848f399fd01afd21aaec5271f96edd72e5d160c1435cde05beb7272b5edddd829602ee298503c53a013075ac29c9fef8613b26ac0fc4b67ca3e46f86717 WHIRLPOOL 66cc2d328bf6dab181c7d30fe3169d90064487e2b4aa7eae557b31f13d49cc99268217eb6cece2529fa9da54fa9bcff9bf13e1fbfc0c7e2c0edc012b39f494b5
 AUX ffmpeg-php-0.6.0-avutil50.patch 1347 SHA256 a08ad6582c7e57a43eddc7419fe37b89b1194d85d752a7a2a8837c1192784eec SHA512 0f24244085e8fb43686a40bb37eb5957dd2d0e2338dfb5c25e92b1233d0c2360b5726134449ce203e952328bb723d1004d68876458e7a7ef44fc2a11ff4b3380 WHIRLPOOL abb23030e7fbdaf41cfbe8a4b521ee385c022bb3abcb9906b20974add7809abaf9ef40b2ed85fc63f4b739d12df97d7ad7f08f0ab30a5b50dea1c497fbf63033
 AUX ffmpeg-php-0.6.0-ffincludes.patch 3118 SHA256 403ebcbfcc21b013b1df57014ae2cfba009481190417b98ab23c058c3fdad501 SHA512 d9901c5ff51d46fd44ed2bc76e84a59935579477a901edcd74a6cbae23ac9b25ad91c463e3a77a060e4802c150c9ee3eaeb2638f5e2dca2ecaece4f010a63023 WHIRLPOOL 41aadbca2d9226cd467f62e98d61aea65818c629e3f6accb3830e421581c069b65eaba604407b2b4d86bc6911334370ffdf7408ec26d0275437232fb5947eb7a
 AUX ffmpeg-php-0.6.0-ffmpeg.patch 11682 SHA256 ad404b3e8d498549bc705516e23de0dc8182b02bb90bd53efa74d380ba2480ce SHA512 dd2ca60961da6e0a4e301f5618dc1f719239f94e507345ad242a7fb2f64c8c70c3f03eaeac7e1fe78b583480e02f32edde6592fafc8f64eaf490f43680d66e0a WHIRLPOOL 0d43e1d0760b9f0141641ec26034bf658783b6edd187342eb252896e1e885c42cb85e3c24af5332156db4e9118a04fb57a268a64b33cbeda03b231563bbe73d6
 AUX ffmpeg-php-0.6.0-ffmpeg1.patch 907 SHA256 622265a21424bbe72afa6d71e44fa89cd381bc45a7143e6b4b300d64c744c069 SHA512 aa43e73d33c52caeb50a18bb635079ed17dc047f53cae15f7f9b11d961ecf516f3751c43ad1a91aeb213c2f6296190b294463bfb6ab651c360cc7390bd55d328 WHIRLPOOL bf9729fc4a348182885fabb501c9d7003f39745b8297cd7efa19072369dd7eaa8020875f0c294fad63707f982f680b01dcf84396b9e2857ffb6c423dac52b9db
+AUX ffmpeg-php-0.6.0-libav10.patch 1610 SHA256 8eedc78ced5bce78dd97e08667ce804d3f4ba48168260a97874c7d2126a954ae SHA512 3168fa18c44c62bd680fd31a91da1dc5b86785a0f0aa09006c43932e052d18b3f00da5e424b0c6eefd5fa22847d7fdeb85e23f3e5da03bd8612f8c7d9c8a8c86 WHIRLPOOL 67ee884f6cc43d5d0aa6b97d553c2ed50fcb6e473143093a0552578d74d7face0ae0c8fa07bb4049e82b39745f7adfe44fa15fc6b7d6de7cf1ad766cf775a59b
 AUX ffmpeg-php-0.6.0-log.patch 459 SHA256 0cea92de0a3e7bb4f07805259884c9b0f4f9a4e449ad8b655c7eb9bdcc85a789 SHA512 2f47b5c6d199514737c3b660e41325ac64711b476f9b2d7d21cf2ace73d633458f3970c802526a5fc760f4209196d248d39721a438a8dd8ef8f821383475d713 WHIRLPOOL cb4ad536836794a61c764094b7554eaae1123215c8548094f68d9bc0b31f63a3edb2c3978c846b0eb03551fd372bc2a120df41854c7449b1a9061dd818988542
 AUX ffmpeg-php-0.6.0-php5-4.patch 1187 SHA256 4b23c32a219d72e5d3425b40833447f3e9ecdd9f0152dbc526414a12e47cb827 SHA512 47f08aabe9999dd9fe1013701f5a749534b9576d7f2acc6fa07f6af3dc3faa53aa60cbd7cd127bda6165ad8d8df717a3ad35d7ed3c7859ac33365b5ba98e6e7a WHIRLPOOL bf35a68aee41e3ce44958dd751ba2300cf209376c14c69c319d125ed1ea0a298821afb77e83bd8afa69905703e57ed61a63517833b7ad0fa25f1aeb0edfb92f1
 DIST ffmpeg-php-0.6.0.tbz2 275557 SHA256 ec8a9847e0f4d5101a5afedb7dac318e9a13f099865215ae99d08d56add9b141 SHA512 837c854870886486683cf9d3ac2de376f0b4067487d68d4f5c685dd0bd4d306e406334821140bd1fab2d48105e7ee17956db70f2f70fb9bec4dcea14a2104127 WHIRLPOOL b390017ae6d7db3a7e40847468abfb9c151571e878545d02550c854d1f319add693cf87afe3391b03f3f2399a78ac225c0dcc28cdfbac2b58baa8ba8ef871605
-EBUILD ffmpeg-php-0.6.0-r3.ebuild 1217 SHA256 147ab84c2776b271ea2910f42e5a9d7e814371852316acbf113ed053f696f213 SHA512 eea61c04731768016d87d8003cf11bc9df2f1ee9b9d32c1a6cb8807e9ca48fe335b11bbef0076c965df59bf223b4f4609627b1f932a373a99a7feebe92551553 WHIRLPOOL 869b8ce670995b460df0e5e62052f32fb18b266387d34f1837dad0d120e6f2c6aaf220f8fac2c90550865694ed97a80f1a80cb5ed0e47ffc3db02a5971166e25
-MISC ChangeLog 4418 SHA256 e0bede3f2540c2e0776662ea137fc28dddf87c71ef3f281cdaec32f4acfe4110 SHA512 3d53624c9f6e54fb78fdd3075d3116f7becdd5e8ed70745d6352d6ee9c8827c8f8713ebbd6f9e1eddf3787757f08c9054573dc15c31cdfc164877ac2a88958f3 WHIRLPOOL c207b16d22a3a50ecd7bd93f2c6dc50e271331cbbd44bb23ff5f545d30da8446461e99fc7f13e1cc45fcae5037c7cfc5c307b09f04c54e83c8d61b044eb915fd
+EBUILD ffmpeg-php-0.6.0-r3.ebuild 1259 SHA256 fb8db76bbf7f5cef3de30ba638d25ba0d069c8a552e6f2a3e213b8a05d2e9eaa SHA512 7614e072020f6df8c6ae2409bb5b932f3925ab188deee82779890589a48709b3d210c7dbb427d8566bbef97d062b1863e8b5ec3774e6ec6dd686d48d0f3bcf28 WHIRLPOOL 007d12f20a091769cffbea776e952abf28ecdc782aab77761f8082e619346c76a9e10e5f7f0dee5a44927de8e79f40bfbeb9da7d786806c6b6c1811189c39517
+EBUILD ffmpeg-php-0.6.0-r4.ebuild 1317 SHA256 985f4d939353e6eeb3b5758a21f42ad699f02342b63e016ea0fefd6630955b37 SHA512 3b49cfc3a281c2bed83ec206ad79e7562bb3f99167bcb5cc3fb720a567e04d2d95541e192305fa04aeccb137a6f9d02cf6cba1271150e0c9ffbf1b2374de6b4b WHIRLPOOL 87ef07d8d763915ff06c6fa941eb72134bd07211b52fc3ef33f6aa2b849c63e13d02fe728ce3ed52f067108d0fdb793ad82c91504c979c0da5e6b1ade77fbd48
+MISC ChangeLog 4728 SHA256 26057297f6b0261116a1856256bc502399f2f600550748f0ab82304c7d323c34 SHA512 e44dcd53b2c7a0f1b4c7f9bd43a21da5877c2b2635ea84135c2590638cdcc72d82a1558e15a0081e6b512413e46dd99b8ee93e4e8b3b4e51db8116f2ec45a719 WHIRLPOOL b57750c4f63e5d30ffe67374babe93ed37cd5fc546ece7f7b0ac808f90917a8e6fea1f399202ee4702b822db47803ab3f5f19136c57987b685c2fd84126e771a
 MISC metadata.xml 237 SHA256 5ecab4784353eff52728e3c63a013f13bfdc7ae5db3186e7d6d57522252227b5 SHA512 2b91bc15eb543527707ef0faee1fbc040d4a263211e44626bf3a45a07b5d1e2ad87afd738661ec034ff30ee2656e2388ceb74e501316f9bf5a1ec46394b63880 WHIRLPOOL c439b7ff815296c3adeb417d24f930fcb898d3156488dd4c7344efcff619d5a51f1eb1e4fb5f48d6f74bbe499ac65918f1fbead33cb01b379a2ca45b85b2f9a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVdv+YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwj4P/3RVdmOzhQQ6TPmZrvjheJmu
-lWN6A3Re6ZCPh+osE0P4M4f70iorHyRUj0kGLz9uD45a1fPU5IpnQWeGYznHKMcJ
-DWBwp69hQ9+XR28RAk16l0touf1zNs549M92aswF5ddgdTokuc5OgQdENt1DZrAh
-4YYs+Te6tExvNud3KgjMD4xZsTA8m1SXiA/u1f0+K/irMBZLBeUDFmWf+12XcW30
-SpG+FqDdFsjdo6HhfPIvbE+79/CWWYWC1uRajPt51orXRApSJuJXL8bEKaY49zyD
-WEb4TJckiihd+IxW3q/kgVUxMtgRulFBBrECciU6tWl9xRfQN30hoq3RXicutHKN
-gEDgRkV4tMZxTQnPKA+aBYSK1aOXqSJcGGj8jSkLy7srFUR4IB3aeQgqOQM5JJRW
-6OLymIw/znSJXk1fuc56nZ2f1BPxI5RJaHgcUDWRrzDCQYN6DeskVXiRs5qYiKTo
-/1XkOUvEm2+vEr5V8uVc1L1/kbUcfuSqHQvQLjGXeinOVQ68eLGSrFTIitYAAB1m
-Xt6Vg/m3HWWbd2WADz0Q1qE/fgYDkHo3y+u9aE147MY6PI+MbT1F0BSapg2V0KeQ
-NzB1iI4kxmGH/ipQ9qYWXCuIcG6yQa1/81jpjM/KUMJxPB3PfYrRgRz4dp5AGW9+
-x+voYa8miK28ou9P1TwE
-=fLu3
+iQJ8BAEBCABmBQJVigG8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2NsAQAKz64iZgtG+yFwuR97UCxptr
+iJTkpVitOz9SWmhi7vRqgSObUFeAbm0/pluy+7nYzebtwZY52+8co0G9IXfq7leX
+zLylnG8a8YWUdqEs7S5V2D5B3BizDVj/xIuuNHojLQt3VNiguKwQ5NcIz8qzKbWH
+PDcwwi922z7R+6/eMzhsi1Ck/3TVgI/iSnZE/K3YnQx5fxSHfkvAQ4Q99IklvKXc
+CtlUEOOh1wX6Aj6q23PbPWO18Y7uCcz/Sb2vYE9naQf8XaISxzLPQQngaEHyDOAc
+OyxLvAnj9/2bvWUWF/2Xcp8AtsW0bYE8Kg4kRvwL72I0RLbCZz0m8KdWw4Fg0T7O
+kWiVXlgS3xMnIydvWlt6vmIpK85wR8XUEQDgpcG5CbUi6OKiewn4F0ckQKuf3fty
+LAsgY02OreqrPDHuOCUMOWvrHgdSZfsvSvuTyLjUjNcsF1u/p9GDNSPt0u9SYP1w
+anoqgywTLaa8OwRTbIqfZNsWHmVmORsGO06ntxjMEjoyrJReB9FJ29avt3ZpZBgF
+Ul/pH80Hib0dHLwotlmiXHd5GWNF3298thQw1tUXaoae80mXZhWDE9IlIoxmcx8F
+uzN+kQ283miYiGE5VRgwVbakdtoyZoT+Sb942uwV3hQjAyPSfwNgUph/IRON4RzD
+57HtMvQXAiFZTqS7UL+I
+=I9Nz
 -----END PGP SIGNATURE-----
diff --git a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild
index d6c91c484a5a..e6d365cb761e 100644
--- a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild
+++ b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild,v 1.6 2015/04/14 18:05:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild,v 1.7 2015/06/24 01:02:47 grknight Exp $
 
 EAPI="5"
 
@@ -42,6 +42,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-ffincludes.patch"
 		epatch "${FILESDIR}/${P}-ffmpeg1.patch"
 		epatch "${FILESDIR}/${P}-api.patch"
+		epatch "${FILESDIR}/${P}-libav10.patch"
 	done
 	php-ext-source-r2_src_prepare
 }
diff --git a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild
new file mode 100644
index 000000000000..64fb8c3780f0
--- /dev/null
+++ b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild,v 1.1 2015/06/24 01:02:47 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="ffmpeg"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5 php5-4"
+
+inherit php-ext-source-r2 eutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension that provides access to movie info"
+HOMEPAGE="http://sourceforge.net/projects/ffmpeg-php/"
+SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="libav"
+
+DEPEND="libav? ( media-video/libav:0= )
+	!libav? ( media-video/ffmpeg:0= )
+	dev-lang/php:*[gd]"
+RDEPEND="${DEPEND}"
+
+# The test breaks with the test movie, but it the same code works fine with
+# other movies
+
+RESTRICT="test"
+
+DOCS="CREDITS ChangeLog EXPERIMENTAL TODO"
+
+src_prepare() {
+	for slot in $(php_get_slots) ; do
+		cd "${WORKDIR}/${slot}"
+		epatch "${FILESDIR}/${P}-avutil50.patch"
+		epatch "${FILESDIR}/${P}-ffmpeg.patch"
+		epatch "${FILESDIR}/${P}-log.patch"
+		epatch "${FILESDIR}/${P}-php5-4.patch"
+		epatch "${FILESDIR}/${P}-ffincludes.patch"
+		epatch "${FILESDIR}/${P}-ffmpeg1.patch"
+		epatch "${FILESDIR}/${P}-api.patch"
+		epatch "${FILESDIR}/${P}-libav10.patch"
+	done
+	php-ext-source-r2_src_prepare
+}
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-libav10.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-libav10.patch
new file mode 100644
index 000000000000..e62ec93d9146
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-libav10.patch
@@ -0,0 +1,44 @@
+diff -aurN a/ffmpeg_movie.c b/ffmpeg_movie.c
+--- a/ffmpeg_movie.c	2015-06-22 19:46:01.220498329 -0400
++++ b/ffmpeg_movie.c	2015-06-22 20:44:26.802671398 -0400
+@@ -697,7 +697,16 @@
+       return rate;
+     }
+ 
+-#if LIBAVCODEC_BUILD > 4753 
++#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
++    if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
++        if (st->avg_frame_rate.den && st->avg_frame_rate.num) {
++            rate = av_q2d(st->avg_frame_rate);
++        } else {
++            rate = 1 / av_q2d(GET_CODEC_FIELD(st->codec, time_base));
++        }
++    }
++    return (float)rate;
++#elif LIBAVCODEC_BUILD > 4753 
+     if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
+         if (st->r_frame_rate.den && st->r_frame_rate.num) {
+             rate = av_q2d(st->r_frame_rate);
+@@ -980,14 +980,22 @@
+     if (p) {
+         codec_name = p->name;
+ #ifdef FF_API_SUB_ID
++#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
++        if (decoder_ctx->codec_id == AV_CODEC_ID_MP3) {
++#else
+         if (decoder_ctx->codec_id == CODEC_ID_MP3) {
++#endif
+             if (decoder_ctx->sub_id == 2)
+                 codec_name = "mp2";
+             else if (decoder_ctx->sub_id == 1)
+                 codec_name = "mp1";
+         }
+ #endif
++#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
++    } else if (decoder_ctx->codec_id == AV_CODEC_ID_MPEG2TS) {
++#else
+     } else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) {
++#endif
+         /* fake mpeg2 transport stream codec (currently not registered) */
+         codec_name = "mpeg2ts";
+     } else if (decoder_ctx->codec_name[0] != '\0') {