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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)

4 files changed, 103 insertions, 2 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/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') {