Bugfix bump. This should close the following: 31366, 31490, 43660, and 41544.

4 files changed, 94 insertions, 2 deletions

diff --git a/media-libs/glide-v3/ChangeLog b/media-libs/glide-v3/ChangeLog
index 6b8db13c31ba..ed11a90e0d10 100644
--- a/media-libs/glide-v3/ChangeLog
+++ b/media-libs/glide-v3/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/glide-v3
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.11 2004/03/07 01:11:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.12 2004/06/14 08:53:35 battousai Exp $
+
+*glide-v3-3.10-r4 (13 Jun 2004)
+
+  13 Jun 2004; Bryan Stine <battousai@gentoo.org>; glide-v3-3.10-r4.ebuild:
+  Numerous fixes. Compiling with GCC 3.3 should now be fixed. A few
+  makefile.autoconf.am problems with assembly files have been fixed. The
+  build.3dfx script is no longer used, so no need to worry about chmod +x or the
+  die statement not working. The following bugs have been closed by this bump:
+  31366, 31490, 43660, and 41544.
 
   06 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   glide-v3-3.10-r3.ebuild:
diff --git a/media-libs/glide-v3/Manifest b/media-libs/glide-v3/Manifest
index a16e748f5c62..8defe76e7622 100644
--- a/media-libs/glide-v3/Manifest
+++ b/media-libs/glide-v3/Manifest
@@ -1,3 +1,5 @@
-MD5 1a809d595b9aaf6841c85f1290c322db ChangeLog 1765
+MD5 03aa8d410b9236663dff2d42203495bd ChangeLog 2209
 MD5 5cd98e2a43319c206eae95d03f597aea glide-v3-3.10-r3.ebuild 2029
+MD5 04267b811287ae91e1821c528b464c79 glide-v3-3.10-r4.ebuild 2210
 MD5 768d204d12c78e272cffb63c0b193f47 files/digest-glide-v3-3.10-r3 128
+MD5 fdd303f0ee6622cb6e52a415a19d7819 files/digest-glide-v3-3.10-r4 200
diff --git a/media-libs/glide-v3/files/digest-glide-v3-3.10-r4 b/media-libs/glide-v3/files/digest-glide-v3-3.10-r4
new file mode 100644
index 000000000000..a2504fce1fcd
--- /dev/null
+++ b/media-libs/glide-v3/files/digest-glide-v3-3.10-r4
@@ -0,0 +1,3 @@
+MD5 322250849c105f9b7d7e3690c69ed474 glide3x-3.10.tar.gz 3055109
+MD5 dec0b3a17912934f6da79f57cd0a802c swlibs-3.10.tar.gz 596883
+MD5 f9966f8f4185fd00d67ff7b7dff598eb glide-v3-3.10-fixes.patch.bz2 7511
diff --git a/media-libs/glide-v3/glide-v3-3.10-r4.ebuild b/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
new file mode 100644
index 000000000000..44ad98e73248
--- /dev/null
+++ b/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r4.ebuild,v 1.1 2004/06/14 08:53:35 battousai Exp $
+
+# NOTE:  Do NOT build this with optimizations, as it will make this package
+#        unstable!!!!
+
+inherit eutils
+
+S=${WORKDIR}/${PN/-v3/3x}
+DESCRIPTION="Hardware support for the voodoo3, voodoo4 and voodoo5"
+HOMEPAGE="http://glide.sourceforge.net/"
+SRC_URI="http://www.ibiblio.org/gentoo/distfiles/glide3x-${PV}.tar.gz
+	http://www.ibiblio.org/gentoo/distfiles/swlibs-${PV}.tar.gz
+	mirror://gentoo/${P}-fixes.patch.bz2"
+# check for future updates here
+# http://telia.dl.sourceforge.net/mirrors/slackware/slackware-8.0/contrib/contrib-sources/3dfx/voodoo4_voodoo5/
+
+LICENSE="3DFX"
+SLOT="0"
+KEYWORDS="x86 sparc alpha"
+IUSE="voodoo3 3dnow"
+
+DEPEND=">=sys-devel/automake-1.4
+	>=sys-devel/autoconf-2.13
+	>=sys-devel/libtool-1.3.3
+	>=sys-devel/m4-1.4
+	>=sys-apps/sed-4
+	>=dev-lang/perl-5.005"
+PROVIDE="virtual/glide"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${WORKDIR}
+	chmod +x swlibs/include/make/ostype
+	cd ${S} ; ln -fs ${WORKDIR}/swlibs swlibs
+	cd ${S}/h3/minihwc ; ln -fs linhwc.c.dri linhwc.c
+	cd ${S}/h3/glide3/src ; ln -fs gglide.c.dri gglide.c
+	ln -fs gsst.c.dri gsst.c ; ln -fs glfb.c.dri glfb.c
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fixes.patch.bz2
+	export WANT_AUTOMAKE="1.4" WANT_AUTOCONF="2.5"
+	libtoolize -f && aclocal && automake && autoconf
+}
+
+src_compile() {
+	local compilefor=
+	use voodoo3 \
+		&& compilefor="h3" \
+		|| compilefor="h5"
+	mkdir build
+	cd build
+	../configure \
+		--prefix=/usr \
+		--enable-fx-glide-hw=${compilefor} \
+		--enable-fx-dri-build \
+		`use_enable 3dnow amd3d` \
+			|| die "configure failed"
+
+	# On alpha at least, glide incorrectly guesses 486 processor.
+	# Fixup the makefiles.
+	if use alpha; then
+		find . -type f | xargs grep -le -m486 | \
+			xargs sed -i -e "s|-m486|${CFLAGS}|"
+	fi
+
+	make -f makefile.autoconf all || die "build.3dfx failed"
+}
+
+src_install() {
+	cd ${S}/build
+	make -f makefile.autoconf DESTDIR="${D}" install || die "install failed"
+
+	dodir /usr/X11R6/lib
+	dosym /usr/lib/libglide3.so.${PV}.0 /usr/X11R6/lib/libglide3.so
+}