Version bump

Package-Manager: portage-2.1.2.4

5 files changed, 193 insertions, 5 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 90f82101ed50..3cc6bcbbe3ec 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.84 2007/03/27 15:02:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.85 2007/04/17 23:48:11 aballier Exp $
+
+*libquicktime-1.0.0 (17 Apr 2007)
+
+  17 Apr 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/libquicktime-1.0.0-cflags.patch, +libquicktime-1.0.0.ebuild:
+  Version bump
 
   27 Mar 2007; Raúl Porcel <armin76@gentoo.org> libquicktime-0.9.10.ebuild:
   ia64 stable wrt bug 157814
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 1b0d7de9ae41..ef5dab914f2e 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libquicktime-0.9.10-automagic-deps.patch 5207 RMD160 d6566e2c4f7d09269c9b5bb0c3ff67e4b288b75b SHA1 5d1422fb8021ca5471f33268ce2a63367d6655aa SHA256 eefc3e687819acb10d93b96e50cdef686da867bc051efcb8db58ba20d3f3f83f
 MD5 26ec6a0a898ea90948f439295668d98f files/libquicktime-0.9.10-automagic-deps.patch 5207
 RMD160 d6566e2c4f7d09269c9b5bb0c3ff67e4b288b75b files/libquicktime-0.9.10-automagic-deps.patch 5207
@@ -30,6 +33,10 @@ AUX libquicktime-0.9.7-unrice.patch 871 RMD160 00db7ed14972216f37b79903120539cff
 MD5 bafb8667d95f5399ac28bdb66161035d files/libquicktime-0.9.7-unrice.patch 871
 RMD160 00db7ed14972216f37b79903120539cff7d69c10 files/libquicktime-0.9.7-unrice.patch 871
 SHA256 d21e8f756f2c4f6465b63923594b26ae88ee167600bcb7fe01fddb005bb1457a files/libquicktime-0.9.7-unrice.patch 871
+AUX libquicktime-1.0.0-cflags.patch 1239 RMD160 b477afe40fa3c08c7fd5585d5477a44a4e1364ba SHA1 9f513ac702c3017068238a8149813be12f63214d SHA256 5d0a92ecde5f25da1ff2241f82385d39c39046e5f8da493e90b456332f49b59f
+MD5 432876db65580cf4bc89a7d9ac8fe8f5 files/libquicktime-1.0.0-cflags.patch 1239
+RMD160 b477afe40fa3c08c7fd5585d5477a44a4e1364ba files/libquicktime-1.0.0-cflags.patch 1239
+SHA256 5d0a92ecde5f25da1ff2241f82385d39c39046e5f8da493e90b456332f49b59f files/libquicktime-1.0.0-cflags.patch 1239
 AUX libquicktime-new-x264.patch 5981 RMD160 8a8f19652b3b42311d5ff2e041431f0198ba3f16 SHA1 dcfbb12b776c64858d49bf981cd1b3d14d1132a0 SHA256 44904bdd0649df3edfc58f2cd9cc44365334e2eca810271250f45c9c216be875
 MD5 9c6197b29394d3c74ad9f75306b8668c files/libquicktime-new-x264.patch 5981
 RMD160 8a8f19652b3b42311d5ff2e041431f0198ba3f16 files/libquicktime-new-x264.patch 5981
@@ -39,6 +46,7 @@ DIST libquicktime-0.9.2.tar.gz 666586 RMD160 d0a4e3856f3617ec5473d2e03d39836df73
 DIST libquicktime-0.9.4.tar.gz 782651 RMD160 93a8098770a860cba31d71f876b782c2a7b00fdf SHA1 8835cd89434f4d7da540ca50e629d18cc7d5c24b SHA256 344e9308cb6655cb6d3a8eba0abd824a8c157943739b18762aee64c0d50cb8aa
 DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e
 DIST libquicktime-0.9.9.tar.gz 926280 RMD160 c345f54d949f29a9f5be42ca5fbdc80be781a3d4 SHA1 6221879c61bda6a695ffbc46c85e39db1b3ded65 SHA256 b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da
+DIST libquicktime-1.0.0.tar.gz 998950 RMD160 8f3b2dd22bdff8bc09d33b84164a684581ee8ece SHA1 e76a93ac14e8dfb5ff499301c7c67a99b0c72f79 SHA256 60c478fd81450e18a1fcf1bcee672d5cd04c4ca5871ffb709ef6a635111141a4
 DIST libquicktime-m4-1.tar.bz2 3622 RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd SHA1 1ca6cf448f497fc23c82cb5ece7b1acc839d35c7 SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137
 EBUILD libquicktime-0.9.10.ebuild 3222 RMD160 fb89da4710614e3b45ef2f2fa4200c84be031c6a SHA1 2a9d1f3311b192e23f4bbfbbdd1ec773c3b5458a SHA256 68f111a9938e41e6ff64ce0d7cc468e79edab6de5e79f2b10982e1694f91bcdc
 MD5 a4c2cab58810855613f275ad3f939410 libquicktime-0.9.10.ebuild 3222
@@ -64,10 +72,14 @@ EBUILD libquicktime-0.9.9.ebuild 2110 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2a
 MD5 3b460eb1e8ae72fb1e5f516fffe4d478 libquicktime-0.9.9.ebuild 2110
 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2ad32da libquicktime-0.9.9.ebuild 2110
 SHA256 293e07ef09deacee6aa9f6d7fc237ab879bf11ec0c65ad5fbf7d83f1831778fc libquicktime-0.9.9.ebuild 2110
-MISC ChangeLog 13113 RMD160 db45c4624056a3c2484c9de7fa4017dc5af0790d SHA1 9020d92d6071845c71a5b4c91353276c2b8ea2a4 SHA256 854fbabcb73fd61c2001db242166b39361cbe87e20a329b728566e466209bb0c
-MD5 a02ee3d52e876f75962ac627094f47bd ChangeLog 13113
-RMD160 db45c4624056a3c2484c9de7fa4017dc5af0790d ChangeLog 13113
-SHA256 854fbabcb73fd61c2001db242166b39361cbe87e20a329b728566e466209bb0c ChangeLog 13113
+EBUILD libquicktime-1.0.0.ebuild 3051 RMD160 afa85464f8eaf8380a2629ddfe3d0369881b8eed SHA1 6bf825964fa73704999dd7ad8eacf82bd57a19bb SHA256 4f505f45d00ea4e8d9e4682b0a9f674af52924f1a6d485d514c4b14f17b29cb1
+MD5 31e4c7dc48ef6ccf281d7432e6f05041 libquicktime-1.0.0.ebuild 3051
+RMD160 afa85464f8eaf8380a2629ddfe3d0369881b8eed libquicktime-1.0.0.ebuild 3051
+SHA256 4f505f45d00ea4e8d9e4682b0a9f674af52924f1a6d485d514c4b14f17b29cb1 libquicktime-1.0.0.ebuild 3051
+MISC ChangeLog 13287 RMD160 c4841fbd501ef8d6d8730d35c3b4cbaec9741e48 SHA1 77a459528c1d996d02961106c81b30fb77f6d5a7 SHA256 39def0b75cc82fc39c7000fbf1b035c31021d68dd6a14a120124458b12b96670
+MD5 e3e883e316b31bbe7f957786bb382486 ChangeLog 13287
+RMD160 c4841fbd501ef8d6d8730d35c3b4cbaec9741e48 ChangeLog 13287
+SHA256 39def0b75cc82fc39c7000fbf1b035c31021d68dd6a14a120124458b12b96670 ChangeLog 13287
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -90,3 +102,13 @@ SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/di
 MD5 724a301e45d8d08f65e454647ead84ae files/digest-libquicktime-0.9.9-r1 256
 RMD160 a564e03f1dcb0cb4bb3352579c12b96a3eee61d5 files/digest-libquicktime-0.9.9-r1 256
 SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/digest-libquicktime-0.9.9-r1 256
+MD5 a58ae1d3e5915dc65ca78b1f7914470d files/digest-libquicktime-1.0.0 256
+RMD160 fb818d1b402453008fad743728d9544b0f71be15 files/digest-libquicktime-1.0.0 256
+SHA256 8eb2659e3a80ba85ad86c26085fbb8f6a640258980249279c99a2ee341443a17 files/digest-libquicktime-1.0.0 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGJVysvFcC4BYPU0oRAvoHAKDL+TYZPDzZlbyfT6tZ4o2f8x2LWwCfZ3nZ
+QwRLOfNbhUssfnCgRou/4JY=
+=9148
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/digest-libquicktime-1.0.0 b/media-libs/libquicktime/files/digest-libquicktime-1.0.0
new file mode 100644
index 000000000000..1d05aa0bc046
--- /dev/null
+++ b/media-libs/libquicktime/files/digest-libquicktime-1.0.0
@@ -0,0 +1,3 @@
+MD5 2f609e3ef5e760f44022f6c4b66d6a01 libquicktime-1.0.0.tar.gz 998950
+RMD160 8f3b2dd22bdff8bc09d33b84164a684581ee8ece libquicktime-1.0.0.tar.gz 998950
+SHA256 60c478fd81450e18a1fcf1bcee672d5cd04c4ca5871ffb709ef6a635111141a4 libquicktime-1.0.0.tar.gz 998950
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.0-cflags.patch b/media-libs/libquicktime/files/libquicktime-1.0.0-cflags.patch
new file mode 100644
index 000000000000..03da11e82be7
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.0.0-cflags.patch
@@ -0,0 +1,40 @@
+Index: libquicktime-1.0.0/configure.ac
+===================================================================
+--- libquicktime-1.0.0.orig/configure.ac
++++ libquicktime-1.0.0/configure.ac
+@@ -7,6 +7,8 @@ LQT_VERSION_MAJOR=`echo $VERSION | cut -
+ LQT_VERSION_MINOR=`echo $VERSION | cut -d . -f 2`
+ LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1`
+ 
++USER_CFLAGS=$CFLAGS
++
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_CANONICAL_HOST
+@@ -693,10 +695,15 @@ for i in $lqt_test_cflags; do
+   LQT_TRY_CFLAGS($i, COMMON_CFLAGS="$COMMON_CFLAGS $i") ;
+ done
+ 
++if test "x${USER_CFLAGS}" = "x"; then
++
++  dnl Optimizing flags
+ 
+-dnl Optimizing flags
++  LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
+ 
+-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
++  CFLAGS="$OPT_CFLAGS"
++
++fi
+ 
+ AH_TEMPLATE([NDEBUG],
+             [Causes debug code to e removed])
+@@ -705,7 +712,7 @@ if test x$LQT_DEBUG != xtrue; then
+ AC_DEFINE(NDEBUG)
+ fi
+ 
+-CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
++CFLAGS="$CFLAGS $COMMON_CFLAGS"
+ 
+ # -L is required so that linker can find libquicktime when DESTDIR is used.
+ # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404
diff --git a/media-libs/libquicktime/libquicktime-1.0.0.ebuild b/media-libs/libquicktime/libquicktime-1.0.0.ebuild
new file mode 100644
index 000000000000..3f941a09f791
--- /dev/null
+++ b/media-libs/libquicktime/libquicktime-1.0.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.0.ebuild,v 1.1 2007/04/17 23:48:11 aballier Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+inherit libtool eutils autotools
+
+DESCRIPTION="A library based on quicktime4linux with extensions"
+HOMEPAGE="http://libquicktime.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg"
+
+RDEPEND="dv? ( media-libs/libdv )
+	gtk? ( >=x11-libs/gtk+-2.4.0 )
+	aac? (
+		media-libs/faad2
+		encode? ( media-libs/faac )
+	)
+	alsa? ( media-libs/alsa-lib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	lame? ( media-sound/lame )
+	ffmpeg? ( media-video/ffmpeg )
+	x264? ( >=media-libs/x264-svn-20060810 )
+	X? ( x11-libs/libXaw
+		x11-libs/libXv
+		x11-libs/libXext
+		x11-libs/libX11
+		opengl? ( media-libs/mesa )
+	)
+	!virtual/quicktime"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/videoproto
+		x11-proto/xextproto
+	)
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/quicktime"
+
+pkg_setup() {
+	if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then
+		die "You need xv support to compile ${PN}."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-cflags.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	local MY_OPTS=""
+	if use !encode || use !aac; then
+		MY_OPTS="--without-faac"
+	fi
+
+	econf --enable-shared \
+		--enable-static \
+		--enable-gpl \
+		$(use_enable mmx) \
+		$(use_with X x) \
+		$(use_with gtk) \
+		$(use_with dv libdv) \
+		$(use_with alsa) \
+		$(use_with aac faad2) \
+		$(use_with png libpng) \
+		$(use_with jpeg libjpeg) \
+		$(use vorbis || echo "--without-vorbis") \
+		$(use_with lame) \
+		$(use_with x264) \
+		$(use_with ffmpeg) \
+		$(use_with opengl) \
+		${MY_OPTS} \
+		--without-cpuflags || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Compatibility with software that uses quicktime prefix, but
+	# don't do that when building for Darwin/MacOS
+	[[ ${CHOST} != *-darwin* ]] && \
+	dosym /usr/include/lqt /usr/include/quicktime
+}
+
+pkg_preinst() {
+	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
+		einfo "For compatibility with other quicktime libraries, ${PN} was"
+		einfo "going to create a /usr/include/quicktime symlink, but for some"
+		einfo "reason that is a directory on your system."
+
+		if $(has_version =media-libs/libquicktime-0.9.4); then
+			einfo "It seems this directory belongs to libquicktime-0.9.4."
+			einfo "We'll delete that directory now."
+			rm -rvf /usr/include/quicktime
+		else
+			einfo "Please check that is empty, and remove it, or submit a bug"
+			einfo "telling us which package owns the directory."
+			die "/usr/include/quicktime is a directory."
+		fi
+	fi
+}
+