fix build with ffmpeg2 (again)

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

4 files changed, 143 insertions, 18 deletions

diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog
index a61d207b4de2..14a73652b150 100644
--- a/media-plugins/gst-plugins-libav/ChangeLog
+++ b/media-plugins/gst-plugins-libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.30 2013/10/11 05:18:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.31 2013/10/12 08:12:45 aballier Exp $
+
+  12 Oct 2013; Alexis Ballier <aballier@gentoo.org>
+  gst-plugins-libav-1.2.0.ebuild, +files/gst-plugins-libav-1.2.0-ffmpeg2.patch:
+  fix build with ffmpeg2 (again)
 
   11 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-libav-1.1.0_pre20130128-r1.ebuild:
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index c0f17678d906..fabf074f5a30 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gst-plugins-libav-1.1.0_pre20130128-coma.patch 517 SHA256 3f2d856668aabf8872588a9bdfb6f28296b7b7f6cf5e9a2dd77cb3ee0ecddf4f SHA512 ab89eb9642ecb66a16503d136adf41c42bd41f1021546952580f2b6e8a558916234aebb35bce6af04de5b90e2ccd8695864ef0f44f0013eed904b06ec60c1a61 WHIRLPOOL e36c3ee9a663eb284b191a8bd83e45c346c685bfdc45d96dfe14a31a7918cd1e55aa11228139cb7cb811617e0563cc2f9d0c89fd68c3a37f0641330e045b5d37
 AUX gst-plugins-libav-1.1.0_pre20130128-compat.patch 1810 SHA256 e50bf0fcf9b9c3cac9e712832438642425d3180d085d3cee5bf3427093a3d789 SHA512 1f48b05b70aef81f0c1f190ff38a68fb0d9e95c525042d213ec8a34de48d72b164491cb27064643da080c37859922a2bce1c0161d13512a42afdb8fb774f271d WHIRLPOOL c2bfc6e64b7a2fe215d8e7c02664c4b7ed4ee5657ce264a7bbc0fa021aa9cc403b4c4b3629f73aea41c97e0143226233d5fd7d442ba87bd1b4cb869aa7380a90
 AUX gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch 5250 SHA256 51c20417417c797a703710eb27dcd7b9b2cd92321ee78c6dfea10ec77024b0b6 SHA512 7261dc865729c33b4d55953167e89118f2ddf7d9eaff0436d543e30f6d24127d74ccca9b5b2eb23faff28eac38beec343b5306eee70cea80dacd897b419ab0ed WHIRLPOOL 485e538cdee9dbbe88eebe1f6596b0d3f23618d19dccc80932e0a4a33a52c2f0a0a312646f4ce1281136aa60bf109b5f32eaea84e77802113c7f4abc83f796ea
 AUX gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch 1001 SHA256 120f5a118cfb71ed8eb03e015e49955ed38bf09a5dd7f9768054219a2e348e24 SHA512 7f29af719101821b88a19a46c2325021724e7f555260ff2a6448f45a87f39df303eae08aa1ef9509ccde467dc9f7e3f3cdcc2611ddd7d1b4f4cfb72f6f21364d WHIRLPOOL 987c420ea0be285c1a8c298080012f14ec8c4de31e5c653d0f312d2be40c32c935a6481e793922d969696dab70a90d9e1b45b74359775723fdceec5dcc9d19cc
+AUX gst-plugins-libav-1.2.0-ffmpeg2.patch 5020 SHA256 f7d8729719ecd1dd5103f9bd23230c01fdece180d0e08ff7e8f50ba564607647 SHA512 1ae30423e434dbb158475428f98482dc479862969e3b5493876d32bc425f07d2eec582ab92b6455fd487a7ddfe4142b6dcbd5f23e0de49453082fb331eff3914 WHIRLPOOL bca67b726c41553d1f2739ff5b65fc9dfcb5a5107e320217985d089cb349a33b37d74ee0c3cbfd52ed8107626fabbe773379e4ef2c181f2e172ff4457850f65f
 DIST gst-libav-1.0.3.tar.xz 4235032 SHA256 5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959 SHA512 b59b2abe3e841712948b2f3b3b78ce49573e0623880a4f11089a636c89268d3f79863c1a0975cd7e5bf4bf40a86f0d2370cf03511e2751d2cd39887733524be8 WHIRLPOOL 8b98829ccb9f160c8209f22fd44c5776d156a6d7e9b3d5526149521ed4b02a319ef7cd4d9df550133714433d93eb2dba211dfe83e1c03776885844ae71c1e518
 DIST gst-libav-1.0.5.tar.xz 4234992 SHA256 aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5 SHA512 36d5147ddf41caac34db4c5095499e84f8f832cd87c8b6fdf99055d2703e899c945494d0478cbc77b37a6dd62f71d614f033bde566b1658831f5fc286cee4ba3 WHIRLPOOL c5163259734d89f0fc1b15bebbe87cf49fd4611ba831a7f0d98086cc9afe17bdb0fb14e718e6852dd94f72c0a0e8d1290bf047d903e3f0bc7350d55c6190f6f0
 DIST gst-libav-1.1.0_pre20130128.tar.xz 477668 SHA256 c746d093b5ad4a6d325361217c49b35817ab0a257504d54b92ef0302820f66b4 SHA512 525d393b1fe665652798bd50859f6e5317b164c3edf7e20f4bc66a2d2c09e6345c2aacf80f8592306da0945325e7a22b0238bb868393df304fbdb4c8956cf338 WHIRLPOOL bb10a0d741997212556e88f2cec32bc93375e5a8c89b3b6ef3bc598a2c9ab8f8985b42b0585d5c2ff3ca08433276f094dca7194e1b660f8199fd276d2e531a8c
@@ -13,23 +14,13 @@ EBUILD gst-plugins-libav-1.0.3.ebuild 1426 SHA256 e6252d25cc95b2458c2be728d8b208
 EBUILD gst-plugins-libav-1.0.5.ebuild 1515 SHA256 227e17ed476e86b41848a9b9646b8eb64686eb5a9b04f9a4291aba3b1c0d6a22 SHA512 620cea71643b430815994a22341c0513cb5293f68b30cf593406f0f44036dfb14ea34a58b894e068e62ebebf8324f09c12769637ca593654610f688d21c166f7 WHIRLPOOL 94589dc577fbd348e52c7b5c31d2c85b5aaa9b22bf1ce7801960bdf495eb81efdf8f32c2338220817fb4a8d15dd791f23740c843662945e0de4e737c0f8a9e66
 EBUILD gst-plugins-libav-1.1.0_pre20130128-r1.ebuild 2519 SHA256 582b3724cfb01462bf3e6cc8e12bc85350e3fd5c02130f96609abb5180009ac8 SHA512 346c5afcbf47ef3df4988c78631aa840ba90c604480b0604a4107a5ae36f3671adb9d942b9d866e6f8f564863c40757ef02b36b17c0a3fe3ca60a86bbdf431aa WHIRLPOOL 658302ed66b60c36352eeb537a7462316e40f33b459acac1ae56d0827afc61d75fb11bf3005008735c4b7da8dc6134bab3122556af14b89dd86e4968c500cb55
 EBUILD gst-plugins-libav-1.1.0_pre20130128.ebuild 2100 SHA256 1be12415700d631430093688b13c371bd1344646b55f407c3bd677d2d327f252 SHA512 4775aa2ceb65bce40eaed69d0175d002dea5f8ccf8e7180e88cf52138c73614aad70dd95cf9c0547bc7ee5c7b5aeeb022b98a9225d6e23200657539a8ba1028c WHIRLPOOL aa0b9a9460d6305d58e2c02a71bef23aa70e0ae7e3d09cd462248754857e291acea3c22fff9285c8a45cb09d0f8b2fcf30636ae580e128116b0ac5dc20a9cadf
-EBUILD gst-plugins-libav-1.2.0.ebuild 1628 SHA256 9709fa030ebc227503ed56d4ae0b449c34d4be8e10003dcd56dd0cdd47e2af20 SHA512 04db02aa5980d8db154d4ddec44cd6f208fe73c956c2f6e8559991980c1c495c962990dad5a22df2ba136be7cb0a723adc61be9fb063bad35d7fbf0858bace13 WHIRLPOOL 59eca671d002c50e72fe0cab117e692b624cdbb3f14147d218c83469433755342897ef3f8a7a94bbeb523215d67bb483f09a2c2abc7739bf57d55a7c0e96e2d4
-MISC ChangeLog 4866 SHA256 d13e2388129fc9b457f6e6f92ae31a301af1818992fb8297b5cac58be63f7fc3 SHA512 f842c9f6c12048896719c1f183e5cc4a68af365a7ac3657bc75be8469a8f041838334ddd1369797ea8706e75e526864a495c02cca328642137390a3c57f8ba94 WHIRLPOOL a06df37644755d20e466ecfb1c344c3c45897b346d2a1d6deb9b8e4ff33af5ceda894454fb692c9eab942e84172c59241ee070336ed0d53dfbd2c9fa6ac1ce63
+EBUILD gst-plugins-libav-1.2.0.ebuild 2020 SHA256 eac05b7d31661e810802966424e3d1a02194a2447d29f07662f83c8a3b70eb29 SHA512 8e59399972c7eedfa8958d7a2973faec1bbe995cfbe0d544cb511c7f9e6b84f865f09017d59d7b9697ddcb2a6c26bdeb4dfa017a89a7e1c6c5fecceb7a36b657 WHIRLPOOL 98d87ab8569b655bb82c7ce27c1ec8a845fa7a1af6c7ff9897b1829cbff53138a100f3beb108e2ddb6790c6447aee399ac641a411326d44dfe916bee1134ce3b
+MISC ChangeLog 5037 SHA256 862fa4690852f30178660780e949c8dda9113af22443f85c4bc124559b2abc0d SHA512 4aee5c3b23d42fbe259b9c831a70f8900158f406387b622c7c64e2a8789d4d203cac56337b60eb5f2286cd552dc639b70ccbfd3393cd7fd6a6b5fa4e5eb4e554 WHIRLPOOL eb16d230112b07b169c1fd84ac84dff712dd3919546c8eb71d167c8638feb3feb860883cd0e146406d75d2809e08de4aa6c0b1f88d39a9ccc7b867a80fb5352e
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSV4ozAAoJELp701BxlEWf9jEP/10Uf1caSW+qJBBBN6iraK/e
-hwo9b+EAhx/24TMMHXayMazfLtiPuK/WIagiwJaqT1PW2YgJpWFvN3Y9NCKFJvHd
-+pTHPZRFqNACS9q+q9DO9jIstc9Mv8Hw5yFFJa+F5zeETON/6WsicHkiGiPN0D4L
-q6W8OiPvaLkoxVsmihOEEbPNz1ilJHqqpniXDeBEVBOv2D5q5zC9ItH3Re3e1lUt
-JOy7e5scBDPDLFaIEqADBIikPfKAc7Zeq3zOyIkM1XLNJlQ6WGGdrlMJ/Gf2Ggct
-p1jWT8AWZOvGDO3uoMYIWm9lwYvxo6nChbAZacNnuDIx0cc2sHt51ek5QLjK8Kab
-VDs4XbLfERJ1jZkvId93MM2JcDpsj9Wb2U1Qwec1UaejjZpkAsDyxByA+KK/0LdW
-yxF1aj3IcHJSvgdVgxkMX6tbVfnSYVw6Y1qyA5ES8dCD77rGD4+rix4JujnJ2ACE
-t6J/zoIRTicQX5pWgPb0YO8pPQCmeU/qtbYbydBxHEY5ZELHH2RlIi7sepmlYqwI
-QZRWBVxvacEVruNNxNzjQekYXwyHEQEUR3RZYAYWKOdqa9OpbExWllc3XmHSzmxy
-3dPpYLIvpX9zL1DdCxrit1X2rKcdwb2ckc7wkgDHNFr/YQj9ESo4TR/lSQf/zxG6
-LsJT67GBHfsphHxRBwt2
-=kNFJ
+iEYEAREIAAYFAlJZBH8ACgkQvFcC4BYPU0ph/ACcCpE3piUaP52i6WxWKQXlYMnh
+arYAn1wHZyRiHtv6sTZ91barU/Brbv+z
+=MAtg
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch
new file mode 100644
index 000000000000..3deeea061512
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.0-ffmpeg2.patch
@@ -0,0 +1,120 @@
+Index: gst-libav-1.2.0/ext/libav/gstavauddec.c
+===================================================================
+--- gst-libav-1.2.0.orig/ext/libav/gstavauddec.c
++++ gst-libav-1.2.0/ext/libav/gstavauddec.c
+@@ -460,7 +460,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA
+     GstBuffer ** outbuf, GstFlowReturn * ret)
+ {
+   gint len = -1;
+-  gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++  gint have_data = 0;
+   AVPacket packet;
+   AVFrame frame;
+ 
+Index: gst-libav-1.2.0/ext/libav/gstavaudenc.c
+===================================================================
+--- gst-libav-1.2.0.orig/ext/libav/gstavaudenc.c
++++ gst-libav-1.2.0/ext/libav/gstavaudenc.c
+@@ -289,7 +289,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
+   ffmpegaudenc->context->coder_type = 0;
+   ffmpegaudenc->context->context_model = 0;
+   ffmpegaudenc->context->scenechange_threshold = 0;
+-  ffmpegaudenc->context->inter_threshold = 0;
+ 
+   /* fetch pix_fmt and so on */
+   gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context);
+Index: gst-libav-1.2.0/ext/libav/gstavcfg.c
+===================================================================
+--- gst-libav-1.2.0.orig/ext/libav/gstavcfg.c
++++ gst-libav-1.2.0/ext/libav/gstavcfg.c
+@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void)
+       {FF_IDCT_INT, "JPEG reference Integer", "int"},
+       {FF_IDCT_SIMPLE, "Simple", "simple"},
+       {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"},
+-      {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"},
+       {FF_IDCT_ARM, "ARM", "arm"},
+       {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"},
+       {FF_IDCT_SH4, "SH4", "sh4"},
+       {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"},
+-      {FF_IDCT_H264, "H264", "h264"},
+-      {FF_IDCT_VP3, "VP3", "vp3"},
+       {FF_IDCT_IPP, "IPP", "ipp"},
+       {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"},
+       {0, NULL, NULL},
+@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void)
+           "global-headers"},
+       {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction",
+           "aic"},
+-      {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"},
+-      {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection",
+-          "qp-rd"},
+       {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"},
+       {0, NULL, NULL},
+     };
+@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void)
+       -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+   gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL);
+ 
+-  pspec = g_param_spec_int ("luma-elim-threshold",
+-      "Luma Elimination Threshold",
+-      "Luma Single Coefficient Elimination Threshold",
+-      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+-  gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL);
+-
+-  pspec = g_param_spec_int ("chroma-elim-threshold",
+-      "Chroma Elimination Threshold",
+-      "Chroma Single Coefficient Elimination Threshold",
+-      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+-  gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL);
+-
+   pspec = g_param_spec_float ("lumi-masking", "Luminance Masking",
+       "Luminance Masking", -1.0f, 1.0f, 0.0f,
+       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+Index: gst-libav-1.2.0/ext/libav/gstavcodecmap.c
+===================================================================
+--- gst-libav-1.2.0.orig/ext/libav/gstavcodecmap.c
++++ gst-libav-1.2.0/ext/libav/gstavcodecmap.c
+@@ -788,12 +788,10 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
+           break;
+       }
+ 
+-      /* FIXME: context->sub_id must be filled in during decoding */
+       caps =
+           gst_ff_vid_caps_new (context, NULL, codec_id, encode,
+           "video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL);
+       if (context) {
+-        gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL);
+         if (context->extradata_size >= 8) {
+           gst_caps_set_simple (caps,
+               "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata),
+@@ -2892,18 +2890,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod
+     }
+       break;
+ 
+-    case AV_CODEC_ID_RV10:
+-    case AV_CODEC_ID_RV20:
+-    case AV_CODEC_ID_RV30:
+-    case AV_CODEC_ID_RV40:
+-    {
+-      gint format;
+-
+-      if (gst_structure_get_int (str, "format", &format))
+-        context->sub_id = format;
+-
+-      break;
+-    }
+     case AV_CODEC_ID_COOK:
+     case AV_CODEC_ID_RA_288:
+     case AV_CODEC_ID_RA_144:
+Index: gst-libav-1.2.0/ext/libav/gstavvidenc.c
+===================================================================
+--- gst-libav-1.2.0.orig/ext/libav/gstavvidenc.c
++++ gst-libav-1.2.0/ext/libav/gstavvidenc.c
+@@ -338,7 +338,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc
+   ffmpegenc->context->coder_type = 0;
+   ffmpegenc->context->context_model = 0;
+   ffmpegenc->context->scenechange_threshold = 0;
+-  ffmpegenc->context->inter_threshold = 0;
+ 
+   /* and last but not least the pass; CBR, 2-pass, etc */
+   ffmpegenc->context->flags |= ffmpegenc->pass;
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild
index 4f461642de01..3904f410e59b 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.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-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild,v 1.1 2013/09/29 21:15:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild,v 1.2 2013/10/12 08:12:45 aballier Exp $
 
 EAPI="5"
 
@@ -31,6 +31,16 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
 	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# compatibility with recent releases 
+	# TODO: likely apply them with libav-10 when it's out but there will
+	# probably be an upstream gst-libav release compatible at that time.
+	if has_version '>=media-video/ffmpeg-2.0' ; then
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/libav/*.{c,h} || die
+		epatch "${FILESDIR}/${P}-ffmpeg2.patch"
+	fi
 }
 
 src_configure() {