diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-27 16:49:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-27 16:49:13 +0000 |
| commit | e5d2fe8e3f236487e4928ff4facf136ece0db0e7 (patch) | |
| tree | 02726b85f6eb42eb863575dcdd75472aa45333cc /media-libs/libtheora | |
| parent | Stable for HPPA (bug #280845). (diff) | |
| download | gentoo-2-e5d2fe8e3f236487e4928ff4facf136ece0db0e7.tar.gz gentoo-2-e5d2fe8e3f236487e4928ff4facf136ece0db0e7.tar.bz2 gentoo-2-e5d2fe8e3f236487e4928ff4facf136ece0db0e7.zip | |
Fix building with USE="-encode".
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libtheora')
| -rw-r--r-- | media-libs/libtheora/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libtheora/files/libtheora-1.1_beta3-theora_disable_encode.patch | 15 | ||||
| -rw-r--r-- | media-libs/libtheora/libtheora-1.1_beta3.ebuild | 5 |
3 files changed, 24 insertions, 3 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/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 } |