head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.1.6.1
	OPENPKG_E1_FP:1.1.6.1
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.1.6.1
	OPENPKG_2_STABLE_20060622:1.1
	OPENPKG_2_STABLE:1.1.0.6
	OPENPKG_2_STABLE_BP:1.1
	OPENPKG_2_5_RELEASE:1.1
	OPENPKG_2_5_SOLID:1.1.0.4
	OPENPKG_2_5_SOLID_BP:1.1
	OPENPKG_2_4_RELEASE:1.1
	OPENPKG_2_4_SOLID:1.1.0.2
	OPENPKG_2_4_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.10.15.11.50.39;	author rse;	state Exp;
branches;
next	1.1;
commitid	lh4I2Oyw4KYb3MQr;

1.1
date	2005.03.24.12.33.55;	author ms;	state Exp;
branches
	1.1.6.1;
next	;

1.1.6.1
date	2006.10.16.14.52.37;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@upgrade to Mesa 6.5 (patches from Michael Schloh)
@
text
@Index: progs/demos/Makefile
diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
--- 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)
 
@@@@ -71,7 +71,7 @@@@
 
 # make executable from .c file:
 .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 #####
@@@@ -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
+++ progs/redbook/Makefile	2005-03-23 20:36:29 +0100
@@@@ -24,7 +24,7 @@@@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@@
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
 
 
 
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,16 +18,18 @@@@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
 
 
 ##### TARGETS #####
 
 default: $(PROGS)
 
+nurb: nurb.c
+	$(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 $@@
 
 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-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$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
 
 
 ##### TARGETS #####
@@@@ -52,10 +52,10 @@@@
 
 # special cases
 pbinfo: pbinfo.o pbutil.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) $(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
@@@@ -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) $(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
@


1.1
log
@abstract demo files to a build option, add default case platform error, correct image paths
@
text
@d3 3
a5 3
--- 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 @@@@
d12 3
d20 1
a20 1
@@@@ -67,7 +67,7 @@@@
d23 3
a25 3
 .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 $@@
d29 17
a45 12
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>
d55 1
a55 1
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d63 1
a63 1
@@@@ -18,7 +18,7 @@@@
d68 1
a68 1
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d71 1
a71 2
 
@@@@ -26,6 +26,8 @@@@
d76 5
a80 1
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d82 2
a83 2
 clean:
 	-rm -f $(PROGS)
d86 3
a88 3
--- 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 @@@@
d93 1
a93 1
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d97 1
a97 1
@@@@ -48,10 +48,10 @@@@
d101 2
a102 2
-	$(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 $@@
d105 2
a106 2
-	$(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 $@@
d110 6
a115 1
@@@@ -64,7 +64,7 @@@@
d117 2
d121 2
a122 2
-	$(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 $@@
@


1.1.6.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d3 3
a5 3
--- 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 @@@@
a11 3
-OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS)
 
d17 1
a17 1
@@@@ -71,7 +71,7 @@@@
d20 3
a22 3
 .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 $@@
d26 12
a37 17
@@@@ -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
d47 1
a47 1
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d55 1
a55 1
@@@@ -18,16 +18,18 @@@@
d60 2
a61 1
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d64 1
a64 1
 ##### TARGETS #####
d69 1
a69 5
+	$(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 $@@
d71 2
a72 2
 sphere.o: sphere.c readtex.h
 	$(CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
d75 3
a77 3
--- 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 @@@@
d82 1
a82 1
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@@
d86 1
a86 1
@@@@ -52,10 +52,10 @@@@
d90 2
a91 2
-	$(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 $@@
d94 2
a95 2
-	$(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 $@@
d99 1
a99 6
@@@@ -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 $@@
a100 2
 glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
 	$(CC) $(CFLAGS) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
d103 2
a104 2
-	$(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 $@@
@