upgrade to Mesa 6.5 (patches from Michael Schloh)

mesa/mesa.patch

@@ -1,20 +1,34 @@
 Index: configs/default
 --- configs/default.orig	2006-02-01 18:47:36 +0100
 +++ configs/default	2006-03-10 12:29:34 +0100
-@@ -21,7 +21,7 @@
+@@ -24,8 +24,8 @@
  GLU_CFLAGS = 
  
  # Misc tools and flags
 -MKLIB_OPTIONS = 
 +MKLIB_OPTIONS = -static
- MKDEP = makedepend
+-MKDEP = makedepend
++MKDEP = @l_x11bindir@/makedepend
  MKDEP_OPTIONS = -fdepend
  MAKE = make
+ 
 @@ -69,6 +69,6 @@
  GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
  OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
  GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-+GLUT_LIB_DEPS = -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
++GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
  GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
  APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+Index: src/glut/glx/glut_event.c
+--- src/glut/glx/glut_event.c.orig	Thu Jun 22 14:30:35 2006
++++ src/glut/glx/glut_event.c	Thu Jun 22 14:33:24 2006
+@@ -24,7 +24,7 @@
+ # ifdef __sgi
+ #  include <bstring.h>    /* prototype for bzero used by FD_ZERO */
+ # endif
+-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
++# if (defined(SVR4) || defined(CRAY) || defined(AIXV3) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(FD_SETSIZE)
+ #  include <sys/select.h> /* select system call interface */
+ #  ifdef luna
+ #   include <sysent.h>

mesa/mesa.patch.demos

@@ -1,40 +1,48 @@
 Index: progs/demos/Makefile
 diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
---- progs/demos/Makefile.orig	2004-10-23 19:00:52.000000000 +0200
-+++ progs/demos/Makefile	2005-03-23 21:52:13.356915218 +0100
-@@ -5,9 +5,9 @@
+--- progs/demos/Makefile.orig	2005-05-19 17:41:06.000000000 +0200
++++ progs/demos/Makefile	2006-04-01 13:06:52.000000000 +0200
+@@ -5,11 +5,11 @@
  
  INCDIR = $(TOP)/include
  
 -OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
 +OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
  
+-OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
++OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS)
+ 
 -OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
 +OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
  
  LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
  
-@@ -67,7 +67,7 @@
+@@ -71,7 +71,7 @@
  
  # make executable from .c file:
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ .c: $(LIB_DEP) readtex.o
+-	$(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  
  ##### TARGETS #####
-Index: progs/demos/arbfplight.c
-diff -Nau progs/demos/arbfplight.c.orig progs/demos/arbfplight.c
---- progs/demos/arbfplight.c.orig	2005-03-23 18:50:08 +0100
-+++ progs/demos/arbfplight.c	2005-03-23 18:50:12 +0100
-@@ -6,6 +6,7 @@
-  * 17 April 2003
-  */
- 
-+#include <GL/gl.h>
- #include <assert.h>
- #include <string.h>
- #include <stdio.h>
+@@ -101,14 +101,14 @@
+ 
+ 
+ reflect: reflect.o showbuffer.o readtex.o
+-	$(CC) -I$(INCDIR) $(CFLAGS) reflect.o showbuffer.o readtex.o $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@
+ 
+ reflect.o: reflect.c showbuffer.h
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
+ 
+ 
+ shadowtex: shadowtex.o showbuffer.o
+-	$(CC) -I$(INCDIR) $(CFLAGS) shadowtex.o showbuffer.o $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@
+ 
+ shadowtex.o: shadowtex.c showbuffer.h
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
 Index: progs/redbook/Makefile
 diff -Nau progs/redbook/Makefile.orig progs/redbook/Makefile
 --- progs/redbook/Makefile.orig	2005-03-23 20:36:22 +0100
@@ -44,7 +52,7 @@ diff -Nau progs/redbook/Makefile.orig progs/redbook/Makefile
  
  .c: $(LIB_DEP)
 -	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
++	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  
  
@@ -52,56 +60,66 @@ Index: progs/samples/Makefile
 diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
 --- progs/samples/Makefile.orig	2004-08-25 16:51:18 +0200
 +++ progs/samples/Makefile	2005-03-23 21:21:16 +0100
-@@ -18,7 +18,7 @@
+@@ -18,16 +18,18 @@
  .SUFFIXES: .c
  
  .c: $(LIB_DEP)
 -	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
++	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  
-@@ -26,6 +26,8 @@
+ ##### TARGETS #####
  
  default: $(PROGS)
  
 +nurb: nurb.c
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
++	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ sphere: sphere.o readtex.o
+-	$(CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
- clean:
- 	-rm -f $(PROGS)
+ sphere.o: sphere.c readtex.h
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
 Index: progs/xdemos/Makefile
 diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
---- progs/xdemos/Makefile.orig	2005-03-23 21:04:26 +0100
-+++ progs/xdemos/Makefile	2005-03-23 21:04:46 +0100
-@@ -33,7 +33,7 @@
+--- progs/xdemos/Makefile.orig	2005-11-10 17:35:07.000000000 +0100
++++ progs/xdemos/Makefile	2006-04-01 13:11:51.000000000 +0200
+@@ -37,7 +37,7 @@
  .SUFFIXES: .c
  
  .c: $(LIB_DEP)
 -	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  
  ##### TARGETS #####
-@@ -48,10 +48,10 @@
+@@ -52,10 +52,10 @@
  
  # special cases
  pbinfo: pbinfo.o pbutil.o
--	$(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
-+	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+-	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
++	$(CC) $(CFLAGS) pbinfo.o pbutil.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  pbdemo: pbdemo.o pbutil.o
--	$(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
-+	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+-	$(CC) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
++	$(CC) $(CFLAGS) pbdemo.o pbutil.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  pbinfo.o: pbinfo.c pbutil.h
  	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
-@@ -64,7 +64,7 @@
+@@ -67,13 +67,13 @@
+ 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
+ 
+ glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
+-	$(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
++	$(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
+ glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
+ 	$(CC) $(CFLAGS) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
  
  xrotfontdemo: xrotfontdemo.o xuserotfont.o
--	$(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
-+	$(CC) xrotfontdemo.o xuserotfont.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+-	$(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
++	$(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
  
  xuserotfont.o: xuserotfont.c xuserotfont.h
  	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c

mesa/mesa.spec

@@ -32,15 +32,16 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        XWindow
 License:      LGPL
-Version:      6.4.2
-Release:      20061013
+Version:      6.5
+Release:      20061015
 
 #   package options
 %option       with_demos  no
 
 #   list of sources
-Source0:      http://switch.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
-Source1:      http://switch.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
+Source0:      http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
+Source1:      http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaGLUT-%{version}.tar.bz2
+Source2:      http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
 Patch0:       mesa.patch
 Patch1:       mesa.patch.demos
 
@@ -59,36 +60,43 @@ AutoReqProv:  no
     Silicon Graphics, Inc. (SGI).
 
 %track
-    prog mesa:MesaDemos = {
+    prog mesa:MesaLib = {
         version   = %{version}
         url       = http://prdownloads.sourceforge.net/mesa3d/
-        regex     = MesaDemos-(6\.[02468]\.\d+)\.tar\.bz2
+        regex     = MesaLib-(6\.\d+)\.tar\.bz2
     }
-    prog mesa:MesaLib = {
+    prog mesa:MesaGLUT = {
         version   = %{version}
         url       = http://prdownloads.sourceforge.net/mesa3d/
-        regex     = MesaLib-(6\.[02468]\.\d+)\.tar\.bz2
+        regex     = MesaGLUT-(6\.\d+)\.tar\.bz2
+    }
+    prog mesa:MesaDemos = {
+        version   = %{version}
+        url       = http://prdownloads.sourceforge.net/mesa3d/
+        regex     = MesaDemos-(6\.\d+)\.tar\.bz2
     }
 
 %prep
     %setup -q -n Mesa-%{version}
+    %setup -q -n Mesa-%{version} -T -D -b 1
     %patch -p0
 %if "%{with_demos}" == "yes"
-    %setup -q -n Mesa-%{version} -T -D -b 1
+    %setup -q -n Mesa-%{version} -T -D -b 2
+    chmod 644 progs/demos/glslnoise.c
     %patch -p0 -P 1
-    files=`find . -type f -exec grep "\"\.\.\/images" {} \; -print | grep "^\.\/"`
-    %{l_shtool} subst \
-        -e 's;"\.\./images;"%{l_prefix}/lib/mesa/images;g' \
-        $files
 %endif
+    %{l_shtool} subst \
+        -e "s;@l_x11bindir@;`%{l_rc} --query x11_bindir`;g" \
+        configs/default
 
 %build
     case "%{l_platform -t}" in
-        *-freebsd*   ) plat="freebsd"         ;;
-        *-netbsd*    ) plat="netbsd"          ;;
-        *-linux*     ) plat="linux"           ;;
-        i?86*-sunos* ) plat="solaris-x86-gcc" ;;
-        sun*-sunos*  ) plat="sunos5-gcc"      ;;
+        *-freebsd*   ) plat="freebsd"          ;;
+        *-netbsd*    ) plat="netbsd"           ;;
+        i?86*-linux* ) plat="linux-x86-static" ;;
+        *-linux*     ) plat="linux-static"     ;;
+        i?86*-sunos* ) plat="solaris-x86-gcc"  ;;
+        *-sunos*     ) plat="sunos5-gcc"       ;;
         * ) echo "platform %{l_platform -t} not supported" 2>&1; exit 1; ;;
     esac
     CC="%{l_cc}" \