Fix build with libav9 wrt bug#443424. Even tho the upstream patched it slightly differently they just fixed more deprec. warnings so it does not matter if we use this one or svn revisions.

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 119 insertions, 8 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index ce6d520a9d44..0129967087b9 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.104 2013/06/13 12:42:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.105 2013/06/22 16:28:36 scarabeus Exp $
+
+  22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/gpac-0.5.0-libav9.patch, gpac-0.5.0.ebuild:
+  Fix build with libav9 wrt bug#443424. Even tho the upstream patched it
+  slightly differently they just fixed more deprec. warnings so it does not
+  matter if we use this one or svn revisions.
 
   13 Jun 2013; Michael Weber <xmw@gentoo.org> gpac-0.4.5-r4.ebuild,
   gpac-0.4.5-r5.ebuild, gpac-0.5.0.ebuild:
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index fb732154532a..a6e2479042c0 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -5,19 +5,30 @@ AUX 110_all_implicitdecls.patch 1048 SHA256 6607d53e88dbecfa7185ba97f8f4ac13b266
 AUX 160_all_externalamr.patch 1117 SHA256 8ef7f54bcbec758c944797594e92accdc726573480e1d2e9c442cfc38621f594 SHA512 b59b243daf64c9f764f569ec72ac43689d22ca58f9d717f5a066de867fd8455a667927875fd614b3de31f84ec16e65b5a36a0578fd93da99ecb247fba977916b WHIRLPOOL a3b5ab344ac372f01da824a969fbb1509146375758d899ea6c8c6f0b2fc75410594a95738a8ee159f9ebe66f270b3ec5007a6e9213f38f08663bc1264b54284d
 AUX 210_all_system_libogg.patch 647 SHA256 8c29c8b3688b5662bbcb40ea231fd3e78a722884cacda944c0ccf9c374077e64 SHA512 ea88df06002107cfc8d5700180152d9391456530fa83928cafa13ab184122f444168201447365d7b16d68357a7bb6d45ea1765791f143ecee463b7898cb4145c WHIRLPOOL 184d9124e680324f0229d2ed73a667fea0e2f34d7570b56fbd80e508348aece9d7975f5dece221754c6e1bdea253ca42a255f5106258c7c211c7402f3b9ec6da
 AUX gpac-0.5.0-build-fixes.patch 4268 SHA256 95dfd33cd485b9d46d50dd589a518a6728b46af03e6e02a653327c0b76f6ec6f SHA512 fd2283e3cf7a8370b467bbc7f96bd8a41873a05e3205e887525bf0655490929b8961b55b4d773d045ef9a3637fa258a348f85b98362495c6695d633b1b054b7f WHIRLPOOL 618c4ac99e6efbdaf907c28580fee428b2098dfa3543193cea2a603de5196fbfbddf771a607fb8cc8543a72e9a6707148631cb4df4145268570b00e9d0925523
+AUX gpac-0.5.0-libav9.patch 4064 SHA256 00ee9900081066d7fe05415aa8d50e1fd6cdd931735fa7e95bf8c4a193aa808d SHA512 4a2cb03db46559f93beb80b9bdffe37d9450ef180164958acd1c98a76ef96303602a84e93d5474e18b336167f5a0b96454db1e9bf50ad92f2996e28e4da76cba WHIRLPOOL 08b3d1d5d02cfe418188b85a57ad152e1d1ea87ee172b347b811d6b080814a5e1ba9cd6b72a66b58b9e007525bcda56a51e6e05b72b88b4178dc8b563716d973
 DIST gpac-0.4.5-patches-8.tar.bz2 7263 SHA256 ed2b1bda99cd4a3dda49473876f36983ac3b7310e87f7f04cd2757de86515e57 SHA512 85806871c223722227d5b80bf8e45a25ffecdb842e1edc5586b50bfc2fb6c6fe0dfc3a414f90ffa9a64f02bcf3792be2ceea19784d27cf042e41b12be66dbde0 WHIRLPOOL 69a21a725277ace08c447e20307a955c99e7f2a9629731f0ed9b6ce5d1c7e4881cebee418415481148a82fcc7868bdb2e47174de8b7c6f7d00816fbbf2b0abfc
 DIST gpac-0.4.5-patches-9.tar.bz2 7370 SHA256 aee2cbdcc6256b320d4b9fd59ec82746f1bba797f3e604f2e5022cbef3cf89d5 SHA512 a40f0619680d5a022fd1a101555be599c834e983a432c1bb407b764a41128738298fac72ab1ae77d5a34afeced77e8099556d3c342da6980fccd01aec754102b WHIRLPOOL 9f88d3f7e3be5802d0210e184bbf8941cfa70c60e4fc4fe81d9d0764a2a934d4fb7f5bb61cdda8195b15f7e96d520ad6c71fb82324ce9b24e2cf91db7124e0c2
 DIST gpac-0.4.5.tar.gz 4269054 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671 SHA512 96d4d9fcaa84542a81b28c775a748f06b27d5c4070e118b2c7ee6276b3078ade6e0478c08a44befcc69ef0ec50ed88dcd030c5d089c6cbb05dafdfd0d7f67ff6 WHIRLPOOL aa0aee06559591ee0886f1bb256abd1ca6c8899c381ae9185f1dfa3edc36c9b81f9bf666fd23c984dd8a715b29bbf700b7e063bf81dd14f339767fa0c30632ea
 DIST gpac-0.5.0.tar.gz 7861057 SHA256 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278 WHIRLPOOL 1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
 EBUILD gpac-0.4.5-r4.ebuild 4043 SHA256 69707121dc8df5ab7626d119e245860dde8531f06453bfdabc01eb85466f2964 SHA512 3e3e83ec3b85cc68ee02c6aae333dd5744f695644a9ba2059d52985c53d28ef34a46b12e20e8d64c44abc0b53646bd25afb5f98705251debf27d29c8973134ec WHIRLPOOL dfdb53525c535db7690ad946d359b7c96f3917ac42a8333fcfed14f6a0266f0ae1fbea0b5485e6e498ebdac7a66c50d8a76e2290d0ae80b2b11a17c7a5955acd
 EBUILD gpac-0.4.5-r5.ebuild 3925 SHA256 87648fbff68242aab58c11923d7789d9eab0f3148425fb035b73db2338b1bc92 SHA512 abb935789d504001b7727c7ca0ce44f86c0726d37812b1562f98e0df888c09c95c907049f7578ba76a5ac0016fdd16a795263851e8a9aac3b74fa3cb6a4587ab WHIRLPOOL 22d33b1056c127ec918031884bae543e7fdb9b1286d8586fab3ab7f99abcaf9097c08d960f0ef6ab31eca4c589c9b97e9dbdc4f7419ebe2ad27571a842527ac9
-EBUILD gpac-0.5.0.ebuild 3963 SHA256 7ea218cf45ee86a00b7ad45cb4ee6e3a879a84813c54215d98a05eb0ae51adde SHA512 89203b4a2abef8e08eeac57b5236340e4283edf5cd81984fffa95960a71160fc3c7edb25cd146db3874ccb8949d15f7bc2ae0de7197ad63ad8da79f2532fbb6a WHIRLPOOL 959419d3ae05faf5e01ff6ac1bb0afbb7f64438fc300939ae169aa958051b4352201de8d2a3c7750d2e1d1366e88a777e723362581e81200c84a675fe25f9544
-MISC ChangeLog 15317 SHA256 456318b816b81969143c3ce1bdced6a2d85057cbbaa78ca12cb4e38e7dabee16 SHA512 d1a808ff3a98cd7f8e98e99f1ef95ab2293b242c6a11e535981bd77f8f7f4d23c26e38f1ba36fba4f23b2aa97bed8a54a5390714fefc6371ae36de416dcab901 WHIRLPOOL aa78429a6fd2e7ce2951ec751c00e881d49e0fd3f77315c8a4ac8410e9080e21ac0e633138b7e7a06afd76772233c8d0cdaec05484b785c99bcfcc794d42ca3b
+EBUILD gpac-0.5.0.ebuild 4005 SHA256 e722a8f00e4b361a283ff8ff639b537e08b9298e8c55db95e42e73b3f2cc68cb SHA512 2d6861dfe5a4bc2fe535ecf18158e9be11e151d8ac532db89cdbcf6eafce5ee64681cac014806c2d502addfb1e20b99b8274bd372dec247ba87d0bebef9a036d WHIRLPOOL e97fe4ae8bc4f00fca9f3924153021526e7c5ef9bb3fdd1c16bbd9108de59bd53bb3d7768586eae1f8ac28f69f94d4b64e4d877c600054cd06a55daeb28643cc
+MISC ChangeLog 15627 SHA256 66d90a05564a8b4315f8b0675740baebe3933ff0881c9019450fed03cb215859 SHA512 b4513a2aa6d00958eab35c5a6136a654a8feb209d84d5af1c318b0a4db6e7b4e7a4c9b0272cdf98982a31246d8ca7c6e0079a0126d4f1dd7b5459c51cbbecf74 WHIRLPOOL 49c74801e2235483705ac3603a4f6e36f7d2b6792a44a17f7ea24840d2e8c509a5aa89d63d26a2acb5557823ef3357819a318a67c7e86fc724aa39d1cb22a391
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG5vloACgkQknrdDGLu8JCEJwD+NvQCfNWOlqvoftQu4uDUdGlK
-a0UGq46kHXzLnvuxf94A/2P3HwCBSxN+4jlaPHMjnvKjC4d07krde/OhA4PhhRa5
-=dEvb
+iQIcBAEBCAAGBQJRxdCpAAoJEOSiRoyO7jvoB8wQAJUswDoJ4wvhpd7oKgNgrkLY
+RUwemHhi6+WvifsHQaN+zIbUNNXrs4e/uZqnGC7o83ESUYdiq9KrbcL5NGR82/Er
+MDQh+tT8CiP++o347Xc+Mkb+AhSPBXTe+pRfvF5j9A0eEBnxJ5ZPAx1ZfPKRpCwf
+KXNeHGWUaDy0+JDRWOA4YEFSDhwqK/EZofLfwDIwdzRKbTJh2vUvnt0u/WVTpWyZ
+TMoZL2ibE5TunJ2u4C00GvDDUUU0bwY651x6kuJ0gMwYD1Sf5eZ2eWt2qBgPX+ZU
+T8pfawFcx6L7t0vbSwqdtKOmYTZFVwSdPJY4HwyhKd4cyoV4TRtdIznPEXbSynU/
+hpV9TXILQVN4pXNssqnN4D7zfrfqctpisnfWX461AXOcZunwpnYO4/Hgws4oHp4a
+aGA6uJMvClhYYwyTb5TpqWFLI40E9I3nefz9kFChjcgynkBLqtUoT48sCTg8lcTw
+N/f8PIY1xKN1fvqeo1Ku/IxIuYYjUA40wtTcgXzapH3icZdNgE5Zf0I9GBy0snkH
+sMzZjL1/JDRWctSV8JHBHmf4sc8r//LHt1Ikvbbz6TgdIggEqmDZs0YcQto5lw0p
+69Jnte1M13X4OwkjrKs/XLR2f4x+cp45lazLKO5C4ukt2vBqtDVYMQ978g6juTNq
+lCDwvCcDigXIE2vjFts6
+=yrnP
 -----END PGP SIGNATURE-----
diff --git a/media-video/gpac/files/gpac-0.5.0-libav9.patch b/media-video/gpac/files/gpac-0.5.0-libav9.patch
new file mode 100644
index 000000000000..687bffc009db
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.0-libav9.patch
@@ -0,0 +1,93 @@
+--- ./work/gpac/modules/ffmpeg_in/ffmpeg_decode.c.original	2012-02-29 18:24:24.000000000 +0200
++++ ./work/gpac/modules/ffmpeg_in/ffmpeg_decode.c	2013-05-28 13:45:02.415980878 +0300
+@@ -169,7 +169,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
+ 		frame = &ffd->base_frame;
+ 	}
+ 	if (!(*ctx)){
+-	  *ctx = avcodec_alloc_context();
++	  *ctx = avcodec_alloc_context3(NULL);
+ 	}
+ 
+ 	/*private FFMPEG DSI*/
+@@ -317,7 +317,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
+ 		(*ctx)->pix_fmt = ffd->raw_pix_fmt;
+ 		if ((*ctx)->extradata && strstr((*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
+ 	} else {
+-		if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM;
++		if (avcodec_open2((*ctx), (*codec), NULL)<0) return GF_NON_COMPLIANT_BITSTREAM;
+ 	}
+ 
+ 	/*setup audio streams*/
+@@ -749,7 +749,7 @@ redecode:
+ 			here this means the DSI was broken, so no big deal*/
+ 			avcodec_close(ctx);
+ 			*codec = avcodec_find_decoder(CODEC_ID_H263);
+-			if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM;
++			if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM;
+ #if USE_AVCODEC2
+ 			if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+ #else
+@@ -759,7 +759,7 @@ redecode:
+ 				avcodec_close(ctx);
+ 				*codec = avcodec_find_decoder(old_codec);
+ 				assert(*codec);
+-				avcodec_open(ctx, *codec);
++				avcodec_open2(ctx, *codec, NULL);
+ 				return GF_NON_COMPLIANT_BITSTREAM;
+ 			}
+ 		}
+--- ./work/gpac/modules/ffmpeg_in/ffmpeg_demux.c.original	2012-04-04 15:57:37.000000000 +0300
++++ ./work/gpac/modules/ffmpeg_in/ffmpeg_demux.c	2013-05-28 13:58:57.416188668 +0300
+@@ -290,7 +290,7 @@ static Bool FFD_CanHandleURL(GF_InputSer
+ 			return 0;
+ 		}
+ 	}
+-    if (!ctx || av_find_stream_info(ctx) <0) goto exit;
++    if (!ctx || avformat_find_stream_info(ctx, NULL) <0) goto exit;
+ 
+ 	/*figure out if we can use codecs or not*/
+ 	has_video = has_audio = 0;
+@@ -614,7 +614,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
+ 			}
+ 			/*setup downloader*/
+ 			av_in->flags |= AVFMT_NOFILE;
+-#if FF_API_FORMAT_PARAMETERS /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
++#if (LIBAVFORMAT_VERSION_MAJOR < 55) /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
+ 			res = avformat_open_input(&ffd->ctx, szName, av_in, NULL);
+ #else
+ 			res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL);
+@@ -637,7 +637,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
+ 
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] looking for streams in %s - %d streams - type %s\n", ffd->ctx->filename, ffd->ctx->nb_streams, ffd->ctx->iformat->name));
+ 
+-	res = av_find_stream_info(ffd->ctx);
++	res = avformat_find_stream_info(ffd->ctx, NULL);
+ 	if (res <0) {
+ 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] cannot locate streams - error %d\n", res));
+ 		e = GF_NOT_SUPPORTED;
+@@ -699,7 +699,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
+ 		if (!ffd->seekable) {
+ 			av_close_input_file(ffd->ctx);
+ 			open_file(&ffd->ctx, szName, av_in);
+-			av_find_stream_info(ffd->ctx);
++			avformat_find_stream_info(ffd->ctx, NULL);
+ 		}
+ 	}
+ 
+--- ./work/gpac/modules/redirect_av/ffmpeg_ts_muxer.c.original	2011-05-03 16:00:46.000000000 +0300
++++ ./work/gpac/modules/redirect_av/ffmpeg_ts_muxer.c	2013-05-28 13:39:10.694202510 +0300
+@@ -231,12 +231,12 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe
+     dump_format(ts->oc, 0, avr->destination, 1);
+     GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] DUMPING to %s...\n", ts->destination));
+ 
+-    if (avcodec_open(ts->video_st->codec, avr->videoCodec) < 0) {
++    if (avcodec_open2(ts->video_st->codec, avr->videoCodec, NULL) < 0) {
+         GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open video codec\n"));
+         return NULL;
+     }
+ #if REDIRECT_AV_AUDIO_ENABLED
+-    if (avcodec_open(ts->audio_st->codec, avr->audioCodec) < 0) {
++    if (avcodec_open2(ts->audio_st->codec, avr->audioCodec, NULL) < 0) {
+         GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open audio codec\n"));
+         return NULL;
+     }
diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild
index c2e128ec3f88..dbc1c2d26a17 100644
--- a/media-video/gpac/gpac-0.5.0.ebuild
+++ b/media-video/gpac/gpac-0.5.0.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/media-video/gpac/gpac-0.5.0.ebuild,v 1.3 2013/06/13 12:42:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.4 2013/06/22 16:28:36 scarabeus Exp $
 
 EAPI=4
 
@@ -59,7 +59,8 @@ src_prepare() {
 	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
 		"${FILESDIR}"/160_all_externalamr.patch \
 		"${FILESDIR}"/210_all_system_libogg.patch \
-		"${FILESDIR}"/${P}-build-fixes.patch
+		"${FILESDIR}"/${P}-build-fixes.patch \
+		"${FILESDIR}"/${P}-libav9.patch
 
 	# remove last of internal ogg
 	sed -i \