Bring glide into the '06. Add voodoo1 and voodoo2 support. All 4 voodoo flags are combinable in any fashion, and if they're all off, it builds support for all of them, similar to VIDEO_CARDS. Inspired by the Fedora Extras source rpm.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 142 insertions, 4 deletions

diff --git a/media-libs/glide-v3/ChangeLog b/media-libs/glide-v3/ChangeLog
index e0795f594dfb..f5d85902ea3c 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.23 2006/01/28 10:10:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.24 2006/02/04 08:25:49 spyderous Exp $
+
+*glide-v3-20060203 (04 Feb 2006)
+
+  04 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +glide-v3-20060203.ebuild:
+  Bring glide into the '06. Add voodoo1 and voodoo2 support. All 4 voodoo
+  flags are combinable in any fashion, and if they're all off, it builds
+  support for all of them, similar to VIDEO_CARDS. Inspired by the Fedora
+  Extras source rpm.
 
   28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
   +files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch,
diff --git a/media-libs/glide-v3/Manifest b/media-libs/glide-v3/Manifest
index 52e3b628c91c..930cee9092b1 100644
--- a/media-libs/glide-v3/Manifest
+++ b/media-libs/glide-v3/Manifest
@@ -1,6 +1,9 @@
-MD5 1ea58c608fc44086fab8d42cb357991a ChangeLog 3593
-RMD160 bd7d0ed987e2ad412ad7c98808c1a05bcaa4ff43 ChangeLog 3593
-SHA256 be48239f4f96244d2da27ae2b39bb3421f0e908b557ab45027807f7896c82de3 ChangeLog 3593
+MD5 c47f55375e994575dd562580ac908508 ChangeLog 3954
+RMD160 f17fd645281701f20783391371cc8437e9d0efe3 ChangeLog 3954
+SHA256 e0352a7d4fbbf604f7a1db8ea5886fd15dbf39653ce2aa907ac230ecfee053da ChangeLog 3954
+MD5 2ececf7886fb2bbf52e62163b4acb235 files/digest-glide-v3-20060203 253
+RMD160 d39251cb2582cd3ede824ce78eca44110ef0877e files/digest-glide-v3-20060203 253
+SHA256 adf7f153f693faaebedb2dd99b85d59c639de2c6ae9200d346ce131a143fc09b files/digest-glide-v3-20060203 253
 MD5 fdd303f0ee6622cb6e52a415a19d7819 files/digest-glide-v3-3.10-r4 200
 RMD160 cb809d63f4a05e416015ed153374854b20f0d59a files/digest-glide-v3-3.10-r4 200
 SHA256 63b919425e6264c0519c7e8d926991876ce7830c8224920eb0dceb9f9cc610c3 files/digest-glide-v3-3.10-r4 200
@@ -10,6 +13,9 @@ SHA256 e2de4c973f986cdf2d8257cf0194b9f637ad785bd0f3e91c7c3bef2e9c4dbb7d files/gl
 MD5 7178c77670d7d00d7c5ea1f58898931e files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch 782
 RMD160 8c28c460d6bbe99e38232c1c6026fc52d85f5015 files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch 782
 SHA256 b0664e4ef57b849c722f69be4798620c0c5df817f519fd07c21ef3145aa53b79 files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch 782
+MD5 08496f1d617e916a07586598c0ccc0ec glide-v3-20060203.ebuild 3031
+RMD160 5684c0aa6c7a5c8dbaa7770bf7802e4d136f468c glide-v3-20060203.ebuild 3031
+SHA256 f8dc0a563205006b584583fe1abf07ee3bdaaa677b5a1b7273ebb1e6a62eb631 glide-v3-20060203.ebuild 3031
 MD5 eaac8c0a4369b688774ccbb662354285 glide-v3-3.10-r4.ebuild 2420
 RMD160 57b6d44851726235ff710a19a4bd4371e0d39153 glide-v3-3.10-r4.ebuild 2420
 SHA256 2f9120fd60d82f3dee61ad0c7d755c938b5ef8872a6a47fb7df3fad0d21cbb45 glide-v3-3.10-r4.ebuild 2420
diff --git a/media-libs/glide-v3/files/digest-glide-v3-20060203 b/media-libs/glide-v3/files/digest-glide-v3-20060203
new file mode 100644
index 000000000000..49a95c40d0f3
--- /dev/null
+++ b/media-libs/glide-v3/files/digest-glide-v3-20060203
@@ -0,0 +1,3 @@
+MD5 5e2ccd2bd83bd74f8166283dc156e315 Glide3-20060203.tar.bz2 3658502
+RMD160 a9be1f1359c397af1ed850f85e4657c3f39cf149 Glide3-20060203.tar.bz2 3658502
+SHA256 469bd902dae06a33751b92344b8bd6978873dedfe5bd7940a86ad638f2ba06db Glide3-20060203.tar.bz2 3658502
diff --git a/media-libs/glide-v3/glide-v3-20060203.ebuild b/media-libs/glide-v3/glide-v3-20060203.ebuild
new file mode 100644
index 000000000000..b004e23d09fb
--- /dev/null
+++ b/media-libs/glide-v3/glide-v3-20060203.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-20060203.ebuild,v 1.1 2006/02/04 08:25:49 spyderous Exp $
+
+inherit multilib eutils
+
+LIBVER="3.10.0"
+
+MY_PN="${PN/g/G}"
+MY_PN="${MY_PN/-v3/3}"
+MY_P="${MY_PN}-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Hardware support for the voodoo3, voodoo4 and voodoo5"
+HOMEPAGE="http://glide.sourceforge.net/"
+# our mirroring system is retarded and broken, i'll remove this later
+# once it figures out wtf is going on
+RESTRICT="mirror"
+SRC_URI="http://dev.gentoo.org/~spyderous/distfiles/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}.tar.bz2"
+LICENSE="3DFX"
+SLOT="0"
+KEYWORDS="~x86 -sparc"
+IUSE="voodoo5 voodoo3 voodoo2 voodoo1"
+
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
+
+src_compile() {
+	local compilefor glide_flags
+
+	if use voodoo5; then
+		compilefor="${compilefor} h5"
+	fi
+	if use voodoo3; then
+		compilefor="${compilefor} h3"
+	fi
+	if use voodoo2; then
+		compilefor="${compilefor} cvg"
+	fi
+	if use voodoo1; then
+		if use x86; then
+			compilefor="${compilefor} sst1"
+		else
+			ewarn "Voodoo1 support only available on x86 so far."
+		fi
+	fi
+	# If nothing's set, build everything
+	if [[ ! -n "${compilefor}" ]]; then
+		compilefor="h5 h3 cvg"
+		if use x86; then
+			compilefor="${compilefor} sst1"
+		fi
+	fi
+
+	glide_flags="TEXUS2=1"
+	if use x86; then
+		# Still checks for 3dnow etc at runtime
+		glide_flags="${glide_flags} USE_X86=1 USE_3DNOW=1 USE_MMX=1 USE_SSE=1
+			USE_SSE2=1"
+	fi
+
+	for card in ${compilefor}; do
+		if [[ $card = h3 ]] || [[ $card = h5 ]]; then
+			glide_flags="${glide_flags} DRI=1 XPATH=/usr/$(get_libdir)"
+		fi
+		make -f makefile.linux \
+			FX_GLIDE_HW=${card} \
+			OPTFLAGS="${CFLAGS}" \
+			${glide_flags}
+		if [[ $card = h5 ]]; then
+			mv ${card}/lib/libglide*so libglide3-v5.so
+		elif [[ $card = h3 ]]; then
+			mv ${card}/lib/libglide*so libglide3-v3.so
+		elif [[ $card = cvg ]]; then
+			mv ${card}/lib/libglide*so libglide3-v2.so
+		elif [[ $card = sst1 ]]; then
+			mv ${card}/lib/libglide*so libglide3-v1.so
+		fi
+		make -f makefile.linux \
+			FX_GLIDE_HW=${card} \
+			realclean
+	done
+}
+
+src_install() {
+	local default_lib default_libver
+
+	dolib.so ${S}/libglide3-v*.so
+
+	if use voodoo5; then
+		default_libver="5"
+	elif use voodoo3; then
+		default_libver="3"
+	elif use voodoo2; then
+		default_libver="2"
+	elif use voodoo1; then
+		default_libver="1"
+	else
+		# Default to voodoo3
+		default_libver="3"
+	fi
+	default_lib="libglide3-v${default_libver}.so"
+
+	dosym ${default_lib} /usr/$(get_libdir)/libglide3.so.${LIBVER}
+	dosym libglide3.so.${LIBVER} /usr/$(get_libdir)/libglide3.so.3
+	dosym libglide3.so.${LIBVER} /usr/$(get_libdir)/libglide3.so
+
+	insinto /usr/include/glide3
+	doins \
+		swlibs/fxmisc/3dfx.h \
+		h5/glide3/src/g3ext.h \
+		h5/glide3/src/glide.h \
+		h5/glide3/src/glidesys.h \
+		h5/glide3/src/glideutl.h \
+		swlibs/fxmisc/linutil.h \
+		h5/incsrc/sst1vid.h \
+		swlibs/texus2/lib/texus.h
+}