Fun with compile flags. #26239 and #26242.

4 files changed, 86 insertions, 3 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 67978909be84..8a20b7c95090 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.12 2003/08/05 09:58:07 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.13 2003/08/11 08:58:22 jje Exp $
+
+*libvorbis-1.0-r4 (11 Aug 2003)
+
+  11 Aug 2003; jje <jje@gentoo.org> libvorbis-1.0-r4.ebuild:
+  More fun with simd patch. Now add -Dsimd-3dn if 3dnow. #26242.
+  
+  Also, filter -fomit-frame-pointer for k6 arches. #26239.
 
   05 Aug 2003; jje <jje@gentoo.org> libvorbis-1.0-r1.ebuild,
   libvorbis-1.0-r2.ebuild, libvorbis-1.0.ebuild, files/libvorbis-1.0-m4.patch,
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 7b3a2b290969..12ea3dd2a876 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,5 +1,5 @@
-MD5 3df66b52d2f66cad749719b268ee3dce ChangeLog 2321
-MD5 f3c7e68e720292603a8e3419d43b1e6e libvorbis-1.0-r4.ebuild 2090
+MD5 15d49c71506df231a194f147888649d3 ChangeLog 2543
+MD5 b3ac9dd57e7cb067c05c798b450361bb libvorbis-1.0-r4.ebuild 2058
 MD5 073b0e5bb9e3c2061a1fa745f4130320 libvorbis-1.0-r2.ebuild 1707
 MD5 caf792187e22d3bcdee52fa25bf4283b libvorbis-1.0-r3.ebuild 1773
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r4 65
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.0-r4 b/media-libs/libvorbis/files/digest-libvorbis-1.0-r4
new file mode 100644
index 000000000000..6c800c478006
--- /dev/null
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.0-r4
@@ -0,0 +1 @@
+MD5 d1ad94fe8e240269c790e18992171e53 libvorbis-1.0.tar.gz 749064
diff --git a/media-libs/libvorbis/libvorbis-1.0-r4.ebuild b/media-libs/libvorbis/libvorbis-1.0-r4.ebuild
new file mode 100644
index 000000000000..3ad83536242c
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.0-r4.ebuild
@@ -0,0 +1,75 @@
+# 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-r4.ebuild,v 1.1 2003/08/11 08:58:23 jje Exp $
+
+inherit libtool eutils flag-o-matic
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the Ogg Vorbis sound file format library"
+SRC_URI="http://fatpipe.vorbis.com/files/1.0/unix/${P}.tar.gz"
+HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+
+IUSE="sse 3dnow"
+DEPEND=">=media-libs/libogg-1.0"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	if [ `use x86` ] ; then
+		use sse && epatch ${FILESDIR}/${PN}-simd.patch
+		use 3dnow && append-flags -Dsimd-3dn
+	fi
+
+	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.
+	cp configure configure.orig
+	sed -e "s:-mno-ieee-fp::g" \
+		configure.orig >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"
+
+	./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
+}
+
+pkg_postinst() {
+	einfo 
+	einfo "Note the 1.0 version of libvorbis has been installed"
+	einfo "Applications that used pre-1.0 vorbis libraries will"
+	einfo "need to be recompiled for the new version."
+	einfo "Now that the vorbis folks have finalized the API"
+	einfo "this should be the last time for a while that"
+	einfo "recompilation is needed for these things."
+	einfo
+}
+