Back out update of Mesa, MesaLib, glu and glut to Mesa version 5.0,

until we figure out how to properly solve the conflict of XF4.x's own
GL.  As discussed with tron.

2 files changed, 35 insertions, 15 deletions

diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa
index 23449707905..0aed774904c 100644
--- a/graphics/MesaLib/patches/patch-aa
+++ b/graphics/MesaLib/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2002/12/05 15:11:50 jschauma Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/06 17:03:24 jschauma Exp $
 
---- src/X86/assyntax.h.orig	Tue Nov 19 15:17:48 2002
-+++ src/X86/assyntax.h	Tue Nov 19 15:18:34 2002
-@@ -965,7 +965,8 @@
+--- src/X86/assyntax.h.orig	Mon Sep 25 17:12:01 2000
++++ src/X86/assyntax.h	Sun Dec 10 23:45:34 2000
+@@ -954,7 +954,8 @@
  
  #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
-  || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \
+  || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
 - || defined(__FreeBSD__) && __FreeBSD__ >= 3
 + || defined(__FreeBSD__) && __FreeBSD__ >= 3 \
 + || defined(__NetBSD__) && defined(__ELF__)
  #define GLNAME(a)	a
  #else
- #define GLNAME(a)	CONCAT(_, a)
+ #define GLNAME(a)	_ ## a
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index 4f6e7185b0c..4e3bd4ae2a9 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,13 +1,33 @@
-$NetBSD: patch-ab,v 1.5 2002/12/05 15:11:50 jschauma Exp $
+$NetBSD: patch-ab,v 1.6 2002/12/06 17:03:24 jschauma Exp $
 
---- configure.orig	Wed Nov 13 22:18:19 2002
-+++ configure	Tue Nov 19 15:52:05 2002
-@@ -1532,7 +1532,7 @@
+--- configure.orig	Thu May 17 00:28:58 2001
++++ configure	Fri May 18 14:16:44 2001
+@@ -823,8 +823,8 @@
+ MESA_MAJOR=3
+ MESA_MINOR=4
+ MESA_TINY=2
+-LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
+-LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
++LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
++LIBGLU_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
+ LIBGLUT_VERSION=3:7:0
+ 
+ 
+@@ -4635,7 +4635,7 @@
+ if test -d $srcdir/src-glut; then
+   have_glut_source=yes
+ else
+-  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; exit 1; }
++  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; }
+ fi
+ echo "$ac_t""$have_glut_source" 1>&6
+ need_glut=no
+@@ -4673,7 +4673,7 @@
+ done
+ echo "$ac_t""$have_demo_source" 1>&6
+ if test "x$have_demo_source" != xyes; then
+-  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; exit 1; }
++  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; }
  fi
-   MAINT=$MAINTAINER_MODE_TRUE
  
--ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile ggi/demos/Makefile ggi/ggiglut/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile"
-+ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile"
  
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'