fix build with ffmpeg 2.4+; bug #520190, patch by jospezial and additional guards by me

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

4 files changed, 33 insertions, 20 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 1cb6dcf32168..85be14333b9a 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.322 2014/07/06 13:21:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.323 2014/10/08 12:08:00 aballier Exp $
+
+  08 Oct 2014; Alexis Ballier <aballier@gentoo.org> transcode-1.1.7-r3.ebuild,
+  +files/transcode-1.1.7-ffmpeg24.patch:
+  fix build with ffmpeg 2.4+; bug #520190, patch by jospezial and additional
+  guards by me
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> transcode-1.1.7-r1.ebuild,
   transcode-1.1.7-r2.ebuild, transcode-1.1.7-r3.ebuild:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 0e4f32cfc8c6..996484e0dce2 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -5,6 +5,7 @@ AUX transcode-1.1.7-ffmpeg-0.10.patch 402 SHA256 5df30ce0bdaee1d61a5dd94d242ce01
 AUX transcode-1.1.7-ffmpeg-0.11.patch 12718 SHA256 52f62257ad3abcaf72b306549f66b3aee2a38d2b84713b42be26b7fdcd5f203d SHA512 9b39f15d20830fb57f86750a54a5a7c6025ad69733d668df45a06fd1134e0a6ee76a495a883797b41870b156b4b8895a4dcedbd5e28712d69a98baa7b5934663 WHIRLPOOL 11905b35e3b4b24e8e779945d81743520c554c0c8653d466db095d0d02510c2f6a00ce8d632f8993d829607d37ec8887e79401f6da230f1e8352bad7e55b0fe1
 AUX transcode-1.1.7-ffmpeg.patch 2274 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61 SHA512 d238b645b27bb83e2a1753b9dc99909084292579b757831d560f9535f1eb4a4892bd89047f0b23625f66e72fe8d373002abf8a6a03334c720b065af4220f5a9a WHIRLPOOL edbec136aa7a53a8119f42c9a2f8f000a743e9045892f160dfa4e513137c9e10c16c0316894874bfeb9026f5f10345fb9b920ff1e5111eedec84f85ae9f680ae
 AUX transcode-1.1.7-ffmpeg2.patch 14318 SHA256 7c07b03d11e1ca0fd377637b8d42d439a8e9350523d6f25adad095b6c01afc0d SHA512 82be56ebbff431514fa86819f00cd9ac8dbdeeab3d7549ca775ace7da5f08c957548afdf996e8781d73fae7b4b9412f8b3b940ce5c261ab599cfa3fd0d2b0d82 WHIRLPOOL 0dac8df2d1ca1a3072e3c8763d433c8c2be7ff436de7d19a2b760493b8ecd9d6f74026f696e933f7533285420dd59f833a1457e2784c7f66a167a4da45d8763e
+AUX transcode-1.1.7-ffmpeg24.patch 544 SHA256 d54c943bb088f2457b69919ed97fa7cb0fd1a6700d4c67fdeafff3f14f726fcb SHA512 2d3a10b8022b8bc67678d303ecefea05e4fa95c4c376264e2ef45446b4e7b48485672cb370b5aff7127ad80c1331dd3e422dad17124b099b20e368d4d57259a1 WHIRLPOOL e388afa480b54626d7bc2f5fed91bca1aa3dae2a7d645e12f7a709aca553a3b32cded3f858b29b545c9cc0987df8664c1b769dba84532c28f9d010c1ca7ce169
 AUX transcode-1.1.7-freetype251.patch 273 SHA256 0dd6baea9fc401a59fab3f848f256015ccf4e420224969647f2a79fb208621f1 SHA512 40b672e15de03d2f9f9150a3edb61de65f2d37f6fa9c8b0fc5f47d5a8c8dc6feb714163689947e8997ff4d6c243aa5a5ec860ef8c50bf4648166aa64a7396285 WHIRLPOOL 8f03d793695cb9d3e7e5d7c54c70a21dab2367cd472730b898ef758116a1c14951348333a8c1fcde5ec6d2330242c55c8d08cdd0821deee147b133604b438128
 AUX transcode-1.1.7-libav-9.patch 1413 SHA256 9a53c93b1efa1a6ee6fbe30acbcce4416024d8aa857771d258ddb444f30b48ce SHA512 0868e1b8f440ef8d9314851e02211edc77c3c410b2ec9e860b74cb159d0ea7a77590a933e6ad29b4df5bf8b8ea78f13dae8aa79f361c5437a89b1ba02c7b6e36 WHIRLPOOL 38557b8c2c286bb5a3982c02c229c319114aa6914eb20745127a83a3eb679c7d4d5c989e3661343bba68ad56717842f05da2ea2269ed53e764b708b736b7af29
 AUX transcode-1.1.7-preset-force.patch 1199 SHA256 fe95e83093761924ba0fa5b3214e169812f7740c6c3c434845b1b563d4a37241 SHA512 b2406841674b0d021b1a116e3ef1d16a7206db0930d10d98f3a86923040fbe306296acbac1e14020557c0e9b7e9b28bd0de1f9e1ce20c7fb2c190d15adc6decc WHIRLPOOL e7742ba9dd8a9355f64d640d1005f8713dde5d0ec896583792e73ef0143087d0bbd09673df97c7b65bfe637dbc9ddd2afa1c9786725061440de93b94f7500781
@@ -12,25 +13,13 @@ AUX transcode-1.1.7-preset-free.patch 1370 SHA256 2219fe618be2b2c3fbd6e3545cdbd8
 DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
 EBUILD transcode-1.1.7-r1.ebuild 3231 SHA256 b2a6f1734a17471dd0087bff25d837fe047a5e825633fcedaf0434bd5e9a0834 SHA512 106781721634536e2b0fe789b28d90ebc063edd55fa7cf0e6e36f1d2d2d18dada1d9b6fa529edf1111330e25111409fe16b40bad816e544062661a03975db80f WHIRLPOOL f2ca628e8dd4a15ca3fd5b931d552d9eddb4b5d8d065986d2c0da4fad47216c8714ef92b32406b7b6ad4447c06467b50950b99fc145f28aeaa24be3ec16bc0e7
 EBUILD transcode-1.1.7-r2.ebuild 3273 SHA256 894d4b5fbcb34c58311aa5f955eb854954bbd3514e7a299a9dee1fcfb91ace42 SHA512 c70d84b6d63f833791579be4ef605a5a4549a3a76886f59ab135835c9a6b9245ae0ebb7bf0d4d3332de80a5fedb0b8faaf68296c464f5aee61a4c45fc50a9ade WHIRLPOOL c810153c6e50f3632b3f1db30f71a07e9cf5c255c5606cec3c62e63e7da8b94d99ec7d7de3481997478b71a31e9d41b48f3daba4b5c0362c7e427e553a325f44
-EBUILD transcode-1.1.7-r3.ebuild 3387 SHA256 2b3026f8db2af094891c4c5b0ad28342400cf60b447fb731ebeeb19cdada5207 SHA512 199ec027d0f23bfa77ab44d5e86e9ce0376a582c5e8d93f77c70f8c6a8b688d15a2610ee1ab3289744448757a3056984c181a7c550633d4c68f8009331f64963 WHIRLPOOL 6d36ed18ef7214f49740bb3de5ee759d4634bf90d08a87982df2d9e201feb4ea30b3f3dca08145a21d7142ce0e9e4d88fc9793269a08998d88d76d863a8c240a
-MISC ChangeLog 53158 SHA256 219b65993b6dcf83e6cf2ff921f0702cae7458711ae33f992ff93f2b4807c878 SHA512 b6d4c06f5c53262dac51201e25e59f8b83f73583fed7d47179403fa08499e96069e4af120c4d83a2662135554bbcd9b850a64e932359faadc2bf2029e82b4537 WHIRLPOOL 3bf6be0db2937f326e5198e2168df17fd300f89f87de8902306776399390a29356c8bcffcb4009fbb91d2595a122e23efede743389545870a306b79890d7eacc
+EBUILD transcode-1.1.7-r3.ebuild 3428 SHA256 91b6241f80e2ec9bc2af42b2626074438e2cd03f21f2a65c14baedfca9b44643 SHA512 db583e23ab492f5bac61fefa16095d457aacee534dda3d703476fcdd6dd13331a82c63958f03c0dfd992c6089685680b25cdec4238913316b0d0d5e578f36340 WHIRLPOOL 6a185c1730aafc47c21ae51c615f26a2d10cfca2a598dcb992ec0af70510b1f23f874010e23646dcc1c2d39156793c7a5c871002f382fde5cc7d1b9ed1fe551c
+MISC ChangeLog 53373 SHA256 76ed0b01f6bb35ac78f8e8cce7fed2ff98704beacb7032518c0a155ffadc1c71 SHA512 e83e04778e92aabc077f50ac91f8093d482980e0d036dcf9460bd2ff4a33b7d3dde73a436365dbbd8ce857b3200ed2f8cdbf0b5f8d913c6ec26447dc8a5fc8e7 WHIRLPOOL 22fda77d00099947272edbd1e225c1e16488cba66dd31c868b72ec4a4876049fbda1910982757c554be15b829c3eaacc4ad027358ce124e14d125182d9476251
 MISC metadata.xml 529 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 SHA512 6c5a6dd9ef9407f0c05f42cdfeaf4d3c2e2e6a4c91028331b6dd905acf1174e7bb937b780d12043f030a6afd344aef0df1a2a3d13cbda5a71724bd1f7a8b8302 WHIRLPOOL c27354b3de6c7cb67a30adac4c66e4b72726ecf3e1a1b05fa2e759ce174cfc51154dcfeb0c1b48754702e304fc95753c42ac626b0d6338021737b84bdb074385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTuU17XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCOkQAOCB6eNdanuftXIwcsPd949A
-iMqUs/IHa455+jTZjuR1pTqY5zmu/itJS8pF11w51gKtA+zvheWuyTbE+Qny3mnJ
-FTgt6Q2GNebp6pr4VhwH9wqBjnrm63KlnA/AfBDH1hkBcPlwGGgRtuIdcHKuYCfJ
-H7tBqN+1FJaax0u1WmCFsciM2lnAJPf1y0iQFjF/f9bVy0KIwVwSwrxWovDcrAQW
-nWYdEfx06PUXc4KlBlbnpuz1mG7d9tKh+gUDmvXc80TU6x4ISQyqNyhmL/eILamm
-DPN1aWRo1fcf7HRpAG/WrfG57cuYI5/2/EDgUhC3glthYrFZmBmyLSL/bpWJe7bF
-UzYGyfEzxgXp1Qqmu8GENHG9lf0Wkhw0QtbjsxPd5MbxA9I0y/LTU1nLHTjLIwy3
-yykDb8zWK57F9vMK9MK7fqv+y8Qs++Y2F7zy0CnMqpB2woA3WF8F1GaE86DEfXfn
-sHUFrjcctVNm8lz4VC9xV1TbdFVauWsvGkcZ51JKDcuZn+5R2Yc20gwPLCo14YF0
-DUjnNx2yhMR6xkZb0zlp/g1O/MWjTv6ncIp8k2B4+/kKl8Cp/D8dSnAkcipe9uIL
-y7lURzSp/sDFh665BlFZz/t61qK+p72I3cw3PuUdSnlxLHSk78qwY7v6CGKMIWTK
-cp21gGnwxfuZtkcSfyVe
-=CZfH
+iEYEAREIAAYFAlQ1KSEACgkQvFcC4BYPU0pDYwCeIhfwM+Cbj6Qf+2iE5Pjtwd3U
+4qsAnis5rEdwL9YW/9hJiprPEoJ0d67h
+=qQL3
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
new file mode 100644
index 000000000000..57a91774abc5
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=520190
+
+Index: transcode-1.1.7/import/probe_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/probe_ffmpeg.c
++++ transcode-1.1.7/import/probe_ffmpeg.c
+@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
+ 
+     translate_info(lavf_dmx_context, ipipe->probe_info);
+ 
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
++    avformat_close_input(&lavf_dmx_context);
++#else
+     av_close_input_file(lavf_dmx_context);
++#endif
+     return;
+ }
+ 
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 4ff15d759d8f..1e6be6654b6a 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.9 2014/07/06 13:21:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.10 2014/10/08 12:08:00 aballier Exp $
 
 EAPI=5
 inherit eutils libtool multilib
@@ -64,7 +64,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-libav-9.patch \
 		"${FILESDIR}"/${P}-preset-force.patch \
 		"${FILESDIR}"/${P}-ffmpeg2.patch \
-		"${FILESDIR}"/${P}-freetype251.patch
+		"${FILESDIR}"/${P}-freetype251.patch \
+		"${FILESDIR}"/${P}-ffmpeg24.patch
 
 	elibtoolize
 }