Version bump, fixes bug #93761

(Portage version: 2.0.51.22-r1)

5 files changed, 129 insertions, 16 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 1262c80478c2..f40f955f2112 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.37 2005/05/08 11:32:13 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.38 2005/05/24 20:13:01 zypher Exp $
+
+*libquicktime-0.9.6 (21 May 2005)
+
+  24 May 2005; Marc Hildebrand <zypher@gentoo.org>
+  +files/libquicktime-0.9.6-cflags.patch, +libquicktime-0.9.6.ebuild:
+  version bump, fixes #93761.
 
   08 May 2005; Bryan Østergaard <kloeri@gentoo.org>
   libquicktime-0.9.4.ebuild:
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index adaa722df693..2ed8c2036ce7 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a60c1726ee674c1e03f9428cd54d341f libquicktime-0.9.4.ebuild 1449
-MD5 34411b50fc69d3d36604d87d85312a61 ChangeLog 5486
-MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 04c6e7d4ccb20b4bd86e3f5052a2a115 libquicktime-0.9.2.ebuild 1575
 MD5 b4c78b88026393e1b3e1fefb26137865 libquicktime-0.9.3-r1.ebuild 1547
-MD5 a1721b9ba48b6453245fce4f3fe04e0b files/libquicktime-0.9.4-cflags.patch 1455
+MD5 1dd6adf974c8b18a135289aad59a10ef ChangeLog 5673
+MD5 a2e785ee3519a21f577a619ae9efd25a libquicktime-0.9.6.ebuild 1321
+MD5 a60c1726ee674c1e03f9428cd54d341f libquicktime-0.9.4.ebuild 1449
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+MD5 c0abede6c55083f821fd971de2a17ef1 files/digest-libquicktime-0.9.6 70
+MD5 7431f4892f67adb233bef504876078db files/libquicktime-0.9.2-amd64.patch 2861
 MD5 abf06ed2bfc6e4b130b44e3818ec0c99 files/digest-libquicktime-0.9.2 70
+MD5 a1721b9ba48b6453245fce4f3fe04e0b files/libquicktime-0.9.4-cflags.patch 1455
+MD5 d8c28d6e35d353035732b91b0ab95234 files/libquicktime-0.9.6-cflags.patch 1806
 MD5 6bfb85c4c74898adf195a803d4715b03 files/digest-libquicktime-0.9.4 70
 MD5 2945e87a4f7f7263e45ea3c392895011 files/digest-libquicktime-0.9.3-r1 70
-MD5 7431f4892f67adb233bef504876078db files/libquicktime-0.9.2-amd64.patch 2861
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCffkIKf2g/qXtneoRApajAKCFRC2LhEzvfsipsV33Rqe4C/t6wwCeLlyn
-EyDbVEt0o807iuJbyqFgLSc=
-=hHC7
------END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.6 b/media-libs/libquicktime/files/digest-libquicktime-0.9.6
new file mode 100644
index 000000000000..cbe8337344e8
--- /dev/null
+++ b/media-libs/libquicktime/files/digest-libquicktime-0.9.6
@@ -0,0 +1 @@
+MD5 4b4f09437c3695a3174745bfe68800d9 libquicktime-0.9.6.tar.gz 766605
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.6-cflags.patch b/media-libs/libquicktime/files/libquicktime-0.9.6-cflags.patch
new file mode 100644
index 000000000000..047f5f96cd8b
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-0.9.6-cflags.patch
@@ -0,0 +1,52 @@
+diff -aur work2/libquicktime-0.9.6/configure.ac work1/libquicktime-0.9.6/configure.ac
+--- work2/libquicktime-0.9.6/configure.ac	2005-05-21 00:23:38.000000000 +0200
++++ work1/libquicktime-0.9.6/configure.ac	2005-05-24 18:50:23.510715056 +0200
+@@ -32,7 +32,6 @@
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
+-AC_PROG_CC
+ AC_LANG_C
+ 
+ AC_C_BIGENDIAN
+@@ -613,25 +612,6 @@
+ AC_DEFINE_UNQUOTED(PLUGIN_DIR, ["$plugin_dir"])
+ AC_SUBST(PLUGIN_DIR)
+ 
+-dnl Build CFLAGS
+-
+-COMMON_CFLAGS=" -finline-functions -Wall -Winline"
+-PROFILE_CFLAGS=" -pg -fprofile-arcs -ftest-coverage"
+-DEBUG_CFLAGS=" -g3"
+-
+-dnl Optimizing flags
+-
+-OPTIMIZE_CFLAGS="-O3"
+-
+-AC_TRY_CFLAGS([-funroll-all-loops],   [OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -funroll-all-loops"])
+-AC_TRY_CFLAGS([-fomit-frame-pointer], [OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -fomit-frame-pointer"])
+-AC_TRY_CFLAGS([-falign-loops=2],      [OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -falign-loops=2"])
+-AC_TRY_CFLAGS([-falign-jumps=2],      [OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -falign-jumps=2"])
+-AC_TRY_CFLAGS([-falign-functions=2],  [OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -falign-functions=2"])
+-
+-# -Wno-unused-variable -Wno-unused-parameter
+-# -std=gnu99 
+-
+ have_debug=false
+ have_profile=false
+ compile_mode="optimize"
+@@ -664,11 +644,13 @@
+ fi
+ 
+ case $compile_mode in
+-"optimize") CFLAGS="$OPTIMIZE_CFLAGS $COMMON_CFLAGS"; AC_DEFINE(NDEBUG);;
++"optimize") CFLAGS="$CFLAGS"; AC_DEFINE(NDEBUG);;
+ "debug") CFLAGS="$DEBUG_CFLAGS $COMMON_CFLAGS" ;;
+ "profile") CFLAGS="$PROFILE_CFLAGS $COMMON_CFLAGS"; AC_DEFINE(NDEBUG);;
+ esac
+ 
++AC_PROG_CC
++
+ # -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
+ # MODULE_LIBADD="-L$prefix/lib ../../src/libquicktime.la"
diff --git a/media-libs/libquicktime/libquicktime-0.9.6.ebuild b/media-libs/libquicktime/libquicktime-0.9.6.ebuild
new file mode 100644
index 000000000000..821d9438a7ea
--- /dev/null
+++ b/media-libs/libquicktime/libquicktime-0.9.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.6.ebuild,v 1.1 2005/05/24 20:13:01 zypher Exp $
+
+inherit libtool eutils
+
+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="~amd64 ~ppc ~x86"
+
+IUSE="gtk jpeg mmx oggvorbis png dv ieee1394"
+
+DEPEND=">=sys-apps/sed-4.0.5
+	dv? ( media-libs/libdv )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	oggvorbis? ( media-libs/libvorbis )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	!virtual/quicktime"
+PROVIDE="virtual/quicktime"
+
+pkg_setup() {
+	if has_version xorg-x11 && ! built_with_use xorg-x11 opengl; then
+		die "You need xv support to compile ${PN}."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cflags.patch
+	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
+	ebegin "Regenerating configure script..."
+	autoconf || die
+	eend
+
+	elibtoolize
+}
+
+src_compile() {
+	econf --enable-shared \
+	      --enable-static \
+	      $(use_enable mmx) \
+	      $(use_enable gtk) \
+	      $(use_enable ieee1394 firewire)
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+}