Another patch merged upstream to fix compatibility with latest x264.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26.5 x86_64

4 files changed, 89 insertions, 7 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/Manifest b/media-libs/libquicktime/Manifest
index 9d2b0db45416..a28e783b4072 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libquicktime-1.0.3-x264-65.patch 2949 RMD160 92175c1ab94c871d024e9604288931f58b3db7af SHA1 1a70c252bdb86b8fc78ef637f8feac8962641dce SHA256 9631b1532b63b0a81247e3512429af769541a65d43d5cfd3748dcf15a9383fdf
 AUX libquicktime-1.0.3-x264lavc.patch 6939 RMD160 9ef1d7d5e3a47791c9939015f460b08d908f6d30 SHA1 d265c0ab4d04b7cea122d8f169650852a32fbc76 SHA256 77218bef978a3dd77ddf04f33a80d814d5a81fe55952fabbe94151280c02c997
 DIST libquicktime-1.0.3.tar.gz 1003262 RMD160 470ea049318f54d4bb7d633b33bdfa7c296469b1 SHA1 3e5e59c2620e83c6e7257befe76edb4b136c787c SHA256 72aa1c21539cecf08ced57386541fd092dd5957677c77e4c7ddc4d7c30df769a
-EBUILD libquicktime-1.0.3.ebuild 2783 RMD160 19c6fc922bc329bcd4f51220f7acdaecfb1b5848 SHA1 475de84741f0a96d13f8156afd35ac025491f005 SHA256 a24c768f8d13614fd767dd03f3c472f83b810b908c10f0fc4e4ce05dc411fd83
-MISC ChangeLog 19352 RMD160 93b7848cd6712c269c7bea48adf61370ecb4184e SHA1 bfda9627f2bedb2f48eb9c4c58f552cddc21b685 SHA256 c341f754482a8f269a8ffbd83c66b0b0251839bc006e320f290fb8432b0bba54
+EBUILD libquicktime-1.0.3.ebuild 2824 RMD160 57023be0ae5a648085bb979fef84890b0684325f SHA1 5ef69a45041ba1bb00df08698b5af4b4bb0d4fe0 SHA256 cefa3acf8d198be9ebe8a57b1c02cabeb6299881a7286c7743802faa8623a017
+MISC ChangeLog 19546 RMD160 e3ab60ce642ddaa63db46124d59aadd9fdf82c64 SHA1 a52c91e45e2d5de6a8fd3d8b14729e2d55b0e7ba SHA256 a74317838914a70bccbf63621db63a2724ee988e2ce0b4633ff4bf215046c6ac
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjc4YYACgkQvFcC4BYPU0rn0gCcDi92qm+VsSU8P3gBd1LXI+al
-CPAAoKQ4z8S/i9j6XzdEC8unz+Wn3eem
-=HXhu
+iEYEARECAAYFAkjpytsACgkQvFcC4BYPU0rorQCgyc3d1ZRIdnohP0n8PQ6JbGJn
+CH0AoJQM54rjudtfyTEL5bjxf7v6qE8/
+=k0fl
 -----END PGP SIGNATURE-----
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
 }