Another patch merged upstream to fix compatibility with latest x264.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)

3 files changed, 83 insertions, 2 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 9aebe02925a2..cf2f15925da7 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.124 2008/09/26 13:20:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.125 2008/10/06 08:22:45 aballier Exp $
+
+  06 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/libquicktime-1.0.3-x264-65.patch, libquicktime-1.0.3.ebuild:
+  Another patch merged upstream to fix compatibility with latest x264.
 
   26 Sep 2008; Alexis Ballier <aballier@gentoo.org>
   files/libquicktime-1.0.3-x264lavc.patch:
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.3-x264-65.patch b/media-libs/libquicktime/files/libquicktime-1.0.3-x264-65.patch
new file mode 100644
index 000000000000..e7fd04c9fe53
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.0.3-x264-65.patch
@@ -0,0 +1,76 @@
+Index: plugins/x264/lqt_x264.c
+===================================================================
+RCS file: /cvsroot/libquicktime/libquicktime/plugins/x264/lqt_x264.c,v
+retrieving revision 1.11
+diff -u -B -r1.11 lqt_x264.c
+--- plugins/x264/lqt_x264.c	22 Sep 2008 18:24:49 -0000	1.11
++++ plugins/x264/lqt_x264.c	5 Oct 2008 18:32:41 -0000
+@@ -323,11 +323,20 @@
+       .real_name =   TRS("Partition decision"),
+       .type =        LQT_PARAMETER_INT,
+       .val_min =     { .val_int = 1 },
++#if X264_BUILD < 65
+       .val_max =     { .val_int = 7 },
++#else
++      .val_max =     { .val_int = 9 },
++#endif
+       .val_default = { .val_int = 5 },
+       .help_string = TRS("Subpixel motion estimation and partition decision "
++#if X264_BUILD < 65
+                          "quality: 1=fast, 7=best.")
++#else
++                         "quality: 1=fast, 9=best.")
++#endif
+     },
++#if X264_BUILD < 65
+     {
+       .name =        "x264_b_bframe_rdo",
+       .real_name =   TRS("RD based mode decision for B-frames"),
+@@ -338,6 +347,7 @@
+       .help_string = TRS("RD based mode decision for B-frames. Requires partition "
+                          "decision 6.")
+     },
++#endif
+     {
+       .name =        "x264_i_me_range",
+       .real_name =   TRS("Search range"),
+@@ -377,6 +387,7 @@
+       .help_string = TRS("Allow each MB partition in P-frames to have it's own "
+                          "reference number")
+     },
++#if X264_BUILD < 65
+     {
+       .name =        "x264_b_bidir_me",
+       .real_name =   TRS("Bidirectional ME"),
+@@ -386,6 +397,7 @@
+       .val_default = { .val_int = 0 },
+       .help_string = TRS("Jointly optimize both MVs in B-frames")
+     },
++#endif
+     {
+       .name =        "x264_b_weighted_bipred",
+       .real_name =   TRS("Weighted biprediction"),
+Index: plugins/x264/x264.c
+===================================================================
+RCS file: /cvsroot/libquicktime/libquicktime/plugins/x264/x264.c,v
+retrieving revision 1.25
+diff -u -B -r1.25 x264.c
+--- plugins/x264/x264.c	22 Sep 2008 22:01:40 -0000	1.25
++++ plugins/x264/x264.c	5 Oct 2008 18:32:42 -0000
+@@ -880,12 +880,16 @@
+   ENUMPARAM("x264_i_me_method", codec->params.analyse.i_me_method, me_methods);
+ 
+   INTPARAM("x264_i_subpel_refine", codec->params.analyse.i_subpel_refine);
++#if X264_BUILD < 65
+   INTPARAM("x264_b_bframe_rdo", codec->params.analyse.b_bframe_rdo);
++#endif
+   INTPARAM("x264_i_me_range", codec->params.analyse.i_me_range);
+   INTPARAM("x264_i_frame_reference", codec->params.i_frame_reference);
+   INTPARAM("x264_b_chroma_me", codec->params.analyse.b_chroma_me);
+   INTPARAM("x264_b_mixed_references", codec->params.analyse.b_mixed_references);
++#if X264_BUILD < 65
+   INTPARAM("x264_b_bidir_me", codec->params.analyse.b_bidir_me);
++#endif
+   INTPARAM("x264_b_weighted_bipred", codec->params.analyse.b_weighted_bipred);
+     
+   ENUMPARAM("x264_i_direct_mv_pred", codec->params.analyse.i_direct_mv_pred, direct_modes);
diff --git a/media-libs/libquicktime/libquicktime-1.0.3.ebuild b/media-libs/libquicktime/libquicktime-1.0.3.ebuild
index 346a8fd7b6c7..73a1dfdaaba6 100644
--- a/media-libs/libquicktime/libquicktime-1.0.3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.3.ebuild,v 1.8 2008/09/22 19:56:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.3.ebuild,v 1.9 2008/10/06 08:22:45 aballier Exp $
 
 inherit libtool eutils
 
@@ -51,6 +51,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-x264lavc.patch"
+	epatch "${FILESDIR}/${P}-x264-65.patch"
 	# Needed for sane .so versionning on g/fbsd
 	elibtoolize
 }