summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2006-10-15 09:06:07 +0000
committerAlexis Ballier <aballier@gentoo.org>2006-10-15 09:06:07 +0000
commitbd92f25bcac49adf208aca4a9400905c7d7e1690 (patch)
tree69a00933d23354974e702b5536304732da5cacf5 /media-libs/libquicktime
parentVersion bump. (diff)
downloadgentoo-2-bd92f25bcac49adf208aca4a9400905c7d7e1690.tar.gz
gentoo-2-bd92f25bcac49adf208aca4a9400905c7d7e1690.tar.bz2
gentoo-2-bd92f25bcac49adf208aca4a9400905c7d7e1690.zip
Updating dependencies since it will not build with older x264-svn versions and minor change to the patch
(Portage version: 2.1.2_pre3-r2)
Diffstat (limited to 'media-libs/libquicktime')
-rw-r--r--media-libs/libquicktime/ChangeLog7
-rw-r--r--media-libs/libquicktime/files/libquicktime-new-x264.patch2
-rw-r--r--media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild4
3 files changed, 9 insertions, 4 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 7098cb7ca8c8..c13fefb4a92a 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/libquicktime
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.63 2006/10/14 23:54:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.64 2006/10/15 09:06:07 aballier Exp $
+
+ 15 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+ files/libquicktime-new-x264.patch, libquicktime-0.9.9-r1.ebuild:
+ Updating dependencies since it will not build with older x264-svn versions
+ and minor change to the patch
14 Oct 2006; Alexis Ballier <aballier@gentoo.org>
files/libquicktime-new-x264.patch:
diff --git a/media-libs/libquicktime/files/libquicktime-new-x264.patch b/media-libs/libquicktime/files/libquicktime-new-x264.patch
index 850e30931e3c..9d3bd43fdcb4 100644
--- a/media-libs/libquicktime/files/libquicktime-new-x264.patch
+++ b/media-libs/libquicktime/files/libquicktime-new-x264.patch
@@ -59,7 +59,7 @@ diff -u -B -r libquicktime-0.9.9/plugins/x264/x264.c libquicktime-0.9.9_new/plug
fprintf(stderr, " b_cbr: %d\n", params->rc.b_cbr);
fprintf(stderr, " i_bitrate: %d\n", params->rc.i_bitrate);
- fprintf(stderr, " i_rf_constant: %d\n", params->rc.i_rf_constant);
-+ fprintf(stderr, " f_rf_constant: %d\n", params->rc.f_rf_constant);
++ fprintf(stderr, " f_rf_constant: %f\n", params->rc.f_rf_constant);
fprintf(stderr, " f_rate_tolerance: %f\n", params->rc.f_rate_tolerance);
fprintf(stderr, " i_vbv_max_bitrate: %d\n", params->rc.i_vbv_max_bitrate);
fprintf(stderr, " i_vbv_buffer_size: %d\n", params->rc.i_vbv_buffer_size);
diff --git a/media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild b/media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild
index a910bdd293f5..55030b42e4a3 100644
--- a/media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild,v 1.1 2006/08/20 16:40:10 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.9-r1.ebuild,v 1.2 2006/10/15 09:06:07 aballier Exp $
inherit libtool eutils autotools
@@ -20,7 +20,7 @@ DEPEND="media-libs/libdv
media-libs/jpeg
media-libs/libvorbis
media-libs/libogg
- media-libs/x264-svn
+ >=media-libs/x264-svn-20061014
X? ( || ( ( x11-libs/libXaw
x11-libs/libXv
x11-proto/xextproto