- added AM_PROG_AS for automake 1.5 to ac-workaround patch

- added s/automake -a -c/automake -a -c -i/ (have no idea why deps doesn't work)
- fixed typo in ia64 patch and removed fixing it from h5 patch

Changed files:
    Glide_V5-DRI.spec -> 1.3
    glide-ac-workaround.patch -> 1.2
    glide-h5.patch -> 1.3
    glide-ia64.patch -> 1.2

diff --git a/Glide_V5-DRI.spec b/Glide_V5-DRI.spec
index b4b869c14702d287469c8d90a9713b8a7667863d..1c0c9fee1daf35ac24b33ca599595f7b8a4b56b8 100644 (file)
--- a/Glide_V5-DRI.spec
+++ b/Glide_V5-DRI.spec
@@ -102,7 +102,7 @@ rm -f missing
 libtoolize --copy --force
 aclocal
 autoconf
-automake -a -c
+automake -a -c -i
 %configure \
        --enable-fx-dri-build \
        --enable-fx-glide-hw=h5 \

diff --git a/glide-ac-workaround.patch b/glide-ac-workaround.patch
index 44ac2656e07ddbc1dc67ff27eb199a45cd34d6ae..7b09cb2478715e7ea938e7f513d9f3e0562ea82d 100644 (file)
--- a/glide-ac-workaround.patch
+++ b/glide-ac-workaround.patch
@@ -18,3 +18,11 @@
  if test "$ARCH" = "i386" ; then
    FX_GLIDE_CTRISETUP=false
  else
+@@ -223,6 +223,7 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++AM_PROG_AS
+ AC_PROG_CPP
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)

diff --git a/glide-h5.patch b/glide-h5.patch
index bda7b2c047c5ea7d18fd7c3ddb9952fff231672f..049227888dc93d4aee407fcdd51b910e57b1ef55 100644 (file)
--- a/glide-h5.patch
+++ b/glide-h5.patch
@@ -54,17 +54,6 @@
  else
  FX_GLIDE_CTRISETUP_SRC = xdraw2_def.s xdraw3_def.s
  endif
---- glide3x-20010309/h5/glide3/src/fifo.c.orig Tue Jul 31 12:38:36 2001
-+++ glide3x-20010309/h5/glide3/src/fifo.c      Tue Jul 31 15:28:31 2001
-@@ -1181,7 +1181,7 @@
- 
- 
- long
--_griHwFifoPtr(FxBool ignored)
-+_grHwFifoPtr(FxBool ignored)
- {
-   long rVal = 0;
- 
 --- glide3x-20010309/h5/glide3/src/xdraw2.inc.s.orig   Fri Nov 17 22:31:06 2000
 +++ glide3x-20010309/h5/glide3/src/xdraw2.inc.s        Fri Aug  3 22:55:09 2001
 @@ -295,7 +295,7 @@

diff --git a/glide-ia64.patch b/glide-ia64.patch
index 26f0870ba4fb5b740b80c2642884938f7c4cfe15..722c248fac9dc08dfeefea3226b8ff50915f60cf 100644 (file)
--- a/glide-ia64.patch
+++ b/glide-ia64.patch
@@ -1621,7 +1621,7 @@
 -FxU32
 -_grHwFifoPtr(FxBool ignored)
 +long
-+_griHwFifoPtr(FxBool ignored)
++_grHwFifoPtr(FxBool ignored)
  {
 -  FxU32 rVal = 0;
 +  long rVal = 0;