head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.54 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.52 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.50 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.48 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.46 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.36 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.34 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.32 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.30 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.28 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.26 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.24 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.22 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.20 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.18 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.16 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.14 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.12 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.10 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.8 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.6 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 buildlink2-base:1.8 netbsd-1-5-RELEASE:1.7 netbsd-1-4-PATCH003:1.7 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.6 netbsd-1-4-PATCH001:1.6 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.2; locks; strict; comment @# @; 1.8 date 2000.10.15.11.57.19; author rh; state dead; branches; next 1.7; 1.7 date 2000.04.03.11.15.02; author drochner; state Exp; branches; next 1.6; 1.6 date 99.07.15.15.51.43; author agc; state Exp; branches; next 1.5; 1.5 date 99.04.22.18.37.26; author mycroft; state Exp; branches; next 1.4; 1.4 date 98.09.30.19.46.36; author tron; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.46; author agc; state Exp; branches; next 1.2; 1.2 date 98.03.05.20.56.26; author mycroft; state Exp; branches; next 1.1; 1.1 date 97.11.03.00.42.21; author hubertf; state Exp; branches; next ; desc @@ 1.8 log @Update Mesa to 3.2.1 (changes are bugfixes only) making this a meta package that works under both XFree86-3.x and 4.x (with partially built-in Mesa). @ text @$NetBSD: patch-aa,v 1.7 2000/04/03 11:15:02 drochner Exp $ --- src/X86/assyntax.h.orig Tue Nov 16 00:22:22 1999 +++ src/X86/assyntax.h Mon Apr 3 00:11:38 2000 @@@@ -237,7 +237,8 @@@@ #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) \ || (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) @@@@ -932,7 +933,8 @@@@ #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \ || (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) _ ## a @ 1.7 log @update to Mesa-3.1 changes: many bugfixes, added support - see the changelog core lib has X copyright now libtoolized installs as "libGL", not "libMesaGL" now my change: don't install samples @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Make this package work on Solaris. @ text @d1 4 a4 8 $NetBSD: patch-aa,v 1.5 1999/04/22 18:37:26 mycroft Exp $ NetBSD mods to rely on X11BASE. Solaris mods to rely on X11BASE, and to add the libs that Solaris forgot. --- Make-config.orig Sun Aug 30 04:27:56 1998 +++ Make-config Thu Jul 15 16:37:26 1999 @@@@ -773,13 +773,13 @@@@ d6 9 a14 14 netbsd: $(MAKE) $(MFLAGS) targets \ - "GL_LIB = libMesaGL.so" \ - "GLU_LIB = libMesaGLU.so" \ - "GLUT_LIB = libglut.so" \ + "GL_LIB = libMesaGL.a" \ + "GLU_LIB = libMesaGLU.a" \ + "GLUT_LIB = libglut.a" \ "CC = gcc" \ - "CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100" \ + "CFLAGS = -O2 -fPIC -DSHM -I${X11BASE}/include -DHZ=100" \ "MAKELIB = ../mklib.netbsd" \ - "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" + "XLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lSM -lICE -lXt -lX11" d16 8 a23 27 next: $(MAKE) -f Makefile.NeXT targets \ @@@@ -1002,9 +1002,9 @@@@ "GLU_LIB = libMesaGLU.a" \ "GLUT_LIB = libglut.a" \ "CC = gcc" \ - "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \ - "MAKELIB = ../mklib.ar-ruv" \ - "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi" + "CFLAGS = -O3 -fPIC -I${X11BASE}/include -DSHM -DSOLARIS_2_4_BUG" \ + "MAKELIB = ../mklib.sunos5" \ + "XLIBS = -L${X11BASE}/lib -lX11 -lXext -lXmu -lXi -lsocket -lnsl" sunos5-gcc-sl: $(MAKE) $(MFLAGS) targets \ @@@@ -1012,9 +1012,9 @@@@ "GLU_LIB = libMesaGLU.so" \ "GLUT_LIB = libglut.so" \ "CC = gcc" \ - "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -fPIC -O3 -I${X11BASE}/include -DSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../mklib.sunos5" \ - "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi" + "XLIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lX11 -lXext -lXmu -lXi -lsocket -lnsl" sunos5-x11r6-gcc-sl: $(MAKE) $(MFLAGS) targets \ @ 1.5 log @Fix the X library linkage for the demos, so that this works on he Alpha. From garbled. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 2 --- Make-config.orig Sat Aug 29 20:27:56 1998 +++ Make-config Wed Apr 21 23:58:58 1999 d27 25 a51 1 @ 1.4 log @Update Mesa package to version 3.0. @ text @d3 3 a5 3 --- Make-config.orig Sun Aug 30 05:27:56 1998 +++ Make-config Wed Sep 30 20:23:27 1998 @@@@ -773,9 +773,9 @@@@ d16 2 a17 1 "CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100" \ d19 6 @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 15 a17 57 *** Make-config~ Sat Feb 7 09:17:53 1998 --- Make-config Thu Mar 5 15:27:14 1998 *************** *** 688,696 **** netbsd: $(MAKE) $(MFLAGS) targets \ ! "GL_LIB = libMesaGL.so" \ ! "GLU_LIB = libMesaGLU.so" \ ! "GLUT_LIB = libglut.so" \ ! "TK_LIB = libMesatk.so" \ ! "AUX_LIB = libMesaaux.so" \ "CC = gcc" \ "CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100" \ --- 688,696 ---- netbsd: $(MAKE) $(MFLAGS) targets \ ! "GL_LIB = libMesaGL.a" \ ! "GLU_LIB = libMesaGLU.a" \ ! "GLUT_LIB = libglut.a" \ ! "TK_LIB = libMesatk.a" \ ! "AUX_LIB = libMesaaux.a" \ "CC = gcc" \ "CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100" \ *** mklib.netbsd~ Mon Nov 3 21:55:42 1997 --- mklib.netbsd Thu Mar 5 15:29:05 1998 *************** *** 41,54 **** set -x ! LIBRARY=`basename ${LIBRARY} .so` ! VERSION="${MAJOR}.${MINOR}" ! echo "Building PIC library $LIBRARY" ! rm -f ${LIBRARY}_pic.a ${LIBRARY}.so.${VERSION} ! ar cq ${LIBRARY}_pic.a ${OBJECTS} ! ranlib ${LIBRARY}_pic.a ! ld -x -Bshareable -Bforcearchive -o ${LIBRARY}.so.${VERSION} ${LIBRARY}_pic.a ! cp ${LIBRARY}_pic.a ${LIBRARY}.so.${VERSION} ../lib --- 41,55 ---- set -x ! VERSION=$MAJOR.$MINOR ! BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"` ! SHLIB=${BASENAME}.so.${VERSION} ! STLIB=${BASENAME}.a ! rm -f ${SHLIB} ${STLIB} ! ar cq ${STLIB} ${OBJECTS} ! ranlib ${STLIB} ! ld -Bshareable -o ${SHLIB} ${OBJECTS} ! mv ${SHLIB} ../lib @ 1.2 log @Update for Mesa 2.6. @ text @d1 2 @ 1.1 log @This is the real update for NetBSD and V2.4 @ text @d1 57 a57 11 --- Make-config.BAK Sun Nov 2 04:30:16 1997 +++ Make-config Sun Nov 2 04:30:34 1997 @@@@ -590,7 +590,7 @@@@ "TK_LIB = libMesatk.so.$(VERSION)" \ "AUX_LIB = libMesaaux.so.$(VERSION)" \ "CC = gcc" \ - "CFLAGS = -O2 -m486 -fPIC -I/usr/X11R6/include -DHZ=100" \ + "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100" \ "MAKELIB = ../mklib.netbsd" \ "RANLIB = true" \ "XLIBS = -L/usr/X11R6/lib -lX11" @