Handle renamed CODEC_ID defines #538500 by Patrick Lauer.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 0c0652e95f6df97871d97b803ca237812f218fa5..e27c2cca97ad16a700443f524bf830d4f0c8c8ac 100644 (file)
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.325 2015/02/17 01:19:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.326 2015/02/17 02:54:28 vapier Exp $
+
+  17 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+  files/transcode-1.1.7-ffmpeg2.patch:
+  Handle renamed CODEC_ID defines #538500 by Patrick Lauer.
 
   17 Feb 2015; Mike Frysinger <vapier@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 f6ce71a7bae6b73949021b1cac7ca58f137c27d2..a3f8b98f9bd1f8420070b67f9381b3e469ff716c 100644 (file)
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX transcode-1.1.7-ffmpeg-0.10.patch 402 SHA256 5df30ce0bdaee1d61a5dd94d242ce010dc043305553519a1532c33b2628ec308 SHA512 d15a222ac21ba91758cdd8c7e43188cfa5fb015d3bdf2c74290b26e5fc12a5899f6a6ac59a9763ee8009ed7fb8fcf4b3dc9ec4f4cc5ca8049bd5f437e7b725bf WHIRLPOOL fc06332d4f2037083f57edfbcd71515fd6d9d64a03bceb3a71ab7d44b795c01eb6cfa8675a27bbe252fa12650dbca5b7100b04f78df3f5515f3827bf59fe88fa
 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-ffmpeg2.patch 15266 SHA256 ea5ee6ead830a0fc5f6a28bab74ebfdce2aa014f733a415185b5547b1288f963 SHA512 4917d6b0fc02e1dfb56d712b39eb5abac4f70dccc8e4293d68269d6c3d934ba8fb9bca9af82c8112ea044d8bdb1fef1ce2a628c020d61bdfab838619b488b58f WHIRLPOOL dd22f9de98a0ca67acfb1f156c4a8ee323509eda6f3021692cde4b982e052de7992fbe7781305fdafb4761a84ecf9c514fb7ec141373d4892efb0b1f741fb36f
 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
@@ -14,22 +14,22 @@ DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0
 EBUILD transcode-1.1.7-r1.ebuild 3508 SHA256 98a24ed3aed172ee263f0f5da33647551dc3434a0f73875d3b22a81396c9eb04 SHA512 04401771c9c19871ac43e3219f642eb618741077f947a766f42694c7832a2a230757d3991ba11773427685433d6d506b62bfbac21f3e73ed3cb94b8a2e4d0bd8 WHIRLPOOL 932134449e7e6dd43578e97e6073236bad1be69cea80dac6e57676c9c4a24b0fa417f481f918f949356ccb3ed924c551d0dd25a6f65ad2da003b7a215037b766
 EBUILD transcode-1.1.7-r2.ebuild 3550 SHA256 33ec022cef87fb1406da39182409e53b02fda6b3a024c5146283a0dbdb217cbf SHA512 44a5b5f3509a41dd0b12d34477e8a101f4b289383be3aaedbc85cc2265ccc83f7b2640422d810505f4fd742c387ee2c42e0b66972102403ce4ef0038da93082b WHIRLPOOL 4d146fe7f67cb07958cc87f920056eb3b2cc7582313955a14c189943994197f22ae0fa3a448b2f3eedafbacaff1b61971c10229c9905862149850c706b862562
 EBUILD transcode-1.1.7-r3.ebuild 3703 SHA256 da7d1a74c9aa8753f937f583efce25b3efd43d942d4c09beb3ff1be16e8e87af SHA512 a36af67628f512576dd3886c3cb5288a87f793f3b3854bb5712fee21d16bd5f00b7f9184b7b7fb077cdc2e33fff7f7618fd8c2abb277114b8130c549e0846ffb WHIRLPOOL f0c8f08acf2e8f1ddfd9d8b35059d4a64dac12d941eda51b92b9cc4f49844d0f2d3b2283afb119f45bcf3023a1b1bed88e56538b5a3956985c7c4504adcc5406
-MISC ChangeLog 53711 SHA256 170f1bac44f49d421d433eab312e142b12eb4d752dd1b6ae81ac2aac99405119 SHA512 fcc932c14b7a9326dcc3e8bdefeb7f041a02e77307f9a864c153cbdb61dbbd8a0659cf528bfd947a327181d9305e5dad220a01a25bbe1e1122e08bc501319547 WHIRLPOOL e9e30ed0afa57992b1ec7e66d3f19c78d7868497345464ec5eff6960781098d606d1f4741108c42fa5dc48bd43660ac643f1a880365c85709b080e353c396c14
+MISC ChangeLog 53861 SHA256 52de54225193e057b28d509c03c08863bc034fcba167511b5fb9c22c7ed280fb SHA512 b083c93ef03052bd09f233fa49846b3856d3c31adfb36f514066d410168b856ffd5501cadf5321460e3f0da293273baf8340ee7e153ed556d618f642f1419b9c WHIRLPOOL dbf8fd9988f70861e3cd9e4f0f1ba8a8345a3e227866077283e36e54a253d04d1e287461a2ec3282acc4c35870c89c195abca2ab9abc7ba133a84142448acdae
 MISC metadata.xml 529 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 SHA512 6c5a6dd9ef9407f0c05f42cdfeaf4d3c2e2e6a4c91028331b6dd905acf1174e7bb937b780d12043f030a6afd344aef0df1a2a3d13cbda5a71724bd1f7a8b8302 WHIRLPOOL c27354b3de6c7cb67a30adac4c66e4b72726ecf3e1a1b05fa2e759ce174cfc51154dcfeb0c1b48754702e304fc95753c42ac626b0d6338021737b84bdb074385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4peiAAoJEPGu1DbS6WIA4oYP/1VkDJBxi96WFLumEM6yfTv2
-UJQd94FK2QTiXAiO0YqmgvqfcjmjfnSLQkq8rKcwLnk2AxNpo88yjqAc7SISKXJv
-xN6P2Kj3eC+cpULeMyGHT66IzQ4nZ8tYgQ9K/N/eJNi47nwuhVVkuobKz9LUIiBK
-EurwsUzYugNq97DenJogHEUPbR7z1TFH8f6xSsA4EgjgTafUshezthyM2uMrmOzw
-RsXed8ljpKFoWLGBQhKwlk3vwFXnhe20BTgQ9VaZfRJEidW+1teYFzNTJPdZ/5TA
-7qFbUloT5a/NxH9ZF7la7op6x8F1n9wVLjsFOd6vSPMHkF0lJ2eaQuvw1YtUh8c7
-oR4A4rRbbvvG+vgVkP0OmL9zXFGZtqicw5KquBF2EbBPhBsfefgR5AFmcY0uVK9B
-rxqAElLS3GTzr4uxHTv1uT2nlYUkua0XLJPVWoc+CaV2Jj11TFsClZVcCjZVa+96
-aDEkfWsPA9d+Of/6mh3LeSEJ5+UmL4UoUf82x35a+gwuJkuf8qe3cpMBEYMJwo2g
-N4TyoZ968FYC5YaLdcbpwdFj44OY1umxqbco1UXUmVkxC0dU70oahc3QYzaVNgvY
-8AhNM8RmvN2g22KwgGGpvgJyHJwkCJwdszxfOpR3O4gEs1BDlm/YHeuMMjkmZNg6
-rfOSpIxiyXZJ0zH0X9bp
-=b39J
+iQIcBAEBCAAGBQJU4q4CAAoJEPGu1DbS6WIA0ykQAIhBd8FXo6/2S+Uxy2CeMz5K
+YtHntu5bkX1cuhGRBQsdLlt+xP9AqO/MmBFY7723cRN5+xD7VEl2NIgOAfmR7LmT
+scDGZaEBsDm+OvOaGTs9LPf3j0hg9guIEWBBtOTb8njlggGs8snfpRVPfjJeFmjZ
+4iCQ7+pzTa+W8tOEdDwtXpDtim1gVgutkW1AeQp6Ea+fsGJtdaUuqzt3zzcaDjeX
+xQcxArCxOam7QvWSomTEZ3WvmbScSdVYCOUKJDrsV428CI7BZye6nbPOw2k3QlRV
+dqe/9iFnAAUefV6qSIJBJjas5cwK4iMZdBqncgoKAKHuAquFAlsAgLoFevDym6R3
+v1heW4Vfq1QrFnz5UhyeXu/BSYJGSK7pVXGMhdQ9hyOwETeTudqoFpFcxt6nRJWU
+ovu0nfI9cD3wUYLSRq+x7KOCuiVz+Qj5jgxIqZYwmrb2NgC09YSPy1OG8hETKpEY
+iOjz5sF2irZy47yrcIcRJeHJhxR+ycSJ9i3gNHh/qPmySHh2CsJWQJuRdW7Zamcj
+wZFt2dnh7K5pGe8C/OUzv5zVvsxwDBYKtjUFCvQOpWtjcZSUpxTKspoeHU7B48Zu
+b01alicqQ3qXBuf/ijTL7N2y3ZLSyMiGokcDwiiL6RWVunC6MAmasgBu8aVgFS2N
+VOK2W7w5kvaj6//y/7bC
+=Oc1T
 -----END PGP SIGNATURE-----

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
index 26d7431402d884b3e9b8c6d1f20188e61d7c2f70..956fc1e64e4d4da18d1b8c8330bb482177e7d53a 100644 (file)
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
@@ -290,6 +290,25 @@ Index: transcode-1.1.7/export/aud_aux.c
 ===================================================================
 --- transcode-1.1.7.orig/export/aud_aux.c
 +++ transcode-1.1.7/export/aud_aux.c
+@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
+ 
+     switch (o_codec) {
+       case   0x50:
++#if LIBAVCODEC_VERSION_MAJOR < 55
+         codeid = CODEC_ID_MP2;
++#else
++        codeid = AV_CODEC_ID_MP2;
++#endif
+         break;
+       case 0x2000:
++#if LIBAVCODEC_VERSION_MAJOR < 55
+         codeid = CODEC_ID_AC3;
++#else
++        codeid = AV_CODEC_ID_AC3;
++#endif
+         break;
+       default:
+         tc_warn("cannot init ffmpeg with %x", o_codec);
 @@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
  
      //-- set parameters (bitrate, channels and sample-rate) --
@@ -308,6 +327,20 @@ Index: transcode-1.1.7/export/aud_aux.c
      TC_UNLOCK_LIBAVCODEC;
      if (ret < 0) {
          tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+-                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
++#if LIBAVCODEC_VERSION_MAJOR < 55
++                (codeid == CODEC_ID_MP2)
++#else
++                (codeid == AV_CODEC_ID_MP2)
++#endif
++                ?"mpa" :"ac3");
+         return(TC_EXPORT_ERROR);
+     }
+ 
 Index: transcode-1.1.7/import/import_ffmpeg.c
 ===================================================================
 --- transcode-1.1.7.orig/import/import_ffmpeg.c