diff -r fa4856f209c2 -r 673ed164f8e5 mesa/mesa.patch.demos
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mesa/mesa.patch.demos	Thu Jan 08 10:18:50 2009 +0100
@@ -0,0 +1,79 @@
+Index: progs/demos/Makefile
+diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
+--- progs/demos/Makefile.orig	2008-08-25 16:46:41.000000000 +0200
++++ progs/demos/Makefile	2008-11-26 21:42:37.000000000 +0100
+@@ -5,17 +5,17 @@
+ 
+ INCDIR = $(TOP)/include
+ 
+-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
++OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
+ 
+-OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
++OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS)
+ 
+-OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
++OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
+ 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+-	$(APP_LIB_DEPS)
++	$(GLUT_LIB_DEPS)
+ 
+ PROGS = \
+ 	arbfplight \
+@@ -125,14 +125,14 @@
+ 
+ 
+ reflect: reflect.o showbuffer.o readtex.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) 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) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@
+ 
+ shadowtex.o: shadowtex.c showbuffer.h
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
+Index: progs/samples/Makefile
+diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
+--- progs/samples/Makefile.orig	2008-08-25 16:46:42.000000000 +0200
++++ progs/samples/Makefile	2008-11-26 21:46:18.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(GLUT_LIB_DEPS)
+ 
+ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
+ 	font line logo nurb olympic overlay point prim quad select \
+@@ -28,6 +28,9 @@
+ default: $(PROGS)
+ 
+ 
++nurb: nurb.c
++	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
++
+ sphere: sphere.o readtex.o
+ 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@
+ 
+Index: progs/xdemos/Makefile
+diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
+--- progs/xdemos/Makefile.orig	2008-08-25 16:46:42.000000000 +0200
++++ progs/xdemos/Makefile	2008-11-26 21:48:28.000000000 +0100
+@@ -8,7 +8,7 @@
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GLUT_LIB_DEPS)
+ 
+ PROGS = \
+ 	corender \