Fix build and runtime with ffmpeg-1. Bug #461438

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 161 insertions, 13 deletions

diff --git a/dev-php/ffmpeg-php/ChangeLog b/dev-php/ffmpeg-php/ChangeLog
index ce1fd1300927..3aaf6f892f8a 100644
--- a/dev-php/ffmpeg-php/ChangeLog
+++ b/dev-php/ffmpeg-php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/ffmpeg-php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.5 2013/03/05 10:41:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.6 2013/03/25 10:00:50 aballier Exp $
+
+  25 Mar 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-php-0.6.0-r2.ebuild,
+  +files/ffmpeg-php-0.6.0-ffincludes.patch,
+  +files/ffmpeg-php-0.6.0-ffmpeg1.patch:
+  Fix build and runtime with ffmpeg-1. Bug #461438
 
   05 Mar 2013; Ole Markus With <olemarkus@gentoo.org>
   ffmpeg-php-0.6.0-r1.ebuild, ffmpeg-php-0.6.0-r2.ebuild:
diff --git a/dev-php/ffmpeg-php/Manifest b/dev-php/ffmpeg-php/Manifest
index 4c991908c51b..656f7c719193 100644
--- a/dev-php/ffmpeg-php/Manifest
+++ b/dev-php/ffmpeg-php/Manifest
@@ -2,24 +2,20 @@
 Hash: SHA256
 
 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-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-r1.ebuild 1052 SHA256 0f584f016315aeb0d3bf46de25675a324e7c0947650a24e8d80e00f039fa564c SHA512 1088a487045cceda8643843ae83b7714a6b7886dbf8f53cb535e015a6b0454f8ccee1b1243132d0a9fb7845b1970045b1a0382ab79a19746f1a58780d05b74ce WHIRLPOOL 08f8c7059cb4591b0184b99fafdd79ef802c6f84192472140048ff57175f2dc3886d7b2e8049f47f8c10f0df4e0438ede5fa0ae739d79b0a605ea3cce7940a6d
-EBUILD ffmpeg-php-0.6.0-r2.ebuild 1087 SHA256 98c3e50365dbe43067b3baa9587ccb2aa9b2e323011851506aa683861f4caa2b SHA512 f9504bbe466fa2acd02b3a4cc667e3cc05ed5c6ac5e6a7b59d3585757e37119181e7b1906d0e8a17f66917785eb7a7487808d29d045071e87ee661770f97b584 WHIRLPOOL 423dbbea8587c47083601caad97c8d6f657c33b2e1648d59df04c1cdfeb448e91942b2a423ea00bce680d8b0f2fc4a08fa95e99d6868f84fe4b70bef216796e0
-MISC ChangeLog 2848 SHA256 b8f8b08930c32916ffecc938431294f949c8973bcaff92ca67412aeb02e7d58c SHA512 1631e12a9fbe74440a8b3bcc0e50ee57aa3fbf0e1f0f486a4c42553758a97eeb1a7be3fa13e3f10acb1112192aae27e9ee7e2f20bc636cf0b2591888e2d89e0f WHIRLPOOL 9c5a1b2cb9c0ef5f6579ff6fb54ee6001c8832ee8f20138fcc2bef3053c9e7c4fc4fde0ade9b08d682f164115150ffccfe486c53b3aac4a9155ed118c07488f2
+EBUILD ffmpeg-php-0.6.0-r2.ebuild 1173 SHA256 d9bf2bf23fccde44a53fb275b9f59e4b0d8ba039c3573794c849042ee9c2bd05 SHA512 2a0713a722f0d1fbbb478564d33b81cd8f8239459251ba8c414d85229a7493d87dec524fe42698e9177287b5bf9d9f45a1cbf09218066c9075cbee7a1d513179 WHIRLPOOL 311f4a651755802f9a108d56eb522884417f568dc52ee645a76013bafe7c4ec8ab665c0ddc9e1c272c7b614d7738be437cb0c8dd9112b0328ee96ddd33f2d77d
+MISC ChangeLog 3064 SHA256 ef5690b0014c8a0934a7221ea9ac9d6021372f7f1fb6487f6de26b16e35a9438 SHA512 61dba63a79b1416cfcc9b6f7ab9ea95e985f40c58fbdbad08d567e2958184e1f138e6c0b9c875051e56f9d247815ebb50f13f06955ae6bc0d7809c5b31b80323 WHIRLPOOL 3216acb9d97e9640c070faa16ceca42b7da9740674390622f9103d0d829ede4ebf6df00cf487630b7c06717a0f56b9addf5eb711921761162278f0d8d9255370
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRNcvKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv18EYIAKjDeI467N5Q7fAhxYBMtQfF
-xKgIy9dAiJlEXGEKi1LsUwfsgyUatrFc80x/Pk9wxEk2wpFqFQWsBaDkPiWVU7Dg
-GzsvGodJHTTWVDTX7JtTDkWDc6YbcOS3fIr81pkkelNxKSPd4iAFiCj5JAg3BsKs
-lJGWXixqOUpQENRUdzpJ0nhSqT2w7glsJWrGULMMRrZkg2AEyw4WDksfflumX9h4
-/GOru7KdFbc7apXjRkytWvl4QaMInkNnw/gTfcofO6dB+PtdBp1+/FpDMns3V6Sf
-d1MZTIJUo6pmX0MpDY806t4J2siCbDfjQAuUjWswCDVytatFgNjsFepMU9BnYpE=
-=+jTg
+iEYEAREIAAYFAlFQIFIACgkQvFcC4BYPU0pYcwCghqF7zLeLQndi99K797RFR2j+
+55MAnjwv6FqVvS4KL6g0cxSF35UgQxIF
+=6ma7
 -----END PGP SIGNATURE-----
diff --git a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild
index 77fe0153c17d..2c6b61b48314 100644
--- a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild
+++ b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r2.ebuild,v 1.2 2013/03/05 10:41:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild,v 1.3 2013/03/25 10:00:50 aballier Exp $
 
 EAPI="5"
 
@@ -39,6 +39,8 @@ src_prepare() {
 		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"
 	done
 	php-ext-source-r2_src_prepare
 }
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffincludes.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffincludes.patch
new file mode 100644
index 000000000000..5b7873ece51b
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffincludes.patch
@@ -0,0 +1,115 @@
+Incldue properly FFmpeg headers.
+https://bugs.gentoo.org/show_bug.cgi?id=461438
+
+Index: php5.3/config.m4
+===================================================================
+--- php5.3.orig/config.m4
++++ php5.3/config.m4
+@@ -31,15 +31,8 @@ if test "$PHP_FFMPEG" != "no"; then
+       FFMPEG_INC_FOUND=$i/include
+       break
+     elif test -f $i/include/libavcodec/avcodec.h; then
+-      dnl ffmpeg svn revision 12194 and newer put each header in its own dir
+-      dnl so we have to include them all.
+-      PHP_ADD_INCLUDE($i/include/libavcodec/)
+-      PHP_ADD_INCLUDE($i/include/libavformat/)
+-      PHP_ADD_INCLUDE($i/include/libavutil/)
+-      PHP_ADD_INCLUDE($i/include/libswscale/)
+-      PHP_ADD_INCLUDE($i/include/libavfilter/)
+-      PHP_ADD_INCLUDE($i/include/libavdevice/)
+-      FFMPEG_INC_FOUND=$i/include/libavcodec
++      PHP_ADD_INCLUDE($i/include)
++      FFMPEG_INC_FOUND=$i/include
+       break
+     fi
+   done
+Index: php5.3/ffmpeg-php.c
+===================================================================
+--- php5.3.orig/ffmpeg-php.c
++++ php5.3/ffmpeg-php.c
+@@ -39,11 +39,11 @@
+ 
+ #include "php.h"
+ 
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ 
+ #if HAVE_SWSCALER
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ 
+ #include "php_ini.h"
+Index: php5.3/ffmpeg_errorhandler.c
+===================================================================
+--- php5.3.orig/ffmpeg_errorhandler.c
++++ php5.3/ffmpeg_errorhandler.c
+@@ -34,7 +34,7 @@
+  */
+ 
+ #include "php.h"
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ /* {{{ ffmpeg_errorhandler()
+  */
+Index: php5.3/ffmpeg_frame.h
+===================================================================
+--- php5.3.orig/ffmpeg_frame.h
++++ php5.3/ffmpeg_frame.h
+@@ -38,8 +38,8 @@
+ 
+ #include "php_version.h"
+ 
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+Index: php5.3/ffmpeg_movie.c
+===================================================================
+--- php5.3.orig/ffmpeg_movie.c
++++ php5.3/ffmpeg_movie.c
+@@ -34,9 +34,9 @@
+ #include "php_globals.h"
+ #include "ext/standard/info.h"
+ 
+-#include <avcodec.h>
+-#include <avformat.h>
+-#include <pixdesc.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavutil/pixdesc.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+Index: php5.3/ffmpeg_tools.c
+===================================================================
+--- php5.3.orig/ffmpeg_tools.c
++++ php5.3/ffmpeg_tools.c
+@@ -42,7 +42,7 @@
+ #include "ffmpeg_tools.h"
+ 
+ #ifdef HAVE_SWSCALER
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ 
+ /* {{{ ffmpeg_img_convert() 
+Index: php5.3/ffmpeg_tools.h
+===================================================================
+--- php5.3.orig/ffmpeg_tools.h
++++ php5.3/ffmpeg_tools.h
+@@ -36,7 +36,7 @@
+ #ifndef FFMPEG_TOOLS_H
+ #define FFMPEG_TOOLS_H
+ 
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ int ffmpeg_img_convert(
+         AVPicture *dst, int dst_pix_fmt,
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch
new file mode 100644
index 000000000000..a66d92b04f51
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch
@@ -0,0 +1,30 @@
+Fix runtime with ffmpeg-1.
+https://bugs.gentoo.org/show_bug.cgi?id=461438
+
+Index: php5.3/ffmpeg-php.c
+===================================================================
+--- php5.3.orig/ffmpeg-php.c
++++ php5.3/ffmpeg-php.c
+@@ -90,9 +90,6 @@ PHP_INI_END()
+  */
+ PHP_MINIT_FUNCTION(ffmpeg)
+ {
+-    /* must be called before using avcodec libraries. */ 
+-    avcodec_init();
+-
+     /* register all codecs */
+     av_register_all();
+     
+Index: php5.3/ffmpeg_movie.c
+===================================================================
+--- php5.3.orig/ffmpeg_movie.c
++++ php5.3/ffmpeg_movie.c
+@@ -259,7 +259,7 @@ static int _php_open_movie_file(ff_movie
+     }
+     
+     /* open the file with generic libav function */
+-    if (av_open_input_file(&ffmovie_ctx->fmt_ctx, filename, NULL, 0, NULL) < 0) {
++    if (avformat_open_input(&ffmovie_ctx->fmt_ctx, filename, NULL, NULL) < 0) {
+         return 1;
+     }
+