Bump libogg and libvorbis

8 files changed, 126 insertions, 6 deletions

diff --git a/media-libs/libogg/ChangeLog b/media-libs/libogg/ChangeLog
index 74c7f60cfc8a..aebae35a1d37 100644
--- a/media-libs/libogg/ChangeLog
+++ b/media-libs/libogg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libogg
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/ChangeLog,v 1.10 2003/11/15 02:39:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/ChangeLog,v 1.11 2003/11/22 19:13:23 lostlogic Exp $
+
+*libogg-1.1 (22 Nov 2003)
+
+  22 Nov 2003; Brandon Low <lostlogic@gentoo.org> libogg-1.1.ebuild:
+  Bump
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> libogg-1.0.ebuild:
   Stable on ia64
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 0deab16f4527..0d186e67cbb4 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,7 +1,7 @@
 MD5 a2fda34368b661063dae136c5696c405 libogg-1.0.ebuild 1267
 MD5 695c1490f1fe1c5e80bbf2c5c4c495d9 libogg-1.0_rc3-r1.ebuild 892
-MD5 f24c675b70c467bf63474c12bda3b242 libogg-1.1.ebuild 1265
-MD5 36b7d71c6762d24baeac227ebafec0ab ChangeLog 1528
+MD5 6f7371a96ffaf8108e957586e03e2d25 libogg-1.1.ebuild 905
+MD5 7a9c4f740310752d17ff64946c6bf0ea ChangeLog 1633
 MD5 cbb43595399aa585c5246a9fa024dfc6 files/digest-libogg-1.0 62
 MD5 12db5904065ddca9ba537a41acabe033 files/digest-libogg-1.1 62
 MD5 f5049ac22380344fd664130e9ffa8a4a files/digest-libogg-1.0_rc3-r1 65
diff --git a/media-libs/libogg/files/digest-libogg-1.1 b/media-libs/libogg/files/digest-libogg-1.1
new file mode 100644
index 000000000000..03acb1eb1056
--- /dev/null
+++ b/media-libs/libogg/files/digest-libogg-1.1
@@ -0,0 +1 @@
+MD5 461d7097bf47864b872085a94ff94e10 libogg-1.1.tar.gz 282691
diff --git a/media-libs/libogg/libogg-1.1.ebuild b/media-libs/libogg/libogg-1.1.ebuild
new file mode 100644
index 000000000000..5c8cba45709d
--- /dev/null
+++ b/media-libs/libogg/libogg-1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.1.ebuild,v 1.1 2003/11/22 19:13:23 lostlogic Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the Ogg media file format library"
+SRC_URI="http://www.vorbis.com/files/1.0.1/unix/${P}.tar.gz"
+HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+
+DEPEND="virtual/glibc"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ia64"
+
+src_compile() {
+	./configure --prefix=/usr --host=${CHOST} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	# remove the docs installed by make install, since I'll install
+	# them in portage package doc directory
+	echo "Removing docs installed by make install"
+	rm -rf ${D}/usr/share/doc
+
+	dodoc AUTHORS CHANGES COPYING README
+	dohtml doc/*.{html,png}
+}
+
diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 1d659139f8c2..054afb43ee5f 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.19 2003/11/20 17:13:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.20 2003/11/22 19:13:23 lostlogic Exp $
+
+*libvorbis-1.0.1 (22 Nov 2003)
+
+  22 Nov 2003; Brandon Low <lostlogic@gentoo.org> libvorbis-1.0.1.ebuild:
+  Bump, had to remove both of the patches, this probably means that it doesn't
+  use SIMD properly now, hopefully we'll get a new patch for this version at
+  some point
 
   20 Nov 2003; Martin Holzer <mholzer@gentoo.org> libvorbis-1.0-r4.ebuild:
   marking stable. Closes #33925.
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 7e37bbac4d2b..cf0cc4cf2c03 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,8 +1,8 @@
 MD5 6d22b16809393142dba7b108e6c9b19e libvorbis-1.0-r3.ebuild 1776
-MD5 3dafab79974c7dab8f12e6193c520271 libvorbis-1.0.1.ebuild 2160
+MD5 fd004d231f26ad3a701ec6ad3cedc9ca libvorbis-1.0.1.ebuild 1990
 MD5 355c2703c2ff4a442975de8554e1856b libvorbis-1.0-r2.ebuild 1715
 MD5 94b5d35a78e2a4f0c40053521793e43b libvorbis-1.0-r4.ebuild 2162
-MD5 701c906d080497557a769010edf3af08 ChangeLog 3148
+MD5 635d3c9ecfac3327a7a6e32489f41440 ChangeLog 3426
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1 68
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r2 65
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.0.1 b/media-libs/libvorbis/files/digest-libvorbis-1.0.1
new file mode 100644
index 000000000000..e4c8aa7dd85d
--- /dev/null
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.0.1
@@ -0,0 +1 @@
+MD5 4d6726fd02ce02f6e24824e594b0949a libvorbis-1.0.1.tar.gz 1218076
diff --git a/media-libs/libvorbis/libvorbis-1.0.1.ebuild b/media-libs/libvorbis/libvorbis-1.0.1.ebuild
new file mode 100644
index 000000000000..ddadba2549c4
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0.1.ebuild,v 1.1 2003/11/22 19:13:23 lostlogic Exp $
+
+inherit libtool eutils flag-o-matic
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the Ogg Vorbis sound file format library"
+SRC_URI="http://www.vorbis.com/files/${PV}/unix/${P}.tar.gz"
+HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+
+IUSE=""
+#IUSE="sse 3dnow"
+DEPEND=">=media-libs/libogg-1.0"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~amd64 ~mips"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+#	This patch is not yet compatable with 1.0.1, hopefully a new version will
+#	be made available sometime in the near future.
+#	if [ `use x86` ] ; then
+#		if [ `use sse` ]; then
+#			epatch ${FILESDIR}/${PN}-simd.patch
+#			# patch doesn't support sse2. See #28439
+#			filter-flags "-msse2"
+#		fi
+#		use 3dnow && append-flags -Dsimd_3dn
+#	fi
+
+#	This patch does not appear to be necessary any more...
+#	epatch ${FILESDIR}/${PN}-m4.patch || die "Patching failed"
+	# Fix a gcc crash.  With the new atexit patch to gcc, it
+	# seems it do not handle -mno-ieee-fp too well.
+	sed -i -e "s:-mno-ieee-fp::g" configure
+}
+
+src_compile() {
+	elibtoolize
+
+	# take out -fomit-frame-pointer from CFLAGS if k6-2
+	is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer"
+	is-flag "-march=k6-2" && filter-flags "-fomit-frame-pointer"
+	is-flag "-march=k6" && filter-flags "-fomit-frame-pointer"
+
+	# filter march, see bug #26463 for details
+	filter-flags "-march=pentium?"
+
+	./configure --prefix=/usr \
+		--host=${CHOST} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dosym /usr/lib/libvorbisfile.so.3.0.0 /usr/lib/libvorbisfile.so.0
+	dosym /usr/lib/libvorbisenc.so.2.0.0 /usr/lib/libvorbisenc.so.0
+
+	echo "Removing docs installed by make install"
+	rm -rf ${D}/usr/share/doc
+
+	dodoc AUTHORS COPYING README todo.txt
+	docinto txt
+	dodoc doc/*.txt
+	dohtml -r doc
+}
+