fix stupid upstream configure, enable-encode disables encoder. Thanks bilboed for the patch, also been committed upstream in cvs

Package-Manager: portage-2.0.51.19

5 files changed, 91 insertions, 4 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index 0d1c6e83ed55..d425dfa7cbf5 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.32 2005/06/17 20:30:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.33 2005/06/23 10:52:35 zaheerm Exp $
+
+*libtheora-1.0_alpha4-r1 (23 Jun 2005)
+
+  23 Jun 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/libtheora-1.0_alpha4-enable-flags.patch,
+  +libtheora-1.0_alpha4-r1.ebuild:
+  fix stupid upstream configure, enable-encode disables encoder. Thanks bilboed
+  for the patch, also been committed upstream in cvs
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   libtheora-1.0_alpha4.ebuild:
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index bc1224256963..4fea052bd516 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,6 +1,9 @@
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 64bcf655928f0050cefc9b12202571db ChangeLog 3959
+MD5 7ecf3f5d542322ef4206b769efdde62b libtheora-1.0_alpha4-r1.ebuild 1325
 MD5 3e1778b3b0d326367db4091e9c761580 libtheora-1.0_alpha4.ebuild 1170
 MD5 5cd390daa69c4b3a98e62c4d7e975e71 libtheora-1.0_alpha3.ebuild 920
-MD5 f828864823910f80ec4368be981c0a61 files/digest-libtheora-1.0_alpha4 73
+MD5 6b65eaab42c2a8d4ccf3cf06970e4a11 ChangeLog 4275
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 e0d4279bd99d241bd9414fcab198c847 files/libtheora-1.0_alpha4-enable-flags.patch 876
+MD5 f828864823910f80ec4368be981c0a61 files/digest-libtheora-1.0_alpha4-r1 73
 MD5 a9f9ea68a0659a1bd63f423e5028d5bf files/digest-libtheora-1.0_alpha3 72
+MD5 f828864823910f80ec4368be981c0a61 files/digest-libtheora-1.0_alpha4 73
diff --git a/media-libs/libtheora/files/digest-libtheora-1.0_alpha4-r1 b/media-libs/libtheora/files/digest-libtheora-1.0_alpha4-r1
new file mode 100644
index 000000000000..c6071d3bcdce
--- /dev/null
+++ b/media-libs/libtheora/files/digest-libtheora-1.0_alpha4-r1
@@ -0,0 +1 @@
+MD5 a71ac42ec0f848da327930841a80ff2b libtheora-1.0alpha4.tar.bz2 1755132
diff --git a/media-libs/libtheora/files/libtheora-1.0_alpha4-enable-flags.patch b/media-libs/libtheora/files/libtheora-1.0_alpha4-enable-flags.patch
new file mode 100644
index 000000000000..6a909ee48b64
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.0_alpha4-enable-flags.patch
@@ -0,0 +1,20 @@
+--- libtheora-1.0alpha4/configure.ac	2004-12-15 21:06:04.000000000 +0100
++++ libtheora-1.0alpha4-works/configure.ac	2005-06-22 16:23:12.000000000 +0200
+@@ -83,7 +83,7 @@
+ ac_enable_float=yes
+ AC_ARG_ENABLE(float,
+      [  --disable-float         disable use of floating point code ],
+-     [ ac_enable_float=no ], [ ac_enable_float=yes] )
++     [ ac_enable_float=$enableval ], [ ac_enable_float=yes] )
+ 
+ if test "x${ac_enable_float}" = xyes ; then
+     AC_DEFINE(THEORA_SUPPORT_FLOAT, [1], [Build floating point code])
+@@ -97,7 +97,7 @@
+ ac_enable_encode=yes
+ AC_ARG_ENABLE(encode,
+      [  --disable-encode        disable encoding support ],
+-     [ ac_enable_encode=no ], [ ac_enable_encode=yes] )
++     [ ac_enable_encode=$enableval ], [ ac_enable_encode=yes] )
+ 
+ if test "x${ac_enable_encode}" = xyes ; then
+     BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES encoder_example"
diff --git a/media-libs/libtheora/libtheora-1.0_alpha4-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha4-r1.ebuild
new file mode 100644
index 000000000000..52387c5e9400
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.0_alpha4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha4-r1.ebuild,v 1.1 2005/06/23 10:52:35 zaheerm Exp $
+inherit flag-o-matic
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="http://www.theora.org/"
+SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
+
+LICENSE="xiph"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="encode doc"
+
+RDEPEND=">=media-libs/libogg-1.1.0
+	>=media-libs/libvorbis-1.0.1"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:SUBDIRS = .*:SUBDIRS = lib include doc:' Makefile.in
+	# fix stupid --enable flags
+	cd ${S}
+	epatch ${FILESDIR}/${P}-enable-flags.patch
+	# only here to fix stupid --enable flags
+	autoconf || die
+
+}
+
+src_compile() {
+
+	# bug #75403, -O3 needs to be filtered to -O2
+	replace-flags -O3 -O2
+
+	use doc ||
+		export ac_cv_prog_HAVE_DOXYGEN="false"
+
+	econf \
+		$(use_enable encode) \
+		--enable-shared --disable-dependency-tracking || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		docdir=usr/share/doc/${PF} \
+		install || die "make install failed"
+
+	dodoc README
+}