Fix building with USE="-encode".

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

4 files changed, 27 insertions, 5 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index dfcd5e5c22b8..8fbfe9eaabbd 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2009/08/27 09:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.95 2009/08/27 16:49:13 ssuominen Exp $
+
+  27 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  libtheora-1.1_beta3.ebuild,
+  +files/libtheora-1.1_beta3-theora_disable_encode.patch:
+  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 978113e31dba..143b44f2b0b0 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,9 +1,10 @@
 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 8fb48d09b6283d766a09b0a1bc15744eb740e695 SHA1 dd66623c50d53b54ab77587f25753df589b95590 SHA256 f5c28edf834232c362b0b18172cf3fe355875ad1e10d31fc0c974e60355a8c4b
 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 1761 RMD160 af2330dcd3978e5be4dd2575a928f053e0cb8a87 SHA1 4355b82b8a5f1f14c512d67a09d077454538fca2 SHA256 fdcdc92029be834f0f87bb5b1f75968dff94bf46bb6eda6c3f3f6cba7d36af71
-MISC ChangeLog 13523 RMD160 036a43f2daeacb22018b37b50ebe96cd34330bc9 SHA1 ebd0e2a5969f2b1596942a29cee55b7c26ef9401 SHA256 f2adfd40f6f96c420db4e3564e8893166cd566fad522a9cf7d7aebe1f877b542
+EBUILD libtheora-1.1_beta3.ebuild 1812 RMD160 770ebf7a9c8bad113fe8f9338a832122d7929ef8 SHA1 6e2c65f9d44c6bd7d8b56ca88ea33d838d2e72b2 SHA256 b1e9233f4e72fd78c65d6ff46b1f4f6b8fc4feea1dc621f1e512d08f10a8fa06
+MISC ChangeLog 13701 RMD160 293d61c98148dfd3abbb00c15f0358593680d883 SHA1 4013e18f20d5c6104d42d1eb23de0cd18f5ec333 SHA256 18dc4ce827d56be22d772e22c77c84bc93dfd6be9f888ecb6da9df27448dd86c
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
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
new file mode 100644
index 000000000000..b335c9ff2531
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.1_beta3-theora_disable_encode.patch
@@ -0,0 +1,15 @@
+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:46:10.000000000 +0300
+@@ -17,7 +17,11 @@
+ 	x86/x86state.c \
+ 	x86_vc
+ 
++if THEORA_DISABLE_ENCODE
+ lib_LTLIBRARIES = libtheoradec.la libtheoraenc.la libtheora.la
++else
++lib_LTLIBRARIES = libtheoradec.la libtheora.la
++endif
+ 
+ if THEORA_DISABLE_ENCODE
+ encoder_uniq_sources = \
diff --git a/media-libs/libtheora/libtheora-1.1_beta3.ebuild b/media-libs/libtheora/libtheora-1.1_beta3.ebuild
index 97cc8f80a6fe..8147c0ce425c 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.1 2009/08/27 09:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1_beta3.ebuild,v 1.2 2009/08/27 16:49:13 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic
@@ -27,7 +27,8 @@ VARTEXFONTS=${T}/fonts
 S=${WORKDIR}/${P/_}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
+	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch \
+		"${FILESDIR}"/${P}-theora_disable_encode.patch
 	AT_M4DIR="m4" eautoreconf
 }