(#114558) Fix compilation with USE=voodoo3. Thanks much to Christopher Head <chead@telus.net> for providing a patch.

Package-Manager: portage-2.1_pre4

4 files changed, 45 insertions, 8 deletions

diff --git a/media-libs/glide-v3/ChangeLog b/media-libs/glide-v3/ChangeLog
index 4b8483dffbca..e0795f594dfb 100644
--- a/media-libs/glide-v3/ChangeLog
+++ b/media-libs/glide-v3/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2006/01/28 09:35:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.23 2006/01/28 10:10:15 spyderous Exp $
+
+  28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch,
+  glide-v3-3.10-r4.ebuild:
+  (#114558) Fix compilation with USE=voodoo3. Thanks much to Christopher Head
+  <chead@telus.net> for providing a patch.
 
   28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
   glide-v3-3.10-r4.ebuild:
diff --git a/media-libs/glide-v3/Manifest b/media-libs/glide-v3/Manifest
index 4935ef602aeb..52e3b628c91c 100644
--- a/media-libs/glide-v3/Manifest
+++ b/media-libs/glide-v3/Manifest
@@ -1,15 +1,18 @@
-MD5 6ef7094745b054306b4539517691a4b5 ChangeLog 3333
-RMD160 19887bab3621f74b1eb5d93d3e2c8ca9c61ad5ef ChangeLog 3333
-SHA256 87944658dbb1fe7f5ec64f5d525daf4308ec9024f3e14f0d02a38fe7c821b294 ChangeLog 3333
+MD5 1ea58c608fc44086fab8d42cb357991a ChangeLog 3593
+RMD160 bd7d0ed987e2ad412ad7c98808c1a05bcaa4ff43 ChangeLog 3593
+SHA256 be48239f4f96244d2da27ae2b39bb3421f0e908b557ab45027807f7896c82de3 ChangeLog 3593
 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
 MD5 f6673af0af631c9e33d4bfd4a3473c4e files/glide-v3-3.10-2.6-headers-fix.patch 2459
 RMD160 884e9cfb9be3f62de9294d66ea694c205e1153c8 files/glide-v3-3.10-2.6-headers-fix.patch 2459
 SHA256 e2de4c973f986cdf2d8257cf0194b9f637ad785bd0f3e91c7c3bef2e9c4dbb7d files/glide-v3-3.10-2.6-headers-fix.patch 2459
-MD5 9f12302c73b3d4079510777bdd05c586 glide-v3-3.10-r4.ebuild 2363
-RMD160 9e09bef1cf80f93ed8347757527060cbe07f1f60 glide-v3-3.10-r4.ebuild 2363
-SHA256 504d27865e20ba6b9aa7bc23ebe5ca51b698c2dc00f00c0a208a25873156f70e glide-v3-3.10-r4.ebuild 2363
+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 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
 MD5 1f4a7b552c4631b5e826df2324e7f45e metadata.xml 164
 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 metadata.xml 164
 SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58 metadata.xml 164
diff --git a/media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch b/media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch
new file mode 100644
index 000000000000..27c30bb03a82
--- /dev/null
+++ b/media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch
@@ -0,0 +1,27 @@
+--- glide3x/h3/minihwc/linhwc.c       2005-12-05 12:07:40.000000000 -0800
++++ glide3x/h3/minihwc/linhwc.c    2005-12-05 12:08:15.000000000 -0800
+@@ -290,6 +290,9 @@
+   return FXTRUE;
+ }
+
++static FxU32
++hwcBufferLfbAddr(const hwcBoardInfo *bInfo, FxU32 physAddress);
++
+ FxBool
+ hwcAllocBuffers(hwcBoardInfo *bInfo, FxU32 nColBuffers, FxU32 nAuxBuffers)
+ {
+--- glide3x/h3/glide3/src/xdraw2.inc.S	2005-12-05 12:24:16.000000000 -0800
++++ glide3x/h3/glide3/src/xdraw2.inc.S	2005-12-05 12:26:01.000000000 -0800
+@@ -812,9 +812,12 @@
+ #define packCol %edi
+ #define tempVal %edi
+ 
++.ifndef GR_FIFO_WRITE_DEFINED
+ .macro GR_FIFO_WRITE __addr __offset __data
+ 	mov \__data , \__offset(\__addr)
+ .endm	/*  GR_FIFO_WRITE */
++.equ GR_FIFO_WRITE_DEFINED, 1
++.endif
+ 
+ .align 4
+ LOCAL(__triBegin):
diff --git a/media-libs/glide-v3/glide-v3-3.10-r4.ebuild b/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
index e0091097e09c..e793b30664cb 100644
--- a/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
+++ b/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-3.10-r4.ebuild,v 1.11 2006/01/28 09:35:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r4.ebuild,v 1.12 2006/01/28 10:10:15 spyderous Exp $
 
 # NOTE:  Do NOT build this with optimizations, as it will make this package
 #        unstable!!!!
@@ -53,6 +53,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${WORKDIR}/${P}-fixes.patch
 	epatch ${FILESDIR}/${P}-2.6-headers-fix.patch
+	epatch ${FILESDIR}/${P}-hwcBufferLfbAddr-conflict.patch
 	export WANT_AUTOMAKE="1.4" WANT_AUTOCONF="2.5"
 	libtoolize -f && aclocal && automake && autoconf
 }