Fix build with latest ffmpeg, by Thomas Scheiblauer <thomas.scheiblauer@hauptversammlung.at>, bug #283998

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 47 insertions, 5 deletions

diff --git a/dev-php5/ffmpeg-php/ChangeLog b/dev-php5/ffmpeg-php/ChangeLog
index 0ccb4d086802..1e91df81d68b 100644
--- a/dev-php5/ffmpeg-php/ChangeLog
+++ b/dev-php5/ffmpeg-php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php5/ffmpeg-php
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ChangeLog,v 1.4 2008/12/11 20:30:31 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ChangeLog,v 1.5 2009/09/22 04:44:18 aballier Exp $
+
+  22 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-php-0.6.0.ebuild,
+  +files/ffmpeg-php-0.6.0-avutil50.patch:
+  Fix build with latest ffmpeg, by Thomas Scheiblauer
+  <thomas.scheiblauer@hauptversammlung.at>, bug #283998
 
 *ffmpeg-php-0.6.0 (11 Dec 2008)
 
diff --git a/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild b/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild
index eb815c1a0bbd..3678825973f4 100644
--- a/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild
+++ b/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild,v 1.1 2008/12/11 20:30:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild,v 1.2 2009/09/22 04:44:18 aballier Exp $
 
 PHP_EXT_NAME="ffmpeg"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-inherit depend.php php-ext-source-r1
+inherit depend.php php-ext-source-r1 eutils
 
 KEYWORDS="~amd64 ~x86"
 
@@ -26,6 +26,12 @@ pkg_setup() {
 	require_gd
 }
 
+src_unpack() {
+	php-ext-source-r1_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-avutil50.patch"
+}
+
 src_install() {
 	php-ext-source-r1_src_install
 	dodoc-php CREDITS ChangeLog EXPERIMENTAL TODO
diff --git a/dev-php5/ffmpeg-php/files/ffmpeg-php-0.6.0-avutil50.patch b/dev-php5/ffmpeg-php/files/ffmpeg-php-0.6.0-avutil50.patch
new file mode 100644
index 000000000000..070b5275d4d9
--- /dev/null
+++ b/dev-php5/ffmpeg-php/files/ffmpeg-php-0.6.0-avutil50.patch
@@ -0,0 +1,31 @@
+Index: ffmpeg-php-0.6.0/ffmpeg_frame.c
+===================================================================
+--- ffmpeg-php-0.6.0.orig/ffmpeg_frame.c
++++ ffmpeg-php-0.6.0/ffmpeg_frame.c
+@@ -333,7 +333,7 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, toGDImag
+ 
+     GET_FRAME_RESOURCE(getThis(), ff_frame);
+ 
+-    _php_convert_frame(ff_frame, PIX_FMT_RGBA32);
++    _php_convert_frame(ff_frame, PIX_FMT_RGB32);
+ 
+     return_value->value.lval = _php_get_gd_image(ff_frame->width, 
+             ff_frame->height);
+@@ -418,7 +418,7 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, ffmpeg_f
+ 
+             /* create a an av_frame and allocate space for it */
+             frame = avcodec_alloc_frame();
+-            avpicture_alloc((AVPicture*)frame, PIX_FMT_RGBA32, width, height);
++            avpicture_alloc((AVPicture*)frame, PIX_FMT_RGB32, width, height);
+ 
+             /* copy the gd image to the av_frame */
+             _php_gd_image_to_avframe(gd_img, frame, width, height);
+@@ -429,7 +429,7 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, ffmpeg_f
+             /* set the ffpmeg_frame's properties */
+             ff_frame->width = width;
+             ff_frame->height = height;
+-            ff_frame->pixel_format = PIX_FMT_RGBA32;
++            ff_frame->pixel_format = PIX_FMT_RGB32;
+             break;
+         default:
+             zend_error(E_ERROR, "Invalid argument\n");