Version bump.

Package-Manager: portage-2.1.5_rc4
author: Samuli Suominen <ssuominen@gentoo.org> 2008-04-17 11:27:38 +0000
committer: Samuli Suominen <ssuominen@gentoo.org> 2008-04-17 11:27:38 +0000
commit: 979833ef759f9981010bad05fae587ba3681d8ed (patch)
tree: 33581ded299f25aed64dc6ed69a18f3e6348883d /media-libs/libtheora
parent: ppc stable (proxy commit for dertobi123) (diff)
download: historical-979833ef759f9981010bad05fae587ba3681d8ed.tar.gz
historical-979833ef759f9981010bad05fae587ba3681d8ed.tar.bz2
historical-979833ef759f9981010bad05fae587ba3681d8ed.zip
7 files changed, 25 insertions, 189 deletions
diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index c54e19d6603a..88252298360f 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.71 2008/04/03 18:27:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.72 2008/04/17 11:27:38 drac Exp $
+
+*libtheora-1.0_beta3 (17 Apr 2008)
+
+  17 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -files/libtheora-1.0alpha7-nocomments.patch, -libtheora-1.0_alpha7.ebuild,
+  -libtheora-1.0_alpha7-r1.ebuild, -libtheora-1.0_beta2.ebuild,
+  +libtheora-1.0_beta3.ebuild:
+  Version bump.
 
   03 Apr 2008; Peter Volkov <pva@gentoo.org> libtheora-1.0_alpha6-r1.ebuild,
   libtheora-1.0_beta2-r1.ebuild:
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index c497b38b1704..8d351c0800ed 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -2,14 +2,11 @@ AUX libtheora-1.0_alpha6-pic-fix.patch 10712 RMD160 bb24bd1268ea4bbce8bdfc4ae21c
 AUX libtheora-1.0_beta2-flags.patch 763 RMD160 eb1d55ab98e5eae570845baf17eb93301271596c SHA1 b79a4338454e832d2b46df55bae1de967919eb24 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6
 AUX libtheora-1.0_beta2-pic-fix.patch 4578 RMD160 0d44682d6c7897ade44d67996b5e1a95c2aba17c SHA1 b235d4f11d81bac49a89819643d5d3a4b29ceccf SHA256 c613bece1d08b51e95031b0de4a8a0d1e3271382480bbe7e77b6bc973f2f6c4c
 AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e SHA1 972fd0c16c2ac9fa15996cd54ad2b34034ee27ed SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701
-AUX libtheora-1.0alpha7-nocomments.patch 1520 RMD160 4f5ea455eebc349fbd2f9d1ea048f629ea6380aa SHA1 9b8b55da07243a092de4f7039bc0981b4b75f03c SHA256 0c4fe22dc41bf125166cdf4ba4df533f9132b7520de170480eea2aa1abd6913c
 DIST libtheora-1.0alpha6.tar.bz2 1559318 RMD160 b0d81dab81ec96d51e2d6a4c047beff807de6077 SHA1 0fa7314a432e60c6178a7d98b6408c7a950155ed SHA256 4e6044cb24d2cdb42e5d9402c709644886e8761f7b166781469ffda44240da92
-DIST libtheora-1.0alpha7.tar.bz2 1673255 RMD160 45a46c35cb1bd6f44a82a286940937e031edb14f SHA1 ee97d30e0818c27666477113c019d53f15449d3d SHA256 f0380bedd14382cf80304e3f209704b460a87981cd11e32194d940151d8880ea
 DIST libtheora-1.0beta2.tar.bz2 1774632 RMD160 544bdb94e09fdfcfb76b603dd32c40ed5d6103a2 SHA1 d58490cc507e1840fbdb432a1dd12433644cc04b SHA256 8bd514ddf5836d82a97f9ff2a4b606c9ccf6ed749055a9fb79f7a335c0ef4b20
-EBUILD libtheora-1.0_alpha6-r1.ebuild 1713 RMD160 91aae72f59f528a2c11fcb9b21966b88235dbd2e SHA1 c27ab660c9a361ae682519c2e6c57bd11d26ed78 SHA256 34b2bc291f05b0ef3ee8fb97e96fdb86c6b90abfa093e6d66986cb80ab77c915
-EBUILD libtheora-1.0_alpha7-r1.ebuild 1539 RMD160 f9be4b83a0f74e6c3210ac6477b36c86618112c7 SHA1 6b46ab0d511c5740fb5a8e70471a37bcd74267e2 SHA256 ba45351a1e4a49381bf7edaa95bac9baf0e729dc56a265056efda726ba38569f
-EBUILD libtheora-1.0_alpha7.ebuild 1489 RMD160 6faf15754fbb4b701c240bc53dd31d7ba53cd2f2 SHA1 be7e8a502f7eb797c1c30222f80f1fd6fdce625d SHA256 c75e56af947d4bc9480f762be7d9ee83eb597ce59895807939a5d275b9a42b4b
+DIST libtheora-1.0beta3.tar.bz2 1531449 RMD160 5308039be56064c7a54d464b0dc32f31542a34d8 SHA1 01f0a5adcdde5bdc5b7e700b5975067af60b456c SHA256 9d69299b06c1ec840b36bdf3951d86dc40d23c50f1d898ea633afa594ec43da7
+EBUILD libtheora-1.0_alpha6-r1.ebuild 1656 RMD160 8b65cb3a7b0de1681d690b50505e5f3cc150dbcd SHA1 14236c5ee2980da1d3007dd9634a6c1ef7ea71bd SHA256 bc83edd34bb1892403fafa39f60f5855c4e82ad9d91effdb7351cb9208f94d97
 EBUILD libtheora-1.0_beta2-r1.ebuild 1412 RMD160 2e3b2d5359a8008ad1e0c260d26a24f8e1478555 SHA1 ea21c17e27ebc73fff68f62b83307494bc23766b SHA256 4e4dfd7ef8a186ddd0551953c990e5738f095474cc2cf42644caa6c6fc8a7980
-EBUILD libtheora-1.0_beta2.ebuild 1336 RMD160 88814205ed24298002e6e5c910d9b17880cc1f40 SHA1 49239ab8cba1e958ace1eceb17e7896ce0169852 SHA256 1c5f979fc62e24fdbda18a192a491204188b338255cccd1e821e8ceb2b88a3f5
-MISC ChangeLog 10061 RMD160 7a1aaed6560062e0280c4158323e5fbdb263c750 SHA1 324015bb3b7519617c6c7fcf541c561fffcd86fa SHA256 270c98bbcdde902b53212be64b3b844e689609b939e31b626948e2531b9db1d3
+EBUILD libtheora-1.0_beta3.ebuild 1374 RMD160 367ed5a96d24d5d324dd539060991bb67c8061c1 SHA1 b30d470c21ad2593c58621332f95f9515d2674b9 SHA256 38e608b18f1ea7a5cef088487cb6685cc2b9cc97cf5399596abc148b5f089f7c
+MISC ChangeLog 10336 RMD160 b4a2159229f6ef066a94e8179e147aabc0796679 SHA1 ec6c3dae1156976a340d2addc4a6ca56aa0ce2c1 SHA256 3f719256630ec4b73aea4adbdf7fa213e105ee88b5e313795330d5c1a844976f
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch b/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch
deleted file mode 100644
index ef2f54f050c7..000000000000
--- a/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: libtheora-1.0alpha7/lib/toplevel.c
-===================================================================
---- libtheora-1.0alpha7.orig/lib/toplevel.c
-+++ libtheora-1.0alpha7/lib/toplevel.c
-@@ -182,6 +182,7 @@ static int _theora_unpack_comment(theora
- 
-   _tp_readlsbint(opb,(long *) &tc->comments);
-   if(tc->comments<0)goto parse_err;
-+  if(tc->comments==0)goto nocomments;
-   tc->user_comments=_ogg_calloc(tc->comments,sizeof(*tc->user_comments));
-   tc->comment_lengths=_ogg_calloc(tc->comments,sizeof(*tc->comment_lengths));
-   for(i=0;i<tc->comments;i++){
-@@ -192,6 +193,8 @@ static int _theora_unpack_comment(theora
-     tc->user_comments[i][len]='\0';
-     tc->comment_lengths[i]=len;
-   }
-+
-+nocomments:
-   return(0);
- 
- parse_err:
-Index: libtheora-1.0alpha7/lib/comment.c
-===================================================================
---- libtheora-1.0alpha7.orig/lib/comment.c
-+++ libtheora-1.0alpha7/lib/comment.c
-@@ -99,9 +99,11 @@ int theora_comment_query_count(theora_co
- void theora_comment_clear(theora_comment *tc){
-   if(tc){
-     long i;
--    for(i=0;i<tc->comments;i++)
--      if(tc->user_comments[i])_ogg_free(tc->user_comments[i]);
--    if(tc->user_comments)_ogg_free(tc->user_comments);
-+    if (tc->user_comments) {
-+      for(i=0;i<tc->comments;i++)
-+	if(tc->user_comments[i])_ogg_free(tc->user_comments[i]);
-+      _ogg_free(tc->user_comments);
-+    }
-     if(tc->comment_lengths)_ogg_free(tc->comment_lengths);
-     if(tc->vendor)_ogg_free(tc->vendor);
-     memset(tc,0,sizeof(*tc));
diff --git a/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
index c23e0927a3e1..dd9d510cf21e 100644
--- a/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild,v 1.14 2008/04/03 18:27:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild,v 1.15 2008/04/17 11:27:38 drac Exp $
 
 WANT_AUTOMAKE=1.9
 WANT_AUTOCONF=2.5
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="arm sh"
 IUSE="encode doc examples"
 
 RDEPEND=">=media-libs/libogg-1.1.0
diff --git a/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild
deleted file mode 100644
index 4e92387890d9..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild,v 1.1 2007/06/04 16:05:29 lu_zero Exp $
-
-inherit flag-o-matic libtool
-
-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"
-IUSE="encode doc examples"
-
-RDEPEND=">=media-libs/libogg-1.1.0
-	encode? ( >=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
-
-	elibtoolize
-
-	epatch "${FILESDIR}/${P/_}-nocomments.patch"
-
-	if use examples; then
-		# This creates a clean copy of examples sources
-		cp -R "${S}/examples" "${WORKDIR}"
-		rm -f "${WORKDIR}/examples/Makefile"*
-	fi
-}
-
-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() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="usr/share/doc/${PF}" \
-		install || die "make install failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins "${WORKDIR}/examples/"*
-	fi
-
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_alpha7.ebuild b/media-libs/libtheora/libtheora-1.0_alpha7.ebuild
deleted file mode 100644
index b416f6b24269..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha7.ebuild,v 1.7 2007/03/10 20:27:33 beandog Exp $
-
-inherit flag-o-matic libtool
-
-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"
-IUSE="encode doc examples"
-
-RDEPEND=">=media-libs/libogg-1.1.0
-	encode? ( >=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
-
-	elibtoolize
-
-	if use examples; then
-		# This creates a clean copy of examples sources
-		cp -R "${S}/examples" "${WORKDIR}"
-		rm -f "${WORKDIR}/examples/Makefile"*
-	fi
-}
-
-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() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="usr/share/doc/${PF}" \
-		install || die "make install failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins "${WORKDIR}/examples/"*
-	fi
-
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_beta2.ebuild b/media-libs/libtheora/libtheora-1.0_beta3.ebuild
index 0c7f1a3afdea..da08fa8c01e9 100644
--- a/media-libs/libtheora/libtheora-1.0_beta2.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_beta3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta2.ebuild,v 1.2 2007/11/25 21:12:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta3.ebuild,v 1.1 2008/04/17 11:27:38 drac Exp $
 
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="The Theora Video Compression Codec"
 HOMEPAGE="http://www.theora.org"
@@ -10,11 +10,11 @@ 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"
-IUSE="doc encode examples pic"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc encode examples"
 
-RDEPEND=">=media-libs/libogg-1.1
-	encode? ( >=media-libs/libvorbis-1.0.1 )"
+RDEPEND="media-libs/libogg
+	encode? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-util/pkgconfig"
@@ -24,18 +24,17 @@ S=${WORKDIR}/${P/_}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
-	local myconf
+	use x86 && filter-flags -fforce-addr -frename-registers #200549
 
-	use pic && myconf="--disable-asm"
 	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
 
 	econf --disable-dependency-tracking --disable-examples \
-		--disable-sdltest $(use_enable encode) ${myconf}
+		--disable-sdltest $(use_enable encode)
 
 	emake || die "emake failed."
 }
author	Samuli Suominen <ssuominen@gentoo.org>	2008-04-17 11:27:38 +0000
committer	Samuli Suominen <ssuominen@gentoo.org>	2008-04-17 11:27:38 +0000
commit	979833ef759f9981010bad05fae587ba3681d8ed (patch)
tree	33581ded299f25aed64dc6ed69a18f3e6348883d /media-libs/libtheora
parent	ppc stable (proxy commit for dertobi123) (diff)
download	historical-979833ef759f9981010bad05fae587ba3681d8ed.tar.gz historical-979833ef759f9981010bad05fae587ba3681d8ed.tar.bz2 historical-979833ef759f9981010bad05fae587ba3681d8ed.zip