Fix properly

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

6 files changed, 76 insertions, 94 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index 8fbfe9eaabbd..6e74bccd67f6 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.95 2009/08/27 16:49:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.96 2009/08/29 13:23:22 ssuominen Exp $
 
-  27 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  29 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   libtheora-1.1_beta3.ebuild,
-  +files/libtheora-1.1_beta3-theora_disable_encode.patch:
+  +files/libtheora-1.1_beta3-encoder_disabled.c:
   Fix building with USE="-encode".
 
 *libtheora-1.1_beta3 (27 Aug 2009)
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 6b70d3c26129..714d44791237 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,10 +1,8 @@
 AUX libtheora-1.0_beta2-flags.patch 763 RMD160 eb1d55ab98e5eae570845baf17eb93301271596c SHA1 b79a4338454e832d2b46df55bae1de967919eb24 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6
-AUX libtheora-1.1_beta3-theora_disable_encode.patch 493 RMD160 d4128e2c428e89399b62de93f9148861f29eb6ab SHA1 83fa2de72973834acd074e746bbde0759a4da3b3 SHA256 fae57503433e564c5ac05d11f0eb8b4e93ecccdb1aba03dc239d97f7d233420f
+AUX libtheora-1.1_beta3-encoder_disabled.c 2026 RMD160 72faa797c0dd7f8fe9a25031883da58a63e02aaf SHA1 58a47cd01aec7edf49070fd8bd69a88b568c3b1c SHA256 085a427ebd2102e7d8f743f2c672b57c5cb153dd4e73cbb86cdb801494e4cdc7
 DIST libtheora-1.0.tar.bz2 1652987 RMD160 f72d0a2ce8475a888ab67fd77b7126d66d537c9b SHA1 02717773001b44f95bc6c23111a89493a4a93f87 SHA256 3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
-DIST libtheora-1.1alpha2.tar.bz2 1594659 RMD160 77cac673ecb5c603488c2e9c1437e185deee1379 SHA1 864872064ea32829f4aff48518248a8e46b16f00 SHA256 79f10524fbd7bde6b6e5cdf77e48c7555cfdc12a72f59d4cab083e290c89d591
 DIST libtheora-1.1beta3.tar.bz2 1785382 RMD160 a51b6b5cdafe1130ee6439cea8e892f37a10b507 SHA1 abca97e4bd2caad896e1c2c1359626a9033da8b0 SHA256 d873f4c0181fa75b5e3cf069433740b2777810c2fd58055d4e62aaac0c239d5e
 EBUILD libtheora-1.0.ebuild 1537 RMD160 d076ef008dc78358de093ce4f3babf4c18c36725 SHA1 cc08144d9dc1132fd047374f3749b1063eed7da9 SHA256 a91dd0be04c5ab85238518281a3b28c0c581fc1b97c504699690e6e8919e4094
-EBUILD libtheora-1.1_alpha2.ebuild 1762 RMD160 39aa0023fc18663e1be71b61b0c9fa7274c403a1 SHA1 d0f90639157c52c34ac6e0ee14764ac4fdf40936 SHA256 60459fc8469a7f4660a8ef1c02718c654f8bdb829d30ea7526167e98c7ad324b
-EBUILD libtheora-1.1_beta3.ebuild 1812 RMD160 770ebf7a9c8bad113fe8f9338a832122d7929ef8 SHA1 6e2c65f9d44c6bd7d8b56ca88ea33d838d2e72b2 SHA256 b1e9233f4e72fd78c65d6ff46b1f4f6b8fc4feea1dc621f1e512d08f10a8fa06
-MISC ChangeLog 13701 RMD160 293d61c98148dfd3abbb00c15f0358593680d883 SHA1 4013e18f20d5c6104d42d1eb23de0cd18f5ec333 SHA256 18dc4ce827d56be22d772e22c77c84bc93dfd6be9f888ecb6da9df27448dd86c
+EBUILD libtheora-1.1_beta3.ebuild 1836 RMD160 17dc42eb5135d5a8ca31b6dd43bc71d1d526a763 SHA1 4d58e86b98e3b99dace3a7863eb6996a9edbb7eb SHA256 59c04e3217088d3389f8921241a7bc624243bad60ee0cbb8f598789e3a52b789
+MISC ChangeLog 13692 RMD160 ba7acb28d13a093cb63bb6e6a2236e338d7da077 SHA1 f2a0492737880e1e10a9d955c8fabfad2a5dae4f SHA256 9c30a0497631fff69c6a4b886d6214d22780ea369331ac23b8c52acbf99de775
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-libs/libtheora/files/libtheora-1.1_beta3-encoder_disabled.c b/media-libs/libtheora/files/libtheora-1.1_beta3-encoder_disabled.c
new file mode 100644
index 000000000000..547d1e47884c
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.1_beta3-encoder_disabled.c
@@ -0,0 +1,67 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009                *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+  function:
+  last mod: $Id: libtheora-1.1_beta3-encoder_disabled.c,v 1.1 2009/08/29 13:23:23 ssuominen Exp $
+
+ ********************************************************************/
+#include "apiwrapper.h"
+#include "encint.h"
+
+th_enc_ctx *th_encode_alloc(const th_info *_info){
+  return NULL;
+}
+
+void th_encode_free(th_enc_ctx *_enc){}
+
+
+int th_encode_ctl(th_enc_ctx *_enc,int _req,void *_buf,size_t _buf_sz){
+  return OC_DISABLED;
+}
+
+int th_encode_flushheader(th_enc_ctx *_enc,th_comment *_tc,ogg_packet *_op){
+  return OC_DISABLED;
+}
+
+int th_encode_ycbcr_in(th_enc_ctx *_enc,th_ycbcr_buffer _img){
+  return OC_DISABLED;
+}
+
+int th_encode_packetout(th_enc_ctx *_enc,int _last_p,ogg_packet *_op){
+  return OC_DISABLED;
+}
+
+
+
+int theora_encode_init(theora_state *_te,theora_info *_ci){
+  return OC_DISABLED;
+}
+
+int theora_encode_YUVin(theora_state *_te,yuv_buffer *_yuv){
+  return OC_DISABLED;
+}
+
+int theora_encode_packetout(theora_state *_te,int _last_p,ogg_packet *_op){
+  return OC_DISABLED;
+}
+
+int theora_encode_header(theora_state *_te,ogg_packet *_op){
+  return OC_DISABLED;
+}
+
+int theora_encode_comment(theora_comment *_tc,ogg_packet *_op){
+  return OC_DISABLED;
+}
+
+int theora_encode_tables(theora_state *_te,ogg_packet *_op){
+  return OC_DISABLED;
+}
diff --git a/media-libs/libtheora/files/libtheora-1.1_beta3-theora_disable_encode.patch b/media-libs/libtheora/files/libtheora-1.1_beta3-theora_disable_encode.patch
deleted file mode 100644
index 310e572bd4f8..000000000000
--- a/media-libs/libtheora/files/libtheora-1.1_beta3-theora_disable_encode.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur libtheora-1.1beta3.orig/lib/Makefile.am libtheora-1.1beta3/lib/Makefile.am
---- libtheora-1.1beta3.orig/lib/Makefile.am	2009-08-06 04:43:12.000000000 +0300
-+++ libtheora-1.1beta3/lib/Makefile.am	2009-08-27 19:51:51.000000000 +0300
-@@ -17,7 +17,11 @@
- 	x86/x86state.c \
- 	x86_vc
- 
-+if THEORA_DISABLE_ENCODE
-+lib_LTLIBRARIES = libtheoradec.la libtheora.la
-+else
- lib_LTLIBRARIES = libtheoradec.la libtheoraenc.la libtheora.la
-+endif
- 
- if THEORA_DISABLE_ENCODE
- encoder_uniq_sources = \
diff --git a/media-libs/libtheora/libtheora-1.1_alpha2.ebuild b/media-libs/libtheora/libtheora-1.1_alpha2.ebuild
deleted file mode 100644
index 508f70c75c34..000000000000
--- a/media-libs/libtheora/libtheora-1.1_alpha2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1_alpha2.ebuild,v 1.2 2009/06/21 03:37:29 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils 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="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc encode examples"
-
-RDEPEND="media-libs/libogg
-	encode? ( media-libs/libvorbis )
-	examples? ( media-libs/libpng
-		media-libs/libvorbis
-		media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-VARTEXFONTS=${T}/fonts
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	use x86 && filter-flags -fforce-addr -frename-registers #200549
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	local myconf
-	use examples && myconf="--enable-encode"
-
-	# --disable-spec because LaTeX documentation has been prebuilt
-	econf \
-		--disable-dependency-tracking \
-		--disable-spec \
-		$(use_enable encode) \
-		$(use_enable examples) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} \
-		install || die "emake install failed"
-
-	dodoc AUTHORS CHANGES README
-	prepalldocs
-
-	if use examples; then
-		if use doc; then
-			insinto /usr/share/doc/${PF}/examples
-			doins examples/*.[ch]
-		fi
-
-		dobin examples/.libs/png2theora || die "dobin failed"
-		for bin in dump_{psnr,video} {encoder,player}_example; do
-			newbin examples/.libs/${bin} theora_${bin} || die "newbin failed"
-		done
-	fi
-}
diff --git a/media-libs/libtheora/libtheora-1.1_beta3.ebuild b/media-libs/libtheora/libtheora-1.1_beta3.ebuild
index 8147c0ce425c..8ac323722cec 100644
--- a/media-libs/libtheora/libtheora-1.1_beta3.ebuild
+++ b/media-libs/libtheora/libtheora-1.1_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1_beta3.ebuild,v 1.2 2009/08/27 16:49:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1_beta3.ebuild,v 1.3 2009/08/29 13:23:22 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic
@@ -27,8 +27,8 @@ VARTEXFONTS=${T}/fonts
 S=${WORKDIR}/${P/_}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch \
-		"${FILESDIR}"/${P}-theora_disable_encode.patch
+	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
+	cp -f "${FILESDIR}"/${P}-encoder_disabled.c "${S}"/lib/encoder_disabled.c
 	AT_M4DIR="m4" eautoreconf
 }