updates for 4.0.1

Changed files:
    Mesa-ac.patch -> 1.3
    Mesa-am.patch -> 1.2
    Mesa-paths.patch -> 1.2

diff --git a/Mesa-ac.patch b/Mesa-ac.patch
index 9b17fd66162c3486fb38be8237fa944fccdf7c20..b271617434a8c3eb1d299fc14b24d055448e036a 100644 (file)
--- a/Mesa-ac.patch
+++ b/Mesa-ac.patch
@@ -1,22 +1,11 @@
-diff -urN Mesa-3.4.2.org/configure.in Mesa-3.4.2/configure.in
---- Mesa-3.4.2.org/configure.in        Mon Nov 26 17:32:19 2001
-+++ Mesa-3.4.2/configure.in    Mon Nov 26 17:32:57 2001
-@@ -8,8 +8,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=1:2:0
-+LIBGLU_VERSION=1:1:0
- LIBGLUT_VERSION=3:7:0
- AC_SUBST(LIBGL_VERSION)
- AC_SUBST(LIBGLU_VERSION)
-@@ -25,6 +25,7 @@
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
+diff -urN Mesa-4.0.1.org/configure.in Mesa-4.0.1/configure.in
+--- Mesa-4.0.1.org/configure.in        Thu Jan  3 17:34:01 2002
++++ Mesa-4.0.1/configure.in    Thu Jan  3 17:44:11 2002
+@@ -44,6 +44,7 @@
+ AC_DISABLE_STATIC
+ AC_DISABLE_FAST_INSTALL
+ AM_MAINTAINER_MODE
 +AM_PROG_AS
- AM_PROG_LIBTOOL
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
+ 
+ AC_CONFIG_FILES(
+   Makefile

diff --git a/Mesa-am.patch b/Mesa-am.patch
index 181df956a36c0132d6546e51b3f82657616a7373..983e360c7210b845192bf3406a4b4745761077db 100644 (file)
--- a/Mesa-am.patch
+++ b/Mesa-am.patch
@@ -1,11 +1,56 @@
---- Mesa-3.4.1/ggi/ggiglut/Makefile.am.orig    Mon Jan  8 16:43:05 2001
-+++ Mesa-3.4.1/ggi/ggiglut/Makefile.am Sun Feb 25 22:52:38 2001
-@@ -4,7 +4,7 @@
- lib_LTLIBRARIES = libglut.la
+diff -urN Mesa-4.0.1.org/si-glu/libnurbs/interface/Makefile.am Mesa-4.0.1/si-glu/libnurbs/interface/Makefile.am
+--- Mesa-4.0.1.org/si-glu/libnurbs/interface/Makefile.am       Thu Jan  3 17:34:03 2002
++++ Mesa-4.0.1/si-glu/libnurbs/interface/Makefile.am   Thu Jan  3 17:37:22 2002
+@@ -8,7 +8,7 @@
  
- libglut_la_SOURCES = ggiglut.c
--libglut_la_LDFLAGS = $(extra_libraries) -version-info 1:0 -no-undefined \
-+libglut_la_LDFLAGS = -version-info 1:0 -no-undefined \
-       -export-symbols $(srcdir)/EXPSYMS
+ # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
+ # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
+-CXXFLAGS += -DLIBRARYBUILD
++CXXFLAGS = @CXXFLAGS@ -DLIBRARYBUILD
  
- ggiincludedir = $(includedir)/ggi
+ include libNIFac_la_SOURCES
+ 
+diff -urN Mesa-4.0.1.org/si-glu/libnurbs/internals/Makefile.am Mesa-4.0.1/si-glu/libnurbs/internals/Makefile.am
+--- Mesa-4.0.1.org/si-glu/libnurbs/internals/Makefile.am       Thu Jan  3 17:34:04 2002
++++ Mesa-4.0.1/si-glu/libnurbs/internals/Makefile.am   Thu Jan  3 17:37:40 2002
+@@ -8,7 +8,7 @@
+ 
+ # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
+ # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
+-CXXFLAGS += -DLIBRARYBUILD
++CXXFLAGS = @CXXFLAGS@ -DLIBRARYBUILD
+ 
+ include libNInt_la_SOURCES
+ 
+diff -urN Mesa-4.0.1.org/si-glu/libnurbs/nurbtess/Makefile.am Mesa-4.0.1/si-glu/libnurbs/nurbtess/Makefile.am
+--- Mesa-4.0.1.org/si-glu/libnurbs/nurbtess/Makefile.am        Thu Jan  3 17:34:04 2002
++++ Mesa-4.0.1/si-glu/libnurbs/nurbtess/Makefile.am    Thu Jan  3 17:37:54 2002
+@@ -8,7 +8,7 @@
+ 
+ # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
+ # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
+-CFLAGS += -DLIBRARYBUILD
++CFLAGS = @CXXFLAGS@ -DLIBRARYBUILD
+ 
+ include libNTess_la_SOURCES
+ 
+diff -urN Mesa-4.0.1.org/src-glut/Makefile.am Mesa-4.0.1/src-glut/Makefile.am
+--- Mesa-4.0.1.org/src-glut/Makefile.am        Wed Aug 29 05:01:27 2001
++++ Mesa-4.0.1/src-glut/Makefile.am    Thu Jan  3 17:38:46 2002
+@@ -9,7 +9,6 @@
+ EXTRA_PROGRAMS = capturexfont
+ 
+ libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+-libglut_la_LIBADD = -lGLU
+ libglut_la_SOURCES = \
+       glutwin32.h \
+       win32_glx.h \
+@@ -67,7 +66,7 @@
+       layerutil.h \
+       stroke.h
+ 
+-libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
++libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD) -lGLU
+ capturexfont_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
+ 
+ EXTRA_DIST = descript.mms

diff --git a/Mesa-paths.patch b/Mesa-paths.patch
index d1384e2487dc60b406382061be7971d74cf1a7e3..4406fea0da91bc2252a40f830da330caf01a12c9 100644 (file)
--- a/Mesa-paths.patch
+++ b/Mesa-paths.patch
@@ -1,14 +1,24 @@
-diff -durN Mesa-3.1.orig/configure.in Mesa-3.1/configure.in
---- Mesa-3.1.orig/configure.in Fri Nov 19 17:04:54 1999
-+++ Mesa-3.1/configure.in      Wed Apr 19 15:22:52 2000
-@@ -280,8 +280,8 @@
-     AM_CONDITIONAL(HAVE_GGI_GENKGI, test $build_ggi_genkgi_driver = yes)
-   fi
- fi
--ggi_confdir=/usr/local/etc
--ggi_libdir=/usr/local/lib
-+ggi_confdir=/etc
-+ggi_libdir=/usr/lib
- AC_SUBST(ggi_confdir)
- AC_SUBST(ggi_libdir)
- AC_SUBST(GGI_CFLAGS)
+diff -urN Mesa-4.0.1.org/src/GGI/ggimesa.c Mesa-4.0.1/src/GGI/ggimesa.c
+--- Mesa-4.0.1.org/src/GGI/ggimesa.c   Thu Jan  3 17:34:03 2002
++++ Mesa-4.0.1/src/GGI/ggimesa.c       Thu Jan  3 18:54:42 2002
+@@ -46,7 +46,7 @@
+ static void *_ggimesaConfigHandle;
+ 
+ /* FIXME: These should really be defined in the make system using -Dxxx */
+-#define GGIMESACONFFILE "/usr/local/etc/ggi/ggimesa.conf"
++#define GGIMESACONFFILE "/etc/ggi/ggimesa.conf"
+ #define GGIMESATAGLEN 0
+ static char ggimesaconfstub[512] = GGIMESACONFFILE;
+ static char *ggimesaconffile = ggimesaconfstub + GGIMESATAGLEN;
+diff -urN Mesa-4.0.1.org/src/config.c Mesa-4.0.1/src/config.c
+--- Mesa-4.0.1.org/src/config.c        Thu Jan  3 17:34:01 2002
++++ Mesa-4.0.1/src/config.c    Thu Jan  3 18:54:51 2002
+@@ -405,7 +405,7 @@
+ #if defined(__WIN32__) || defined(__MSDOS__)
+    const char *filename = "mesa.cnf";
+ #else
+-   const char *filename = "/etc/mesa.conf";
++   const char *filename = "/etc/X11/mesa.conf"; 
+ #endif
+    FILE *file;
+    struct cnode *list;