backport upstream fixes to build against ffmpeg 2, bug #476498

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

4 files changed, 113 insertions, 9 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 47e9532bc29d..e8c57167eda7 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.192 2013/04/04 09:10:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.193 2013/08/06 22:32:44 aballier Exp $
+
+  06 Aug 2013; Alexis Ballier <aballier@gentoo.org> libquicktime-1.2.4.ebuild,
+  +files/libquicktime-1.2.4-ffmpeg2.patch:
+  backport upstream fixes to build against ffmpeg 2, bug #476498
 
   04 Apr 2013; Alexis Ballier <aballier@gentoo.org>
   -libquicktime-1.2.3-r1.ebuild:
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index bab67a6ea06c..21d21e34a933 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX libquicktime-1.2.4+libav-9.patch 464 SHA256 d2ae77357d52e522f56c12fb1409b6d27bd576582122d04177a7433b39538bb3 SHA512 691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e WHIRLPOOL 5906f1cc37d305616579084e0e4338f08a41817e51dc66e3d044b0e9012253aef2674c9fb06df48d689dea8e7431f73a8d8c278af723982d7e873d8376f717d4
+AUX libquicktime-1.2.4-ffmpeg2.patch 4046 SHA256 2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93 SHA512 32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d WHIRLPOOL c22a21bd245f51c457d68291bb86536f7b381fbf01f9ff5ad6e3f4b727938dde9cbe0bc0ba7eb4fbef71dbced2aa02121a097a9cdeb5bdd4c24dac699df48c08
 DIST libquicktime-1.2.4.tar.gz 1028626 SHA256 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd WHIRLPOOL 8eda1c75d86d728157f4e4c9e07555dd8dfa2a6ad5fc37d022142111993610d8350e54d586fe1c6627402f22ce42a9b9505a3ffb909f9bb530b9ea0f71b6b192
-EBUILD libquicktime-1.2.4.ebuild 2752 SHA256 e5019f453f5a3efa91569643ba5ff33caf1c1e58e7c3659e7a82dc92ea9d57c8 SHA512 9168f454f664eedfdd9afb0b62a67fb24f52ccac8a495a95feca0b14d8d23d556851c177c9c10973e7bb4895fc3250e9cc89c1a900d3aad07c91177e74f7cfce WHIRLPOOL 20ef1ba96767b6b31f02ab1b0b17f9f2600a751230a10062e316953ae90b8302f73d05576a12cfcc2e09a6ca5c691a42dd78549e2be8ec95b9598fe75421f0b1
-MISC ChangeLog 28277 SHA256 32187354fbcba68df4f5e1705e37935823cf1cde69c471fd393d1403743caacf SHA512 a6667277df63aeec3b27ab826d6cf97aa0ceb7382f948cc7cb40d7a35f38d7d28927e38d52c63304c717e729c1bd1095707759279863ae3776eee8a798ee1fdc WHIRLPOOL 7065c3f9b22ddf56ed5b2e619b7d7aa56d8ea6c1a33ceb1270d03d7a7ab044ce51bc58b8f82fd1ac43ad6522ce8c3fa7e531c658ed213601bb45254dbaaebdbb
+EBUILD libquicktime-1.2.4.ebuild 2794 SHA256 dd3e6aeba101accb0e12e09cbce953e6dcb1ebd30e0760cfbcd82a5d82390432 SHA512 98bef72f817ac29710db5951b37cb1bff33537b67b0c8bf4416b6ea6b5fd0c2572b773d0fab85bc0ff3842d7c36fdb38977886467669f81c9f07a17922046535 WHIRLPOOL ad339a8ae6cb545dddaefb060c2021053904f33ea4a6b3990f40caff20303e02b8f99fd0f0a93b074a9f626caab26afc697d155a5258d80c579b5d546f3d1ee6
+MISC ChangeLog 28465 SHA256 e37044b926681a433e8086b116b46dd24bf663fb4090e8e41288e26d3a8cdc12 SHA512 3d788b8bc44d174227ba493219871ece41084b4801f36e71cfbce60f2d99f5f10acdd9fd44e652baaf0f094a4e90d7228171bc01ff141e4ba5fde33875ab9750 WHIRLPOOL f79373c55a2974687845466836078268e6fd33354c2ea33a7659b15530c377f8aa7ee8e2559d42b69468a369ad6f468ee3efb650bf111fdbe3e6a03717602ac6
 MISC metadata.xml 429 SHA256 0f34b97b72c8fd6ac971342f174aee213910769a0a45060b188da3e9b98bbfb0 SHA512 03e085e21c5be7412f7424eb900f3ff33f085e9941b8f296356b6a39d6ee2233bfcf01f54ac06fe459ae960f8c8f829969946379a6bd54b6f5d59d51c79555e9 WHIRLPOOL 33ee43277f22fe3d52e05362e1d3a2ceb17f96b6c3acdaa37e58e32418c7039be05e19c87a5f10a261dc4a1592a0192f0e52b1223b34addf6acceb4842e57326
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFdQ40ACgkQvFcC4BYPU0r0DQCgucfvZkAS+QcetHhNEbNJZX+U
-F1sAnihvidE9rYGwMyBn3cP5u6E0stjl
-=gj0/
+iEYEAREIAAYFAlIBeY0ACgkQvFcC4BYPU0oh+wCfQp/mLZme8h0KGgneKfPOsX/2
+4K8AoL3R9YFE9ya0M+uqPW/adwn7m59m
+=9+Yi
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg2.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg2.patch
new file mode 100644
index 000000000000..7add44220a2b
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg2.patch
@@ -0,0 +1,98 @@
+Extracted from upstream CVS.
+https://bugs.gentoo.org/show_bug.cgi?id=476498
+
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -45,6 +45,11 @@
+ #define ENCODE_AUDIO 1
+ #endif
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++/* from libavcodec/avcodec.h dated Dec 23 2012 */
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
+ 
+ /* MPEG Audio header parsing code */
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
++++ libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -101,6 +101,17 @@ typedef struct
+     }                                           \
+   }
+ 
++#define PARAM_DICT_INT(name, dict_name)             \
++  {                                                 \
++  if(!strcasecmp(name, key))                        \
++    {                                               \
++    char buf[128];                                  \
++    snprintf(buf, sizeof(buf), "%d", *(int*)value); \
++    av_dict_set(options, dict_name, buf, 0);        \
++    found = 1;                                      \
++    }                                               \
++  }
++
+ #define PARAM_DICT_FLAG(name, dict_name)        \
+   {                                             \
+   if(!strcasecmp(name, key))                    \
+@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_max_b_frames",max_b_frames);
+   PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
+   PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
++
++#if LIBAVCODEC_VERSION_MAJOR >= 55
++  PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold");
++  PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold");
++#else
+   PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
+   PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
++#endif
++
+   PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
+   PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
+   PARAM_INT("ff_rc_min_rate",rc_min_rate);
+@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_QP2LAMBDA("ff_lmax", lmax);
+   PARAM_INT("ff_noise_reduction",noise_reduction);
+   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
++
++#if LIBAVCODEC_VERSION_MAJOR >= 55
++  PARAM_DICT_INT("ff_inter_threshold","inter_threshold");
++  PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping");
++#else
+   PARAM_INT("ff_inter_threshold",inter_threshold);
+   PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
++#endif
++
+   PARAM_INT("ff_thread_count",thread_count);
+   PARAM_INT("ff_me_threshold",me_threshold);
+   PARAM_INT("ff_mb_threshold",mb_threshold);
+@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
+   PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
+   //  PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
++
++#if LIBAVCODEC_VERSION_MAJOR >= 55
++  PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd");
++  PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
++  PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
++#else
+   PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
+   PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
++  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
++#endif
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 54
+   PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv");
+@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
+   PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
+   PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
+-  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
+   PARAM_ENUM("ff_coder_type",coder_type,coder_type);
+   
+   }
diff --git a/media-libs/libquicktime/libquicktime-1.2.4.ebuild b/media-libs/libquicktime/libquicktime-1.2.4.ebuild
index cb20e829de0d..36bd95a863a0 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4.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-libs/libquicktime/libquicktime-1.2.4.ebuild,v 1.11 2013/02/02 22:49:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4.ebuild,v 1.12 2013/08/06 22:32:44 aballier Exp $
 
 EAPI=4
 inherit libtool eutils
@@ -51,7 +51,8 @@ REQUIRED_USE="opengl? ( X )"
 DOCS="ChangeLog README TODO"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}+libav-9.patch
+	epatch "${FILESDIR}"/${P}+libav-9.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch
 	elibtoolize # Required for .so versioning on g/fbsd
 }