diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-01-28 10:10:15 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-01-28 10:10:15 +0000 |
| commit | e8cca87b6e6ca0b69d3400f5dab8991da5e11630 (patch) | |
| tree | c85fb4d4b7d1f4d9a1486cfbdd92c3260d90cad1 /media-libs/glide-v3/files | |
| parent | Use 'rm -f' for removing files, added comment about the fix for future refere... (diff) | |
| download | gentoo-2-e8cca87b6e6ca0b69d3400f5dab8991da5e11630.tar.gz gentoo-2-e8cca87b6e6ca0b69d3400f5dab8991da5e11630.tar.bz2 gentoo-2-e8cca87b6e6ca0b69d3400f5dab8991da5e11630.zip | |
(#114558) Fix compilation with USE=voodoo3. Thanks much to Christopher Head <chead@telus.net> for providing a patch.
(Portage version: 2.1_pre4)
Diffstat (limited to 'media-libs/glide-v3/files')
| -rw-r--r-- | media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch | 27 |
1 files changed, 27 insertions, 0 deletions
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): |