fix build with ffmpeg 2.5, bug #536526

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 66 insertions, 7 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index a3ab863c5583..6a0308dcd833 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.124 2014/10/07 22:17:32 lu_zero Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.125 2015/02/12 08:46:29 aballier Exp $
+
+  12 Feb 2015; Alexis Ballier <aballier@gentoo.org> gpac-0.5.1_pre5456.ebuild,
+  +files/ffmpeg25.patch:
+  fix build with ffmpeg 2.5, bug #536526
 
   07 Oct 2014; Luca Barbato <lu_zero@gentoo.org> gpac-0.5.1_pre5456.ebuild,
   gpac-9999.ebuild:
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index b3b42cf16ba3..bfa70bc6700e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 110_all_implicitdecls.patch 1048 SHA256 6607d53e88dbecfa7185ba97f8f4ac13b266cb7396833ee42f307289f9d3d123 SHA512 cbd949b72bbe708decd7f4d24c2e1f9fbfda658fd6b355f11bc20b19ebf583e74eebb8ffc3c5b9945619efe4022123638fa243abaf07841d41101f62ad51e5ee WHIRLPOOL 3a852e35e940f6d1ecd58c8706eb519c524b9907497ac1df58da6648e4395184fe6a0ae834d850b9f69986700756aaa51ac1397a58c6f15e8bbe5ad8b39f2e9d
 AUX 210_all_system_libogg.patch 647 SHA256 8c29c8b3688b5662bbcb40ea231fd3e78a722884cacda944c0ccf9c374077e64 SHA512 ea88df06002107cfc8d5700180152d9391456530fa83928cafa13ab184122f444168201447365d7b16d68357a7bb6d45ea1765791f143ecee463b7898cb4145c WHIRLPOOL 184d9124e680324f0229d2ed73a667fea0e2f34d7570b56fbd80e508348aece9d7975f5dece221754c6e1bdea253ca42a255f5106258c7c211c7402f3b9ec6da
+AUX ffmpeg25.patch 1575 SHA256 6a15109095b9981e801247571809111a1b23c312dfdc385097260ee8715a4599 SHA512 00ef01dfe517aa7805de44a325f3167e46da2afa85afb2c5177680305027bb296f3f71937d11e18c33db2d1a5c3d728e6dfe92d629201695833d9894f4bd4cae WHIRLPOOL e5a87715cfa1c02fb43c76d6c3d96bae78eb7967854bc5bed13a221d1aa0cbf63f1a208d9d3336d19dea786dbc4ebeb1e8fd92a204129eaf310920949ac5cb4d
 AUX gpac-0.5.0-build-fixes.patch 4268 SHA256 95dfd33cd485b9d46d50dd589a518a6728b46af03e6e02a653327c0b76f6ec6f SHA512 fd2283e3cf7a8370b467bbc7f96bd8a41873a05e3205e887525bf0655490929b8961b55b4d773d045ef9a3637fa258a348f85b98362495c6695d633b1b054b7f WHIRLPOOL 618c4ac99e6efbdaf907c28580fee428b2098dfa3543193cea2a603de5196fbfbddf771a607fb8cc8543a72e9a6707148631cb4df4145268570b00e9d0925523
 AUX gpac-0.5.0-ffmpeg2.patch 1108 SHA256 ddd684b479c67b44cea1f9ecd248f7a0caf82ea39c9046aadfb46f6a9dc2e839 SHA512 5c52cf618553792b067a15ebef358a2218f4d728709b441118ecdb8e1c1b71c446293d2f7d67e51dd98b02acba82b38196d7d56c848b14f73192ccfdcd2d3703 WHIRLPOOL 04ea5160bf886f2218ff90d1c1a777a7abf78b7e188db70078e4f1b7f21c987cb6f71bd9490488abfe6a3e20e656ac6b1cae849bb38c9fa11f019b8c1eceed61
 AUX gpac-0.5.0-libav9.patch 4064 SHA256 00ee9900081066d7fe05415aa8d50e1fd6cdd931735fa7e95bf8c4a193aa808d SHA512 4a2cb03db46559f93beb80b9bdffe37d9450ef180164958acd1c98a76ef96303602a84e93d5474e18b336167f5a0b96454db1e9bf50ad92f2996e28e4da76cba WHIRLPOOL 08b3d1d5d02cfe418188b85a57ad152e1d1ea87ee172b347b811d6b080814a5e1ba9cd6b72a66b58b9e007525bcda56a51e6e05b72b88b4178dc8b563716d973
@@ -14,7 +18,14 @@ DIST gpac-0.5.1_pre5456.tar.xz 5938432 SHA256 81746ad1d9a8ae0a84c73652d1af5d86d9
 EBUILD gpac-0.4.5-r4.ebuild 4045 SHA256 e5e39be6c95b5ada9471c372ba1bc6035616e882aad433d265fc0a81787b7e5a SHA512 32cc005e078158d501abd9d03e253a6f6e15857df7ade86fc66c69d758553d94635dc847e34a9d37890fbdad49d7419838ab98bb7cc92a1b17abd87b61670fd6 WHIRLPOOL 2cfe3ddc561e461a97cc0d4dea685fbbe8d57a62db6f23a6fed2d09fccc93540b6b52a7f49b0fd7a25166842b4ca57fe34ab6c8bfb99212b13fb3c3e2be4e667
 EBUILD gpac-0.4.5-r5.ebuild 3927 SHA256 84b53a023e6baf9e61289bea1d2562797ff0e0abfe6f1551fccaab8a3b596455 SHA512 46b0eb2212c51923100b68490afa6f203cfe76fba6983ca407f9b6ced536bf2e9086b30ab0ce51144c3dfab118b1b8d4660c8a798ae67fc833cbc835177ac177 WHIRLPOOL f5fa634de1e4cfd1ec647c33ed74550e34c8e3c45ffc68538079c11557f5d3cb8f11240357a6762cfed163e147d2a085775abd32316d3e6d9d8ae1ccde982461
 EBUILD gpac-0.5.0-r1.ebuild 3547 SHA256 6fe3ac4032ddb3df6c730a4ce26b2a1534ea935bd4aabd65d88a1cb503a837aa SHA512 80ef75f9e67a96352c77ca83854caa742fbc35d8d9250c42d3c3fb3dd517f6281b813bad7d88623038e8fb2264e1a5c93c48ce0cbc75c1be2dee72d1359c104b WHIRLPOOL fa4a1747a8b1797de59db8474b608dcf3054f933848f7e4ff57852977854f71d2ce2f0750125a86cd5d6c2c8d58e59862697df831c35485a6ab958636b0b8efe
-EBUILD gpac-0.5.1_pre5456.ebuild 3174 SHA256 ace210c95b2d0414fe17947f68f7b20477b730d1b0e30ff9257a41b018360835 SHA512 a5b5c559ef782d879b922b8b44af9c2ce2b4b20dbf85c662d95d9f0da7f6f984ee80a1b890a6a65b18ffde067965b954b4961264691513e8ed6de438f5662927 WHIRLPOOL d20b965bed8b046c1625912586a0eacf23ade9e503560a4a252f38659373f14e81f0a8c64dfa03c970410afbeb8fd61cf97c13ffe949f49321d7775264341f64
+EBUILD gpac-0.5.1_pre5456.ebuild 3209 SHA256 de9dcab1263d4342b4fdbe8e6d8d8937d1a82a9890abce35bbdb9803a1a85a4c SHA512 f0a110c5c85ddb2fc4f5b7469637f3068b2e2359a8a63f649de20c7d902ac108eef72432a1fd2294350f270702099cbd5620d05d2f6ff366139461a0599c4d02 WHIRLPOOL da088428252fedd5ae7903c1fc869cfd3b4d48b5c2c44cac05ab478a1827809b4e984dddeba24e8940e4e7da19b8f31ef94ce711b92e8b1064e8d5c63b174da6
 EBUILD gpac-9999.ebuild 3057 SHA256 26605e028323bfb5c6fff77d59aa077bd9ed42998c325682cdb00341d116fbb9 SHA512 4ad7600f83d6bb252f7e23033dd445093dc82f349849d38114087afbe88ffab5af3e19bdd17d2db06a6dfc244427dd55c1e9b1ab384b90b412e2d411e3e80faa WHIRLPOOL d837c814ae16cf12293e523b0b1825f1bd2faf0e396616eec74130e0e7836e876c01f18cde35507bc5da815bcca513657cf6f66e1468cfdbd1c9efd8cf102893
-MISC ChangeLog 18313 SHA256 a43ea1e609147da5248038cd8d2bc2ac2434fde9f7b7e4b771715d307ec9e67e SHA512 919a5d48de0ae1f0a6cf8d93a49cd9b0aab3583973f3fc80b57fa0d9674209c189794bbcf9fddbd6a2cecbfcfafe439efa4ee3b8b5ba132752ebf2a78cdb797a WHIRLPOOL 0e049a9a23b553f10f34b38cadcff41d0a54f40ee441cb743ee1277ef01a5a8723d6940908f158a75ddf44a4ea9834686e87effd1502eb84e6f715911e25ea67
+MISC ChangeLog 18460 SHA256 4bb8e1874dde8a917b2fda059e9e40188b343395278e5cbdb1a3870b194aabc9 SHA512 0b49cc96e69cf3adcf59a7d7d34cfde095d699b2694508da2cc9612726dddd013fec8e12f3e09dedca262782ebe97b869aca2d294d774c536e9bd13f8d286d3d WHIRLPOOL ecda7af9dedb76c3585d93fdebdd9bba4134e80fb231630fede1aa5b981f3f5a526befc17129bf985b864fa7b073356f8bdebf6ce6ac77d500eed6ed93c55119
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTcaGYACgkQvFcC4BYPU0oB6wCaA0Y7ctlmTar0IqwgbTGTNGtq
+BloAoIwuvBmASpbsbl3q8Qn6bYeE2PUt
+=s8RE
+-----END PGP SIGNATURE-----
diff --git a/media-video/gpac/files/ffmpeg25.patch b/media-video/gpac/files/ffmpeg25.patch
new file mode 100644
index 000000000000..5451b8e1199a
--- /dev/null
+++ b/media-video/gpac/files/ffmpeg25.patch
@@ -0,0 +1,43 @@
+Add proper versionned checks for avformat_close_input
+https://bugs.gentoo.org/show_bug.cgi?id=536526
+
+diff --git a/modules/ffmpeg_in/ffmpeg_demux.c b/modules/ffmpeg_in/ffmpeg_demux.c
+index a5202ee..975a945 100644
+--- a/modules/ffmpeg_in/ffmpeg_demux.c
++++ b/modules/ffmpeg_in/ffmpeg_demux.c
+@@ -301,7 +301,7 @@ static Bool FFD_CanHandleURL(GF_InputService *plug, const char *url)
+ 	}
+ 
+ exit:
+-#ifndef FF_API_CLOSE_INPUT_FILE
++#if LIBAVFORMAT_VERSION_MAJOR < 54
+ 	if (ctx) av_close_input_file(ctx);
+ #else
+ 	if (ctx) avformat_close_input(&ctx);
+@@ -680,7 +680,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv,
+ 
+ 		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
+ 		if (!ffd->seekable) {
+-#ifndef FF_API_CLOSE_INPUT_FILE
++#if LIBAVFORMAT_VERSION_MAJOR < 54
+ 			av_close_input_file(ffd->ctx);
+ #else
+ 			avformat_close_input(&ffd->ctx);
+@@ -699,7 +699,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv,
+ 
+ err_exit:
+ 	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
+-#ifndef FF_API_CLOSE_INPUT_FILE
++#if LIBAVFORMAT_VERSION_MAJOR < 54
+ 	if (ffd->ctx) av_close_input_file(ffd->ctx);
+ #else
+ 	if (ffd->ctx) avformat_close_input(&ffd->ctx);
+@@ -757,7 +757,7 @@ static GF_Err FFD_CloseService(GF_InputService *plug)
+ 
+ 	ffd->is_running = 0;
+ 
+-#ifndef FF_API_CLOSE_INPUT_FILE
++#if LIBAVFORMAT_VERSION_MAJOR < 54
+ 	if (ffd->ctx) av_close_input_file(ffd->ctx);
+ #else
+ 	if (ffd->ctx) avformat_close_input(&ffd->ctx);
diff --git a/media-video/gpac/gpac-0.5.1_pre5456.ebuild b/media-video/gpac/gpac-0.5.1_pre5456.ebuild
index f88b944c9205..e9a0001d100c 100644
--- a/media-video/gpac/gpac-0.5.1_pre5456.ebuild
+++ b/media-video/gpac/gpac-0.5.1_pre5456.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.1_pre5456.ebuild,v 1.2 2014/10/07 22:17:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.1_pre5456.ebuild,v 1.3 2015/02/12 08:46:29 aballier Exp $
 
 EAPI=4
 
@@ -69,7 +69,8 @@ my_use() {
 
 src_prepare() {
 	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
-			"${FILESDIR}"/${PN}-0.5.1-build-fixes.patch
+			"${FILESDIR}"/${PN}-0.5.1-build-fixes.patch \
+			"${FILESDIR}"/ffmpeg25.patch
 	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
 }