summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-09-22 21:55:55 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-09-22 21:55:55 +0000
commitfd7d7ccd936fb2ab6c5c99c1ebe180eb32a68354 (patch)
tree965032d7940eeb782e11b52e9b3b9f68fbf877f0 /media-libs/libquicktime
parentremove old gwenhywfar ebuilds (diff)
downloadhistorical-fd7d7ccd936fb2ab6c5c99c1ebe180eb32a68354.tar.gz
historical-fd7d7ccd936fb2ab6c5c99c1ebe180eb32a68354.tar.bz2
historical-fd7d7ccd936fb2ab6c5c99c1ebe180eb32a68354.zip
It seems I was a bit too quick at backporting the patch. Fix it now.
Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26.5 x86_64
Diffstat (limited to 'media-libs/libquicktime')
-rw-r--r--media-libs/libquicktime/ChangeLog6
-rw-r--r--media-libs/libquicktime/Manifest10
-rw-r--r--media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch2
3 files changed, 11 insertions, 7 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 1133e82ae402..7d0f41201204 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.122 2008/09/22 19:56:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.123 2008/09/22 21:55:54 aballier Exp $
+
+ 22 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+ files/libquicktime-1.0.3-x264lavc.patch:
+ It seems I was a bit too quick at backporting the patch. Fix it now.
22 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+files/libquicktime-1.0.3-x264lavc.patch, libquicktime-1.0.3.ebuild:
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index ab4e99fdafeb..abfae7da9986 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX libquicktime-1.0.3-x264lavc.patch 6950 RMD160 f5712e2df58d996b15a120139638e68af6239e28 SHA1 80abd46a99ce6a53ad543e37d2f57a3dca86dcb3 SHA256 55ae08ace6ab6e71335b4b8520cf1942dc0479b007313d6c0a202fd12fa67552
+AUX libquicktime-1.0.3-x264lavc.patch 6949 RMD160 16de3254d977d0217a634e78bfffd51f2acc2365 SHA1 5d11971a8cf4daed67102399cdeffd5a61be2131 SHA256 4e18d9761df5316b8deaf0172f907d59b4b6d6310937b0bdbcc65f35754a6e7b
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 18986 RMD160 1edb5cc323a4e7a773e0f0a4b41920cc3f9ce82a SHA1 a5a4084cccba567cccde9fb40b6f5a172db5b922 SHA256 c25b4b879439879de21694c9b26f012dfc7ad75baec9f09ddddb351486e1a50d
+MISC ChangeLog 19153 RMD160 08a431a571ee3979e6e7d5e340753f80542b95bc SHA1 b36a443c6da60590718334f2e7f5a09802f127cd SHA256 f8f115f4e13c8dbe2f91c3f8a4c946d44cf4f2d599a555927741d42d9bc20894
MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkjX+G0ACgkQvFcC4BYPU0ovkwCfZoatar07rCEM7sq0nQsqLRv4
-w8EAoJYxV0h3k9syyPYuCVKIAFaP6xJf
-=iDVK
+iEYEARECAAYFAkjYFHAACgkQvFcC4BYPU0qS6ACfRDmk9ScgV3iXF89pKVcCtZLL
+hMMAoLz3J2a2YcHCw1wc5Tiwo67hKb1G
+=+IlM
-----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch b/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch
index 709e614c94ca..aeb19ebea017 100644
--- a/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch
+++ b/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch
@@ -182,7 +182,7 @@ diff -u -B -r1.23 -r1.24
INTPARAM("x264_i_bframe", codec->params.i_bframe);
- INTPARAM("x264_b_bframe_adaptive", codec->params.b_bframe_adaptive);
+#if X264_BUILD < 63
-+ INTPARAM("x264_b_bframe_adaptive", codec->params.b_bframe_adaptives);
++ INTPARAM("x264_b_bframe_adaptive", codec->params.b_bframe_adaptive);
+#else
+ ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives);
+#endif