fix build with ffmpeg/libav trunk

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 37 insertions, 2 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 588e1e54b558..bc075bd377fb 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.168 2011/04/10 20:22:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.169 2011/04/25 20:55:53 aballier Exp $
+
+  25 Apr 2011; Alexis Ballier <aballier@gentoo.org> libquicktime-1.2.2.ebuild,
+  +files/libquicktime-1.2.2-ffmpeg07.patch:
+  fix build with ffmpeg/libav trunk
 
   10 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libquicktime-1.2.2.ebuild:
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch b/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch
new file mode 100644
index 000000000000..1d8b0df2c2a1
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch
@@ -0,0 +1,30 @@
+Index: libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c
+===================================================================
+--- libquicktime-1.2.2.orig/plugins/ffmpeg/lqt_ffmpeg.c
++++ libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c
+@@ -1031,8 +1031,8 @@ static void set_codec_info(struct CODECI
+   snprintf(ffmpeg_long_name, 256, "%s", map->name);
+   snprintf(ffmpeg_description, 256, "%s", map->name);
+   
+-  if((map->encoder && (map->encoder->type == CODEC_TYPE_VIDEO)) ||
+-     (map->decoder && (map->decoder->type == CODEC_TYPE_VIDEO))){
++  if((map->encoder && (map->encoder->type == AVMEDIA_TYPE_VIDEO)) ||
++     (map->decoder && (map->decoder->type == AVMEDIA_TYPE_VIDEO))){
+        codec_info_ffmpeg.type = LQT_CODEC_VIDEO;
+   } else {
+        codec_info_ffmpeg.type = LQT_CODEC_AUDIO;
+Index: libquicktime-1.2.2/plugins/ffmpeg/params.c
+===================================================================
+--- libquicktime-1.2.2.orig/plugins/ffmpeg/params.c
++++ libquicktime-1.2.2/plugins/ffmpeg/params.c
+@@ -205,8 +205,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_FLOAT("ff_p_masking",p_masking);
+   PARAM_FLOAT("ff_dark_masking",dark_masking);
+   PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method);
++#if LIBAVCODEC_VERSION_MAJOR < 53
+   PARAM_INT("ff_mb_qmin",mb_qmin);
+   PARAM_INT("ff_mb_qmax",mb_qmax);
++#endif
+   PARAM_ENUM("ff_me_cmp",me_cmp,compare_func);
+   PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp);
+   PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func);
diff --git a/media-libs/libquicktime/libquicktime-1.2.2.ebuild b/media-libs/libquicktime/libquicktime-1.2.2.ebuild
index cabfb9c60024..5e8b6c074ba1 100644
--- a/media-libs/libquicktime/libquicktime-1.2.2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.2.ebuild,v 1.9 2011/04/10 20:22:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.2.ebuild,v 1.10 2011/04/25 20:55:53 aballier Exp $
 
 EAPI=1
 
@@ -53,6 +53,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-ffmpeg07.patch"
 	# Needed for sane .so versionning on g/fbsd
 	elibtoolize
 }