Use the BATCH_SZ macro where appropriate.

Bump driver date.

.gitignore

@@ -1,10 +0,0 @@
-*.a
-*.o
-*.so
-*.sw[a-z]
-*.pc
-*~
-depend
-depend.bak
-lib
-lib64

Makefile

@@ -7,9 +7,7 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
+		(cd $$dir ; $(MAKE)) || exit 1 ; \
 	done
 
 
@@ -18,9 +16,7 @@ doxygen:
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) clean) ; \
-		fi \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
 
 
@@ -38,12 +34,9 @@ realclean:
 
 install:
 	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) install) || exit 1 ; \
-		fi \
+		(cd $$dir ; $(MAKE) install) || exit 1 ; \
 	done
 
-
 # DirectFBGL module installation
 linux-directfb-install:
 	cd src/mesa/drivers/directfb && $(MAKE) install
@@ -67,14 +60,10 @@ aix-64-static \
 aix-gcc \
 aix-static \
 beos \
-bluegene-osmesa \
-bluegene-xlc-osmesa \
-catamount-osmesa-pgi \
 darwin \
-darwin-fat-32bit \
-darwin-fat-all \
 darwin-static \
 darwin-static-x86ppc \
+darwin-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
@@ -103,7 +92,6 @@ linux-alpha-static \
 linux-debug \
 linux-directfb \
 linux-dri \
-linux-dri-debug \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
@@ -155,38 +143,35 @@ sunos5-v8 \
 sunos5-v8-static \
 sunos5-v9 \
 sunos5-v9-static \
-sunos5-v9-cc-g++ \
 ultrix-gcc:
-	@ if test -f configs/current || test -L configs/current ; then \
-		echo "Please run 'make realclean' before changing configs" ; \
-		exit 1 ; \
-	fi
 	(cd configs && rm -f current && ln -s $@ current)
 	$(MAKE) default
 
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.0.3
-LIB_NAME = MesaLib-7.0.3
-DEMO_NAME = MesaDemos-7.0.3
-GLUT_NAME = MesaGLUT-7.0.3
+DIRECTORY = Mesa-6.5.1
+LIB_NAME = MesaLib-6.5.1
+DEMO_NAME = MesaDemos-6.5.1
+GLUT_NAME = MesaGLUT-6.5.1
 
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
 	$(DIRECTORY)/descrip.mms					\
 	$(DIRECTORY)/mms-config.					\
 	$(DIRECTORY)/bin/mklib						\
-	$(DIRECTORY)/bin/minstall					\
+	$(DIRECTORY)/bin/installmesa					\
 	$(DIRECTORY)/configs/[a-z]*					\
 	$(DIRECTORY)/docs/*.html					\
 	$(DIRECTORY)/docs/COPYING					\
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
+	$(DIRECTORY)/docs/VERSIONS					\
 	$(DIRECTORY)/docs/*.spec					\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/amesa.h					\
 	$(DIRECTORY)/include/GL/dmesa.h					\
+	$(DIRECTORY)/include/GL/directfbgl.h				\
 	$(DIRECTORY)/include/GL/fxmesa.h				\
 	$(DIRECTORY)/include/GL/ggimesa.h				\
 	$(DIRECTORY)/include/GL/gl.h					\
@@ -214,41 +199,28 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/Makefile*					\
 	$(DIRECTORY)/src/mesa/sources					\
 	$(DIRECTORY)/src/mesa/descrip.mms				\
-	$(DIRECTORY)/src/mesa/gl.pc.in					\
 	$(DIRECTORY)/src/mesa/depend					\
 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
-	$(DIRECTORY)/src/mesa/main/sources				\
 	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
 	$(DIRECTORY)/src/mesa/glapi/descrip.mms				\
-	$(DIRECTORY)/src/mesa/glapi/sources				\
+	$(DIRECTORY)/src/mesa/array_cache/*.[ch]			\
+	$(DIRECTORY)/src/mesa/array_cache/descrip.mms			\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
 	$(DIRECTORY)/src/mesa/math/descrip.mms				\
-	$(DIRECTORY)/src/mesa/math/sources				\
 	$(DIRECTORY)/src/mesa/shader/*.[ch]				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/sources				\
 	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/grammar/descrip.mms		\
-	$(DIRECTORY)/src/mesa/shader/grammar/sources			\
 	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/slang/sources			\
 	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
-	$(DIRECTORY)/src/mesa/shader/slang/library/*.gc			\
-	$(DIRECTORY)/src/mesa/shader/slang/library/*.syn		\
-	$(DIRECTORY)/src/mesa/shader/slang/library/Makefile		\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
-	$(DIRECTORY)/src/mesa/swrast/sources				\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
 	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
-	$(DIRECTORY)/src/mesa/swrast_setup/sources			\
-	$(DIRECTORY)/src/mesa/vbo/*.[chS]				\
-	$(DIRECTORY)/src/mesa/vbo/descrip.mms				\
 	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
 	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
-	$(DIRECTORY)/src/mesa/tnl/sources				\
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
@@ -256,7 +228,6 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
-	$(DIRECTORY)/src/mesa/drivers/common/sources			\
 	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
@@ -277,7 +248,6 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
-	$(DIRECTORY)/src/mesa/drivers/x11/sources			\
 	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
 	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
 	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
@@ -294,15 +264,17 @@ MAIN_FILES = \
 	$(DIRECTORY)/vms/analyze_map.com				\
 	$(DIRECTORY)/vms/xlib.opt					\
 	$(DIRECTORY)/vms/xlib_share.opt					\
-	$(DIRECTORY)/windows/VC8/mesa/mesa.sln				\
-	$(DIRECTORY)/windows/VC8/mesa/gdi/gdi.vcproj			\
-	$(DIRECTORY)/windows/VC8/mesa/glu/glu.vcproj			\
-	$(DIRECTORY)/windows/VC8/mesa/mesa/mesa.vcproj			\
-	$(DIRECTORY)/windows/VC8/mesa/osmesa/osmesa.vcproj		\
-	$(DIRECTORY)/windows/VC8/progs/progs.sln			\
-	$(DIRECTORY)/windows/VC8/progs/demos/gears.vcproj		\
-	$(DIRECTORY)/windows/VC8/progs/glut/glut.vcproj
-
+	$(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp			\
+	$(DIRECTORY)/windows/VC6/mesa/glu/*.txt				\
+	$(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp			\
+	$(DIRECTORY)/windows/VC6/mesa/mesa.dsw				\
+	$(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp			\
+	$(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp			\
+	$(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj			\
+	$(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj			\
+	$(DIRECTORY)/windows/VC7/mesa/mesa.sln				\
+	$(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj			\
+	$(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj
 
 DRI_FILES = \
 	$(DIRECTORY)/include/GL/internal/dri_interface.h		\
@@ -322,9 +294,7 @@ DRI_FILES = \
 SGI_GLU_FILES = \
 	$(DIRECTORY)/src/glu/Makefile					\
 	$(DIRECTORY)/src/glu/descrip.mms				\
-	$(DIRECTORY)/src/glu/glu.pc.in					\
 	$(DIRECTORY)/src/glu/sgi/Makefile				\
-	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
 	$(DIRECTORY)/src/glu/sgi/glu.def				\
@@ -356,7 +326,6 @@ GLW_FILES = \
 	$(DIRECTORY)/src/glw/*.[ch]			\
 	$(DIRECTORY)/src/glw/Makefile*			\
 	$(DIRECTORY)/src/glw/README			\
-	$(DIRECTORY)/src/glw/glw.pc.in			\
 	$(DIRECTORY)/src/glw/depend
 
 DEMO_FILES = \
@@ -370,8 +339,6 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
-	$(DIRECTORY)/progs/fbdev/Makefile		\
-	$(DIRECTORY)/progs/fbdev/glfbdevtest.c		\
 	$(DIRECTORY)/progs/osdemos/Makefile		\
 	$(DIRECTORY)/progs/osdemos/*.c			\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
@@ -383,9 +350,6 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/samples/Makefile*		\
 	$(DIRECTORY)/progs/samples/README		\
 	$(DIRECTORY)/progs/samples/*.c			\
-	$(DIRECTORY)/progs/glsl/Makefile*		\
-	$(DIRECTORY)/progs/glsl/*.c			\
-	$(DIRECTORY)/progs/glsl/*.txt			\
 	$(DIRECTORY)/progs/windml/Makefile.ugl		\
 	$(DIRECTORY)/progs/windml/*.c			\
 	$(DIRECTORY)/progs/windml/*.bmp			\
@@ -400,7 +364,6 @@ GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
 	$(DIRECTORY)/src/glut/glx/depend		\
-	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
 	$(DIRECTORY)/src/glut/glx/*def			\
 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
 	$(DIRECTORY)/src/glut/glx/mms_depend		\
@@ -414,12 +377,8 @@ GLUT_FILES = \
 	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
 	$(DIRECTORY)/src/glut/ggi/Makefile		\
 	$(DIRECTORY)/src/glut/fbdev/Makefile		\
-	$(DIRECTORY)/src/glut/fbdev/*[ch]		\
-	$(DIRECTORY)/src/glut/mini/*[ch]		\
-	$(DIRECTORY)/src/glut/mini/glut.pc.in		\
-	$(DIRECTORY)/src/glut/directfb/Makefile		\
-	$(DIRECTORY)/src/glut/directfb/NOTES		\
-	$(DIRECTORY)/src/glut/directfb/*[ch]		\
+	$(DIRECTORY)/src/glut/fbdev/cursors.h		\
+	$(DIRECTORY)/src/glut/fbdev/glut_fbdev.c	\
 	$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp	\
 	$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
 

Makefile.mgw

@@ -51,59 +51,37 @@
 #	realclean:	remove all generated files
 #
 
-# MinGW core makefile updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) MAlthough more tests are needed, it can be used individually!
 
 
 .PHONY : all libgl clean realclean
 
 ifeq ($(ICD),1)
   # when -std=c99 mingw will not define WIN32
-  CFLAGS = -Wall -Werror
+  CFLAGS = -Wall -W -Werror
 else
   # I love c89
-  CFLAGS = -Wall -pedantic
+  CFLAGS = -Wall -W -pedantic
 endif
 CFLAGS += -O2 -ffast-math
 
 export CFLAGS
 
-
 ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
 UNLINK = del $(subst /,\,$(1))
 else
 UNLINK = $(RM) $(1)
 endif
 
-all: libgl libglu libglut example
+all: libgl
 
 libgl: lib
 	$(MAKE) -f Makefile.mgw -C src/mesa
 
-libglu: libgl
-	$(MAKE) -f Makefile.mgw -C src/glu/sgi
-
-libglut: libglu 
-	$(MAKE) -f Makefile.mgw -C src/glut/glx
-
-example: libglut 
-	$(MAKE) -f Makefile.mgw star -C progs/samples
-	copy progs\samples\star.exe lib
-
 lib:
 	mkdir lib
 
 clean:
 	$(MAKE) -f Makefile.mgw clean -C src/mesa
-	$(MAKE) -f Makefile.mgw clean -C src/glu/sgi
-	$(MAKE) -f Makefile.mgw clean -C src/glut/glx
 
 realclean: clean
 	-$(call UNLINK,lib/*.a)

bin/installmesa

@@ -62,10 +62,10 @@ fi
 
 set -v
 
-mkdir -p ${INCLUDE_DIR}
-mkdir -p ${INCLUDE_DIR}/GL
-# NOT YET: mkdir -p ${INCLUDE_DIR}/GLES
-mkdir -p ${LIB_DIR}
+mkdir ${INCLUDE_DIR}
+mkdir ${INCLUDE_DIR}/GL
+# NOT YET: mkdir ${INCLUDE_DIR}/GLES
+mkdir ${LIB_DIR}
 cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
 cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
 # NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES

bin/minstall

@@ -1,89 +0,0 @@
-#!/bin/sh
-
-
-# A minimal replacement for 'install' that supports installing symbolic links.
-# Only a limited number of options are supported:
-# -d dir          Create a directory
-# -m mode         Sets a file's mode when installing
-
-
-# If these commands aren't portable, we'll need some "if (arch)" type stuff
-SYMLINK="ln -s"
-MKDIR="mkdir -p"
-RM="rm -f"
-
-MODE=""
-
-if [ "$1" = "-d" ] ; then
-	# make a directory path
-	$MKDIR "$2"
-	exit 0
-fi
-
-if [ "$1" = "-m" ] ; then
-	# set file mode
-	MODE=$2
-	shift 2
-fi
-
-# install file(s) into destination
-if [ $# -ge 2 ] ; then
-
-	# Last cmd line arg is the dest dir
-	for FILE in $@ ; do
-		DEST="$FILE"
-	done
-
-	# Loop over args, moving them to DEST directory
-	I=1
-	for FILE in $@ ; do
-		if [ $I = $# ] ; then
-			# stop, don't want to install $DEST into $DEST
-			exit 0
-		fi
-
-		# determine file's type
-		if [ -h "$FILE" ] ; then
-			#echo $FILE is a symlink
-			# Unfortunately, cp -d isn't universal so we have to
-			# use a work-around.
-
-			# Use ls -l to find the target that the link points to
-			LL=`ls -l "$FILE"`
-			for L in $LL ; do
-				TARGET=$L
-			done
-			#echo $FILE is a symlink pointing to $TARGET
-
-			FILE=`basename "$FILE"`
-			# Go to $DEST and make the link
-			PWDSAVE="$PWD"
-			cd "$DEST"        # pushd
-				$RM "$FILE"
-				$SYMLINK "$TARGET" "$FILE"
-			cd "$PWDSAVE"     # popd
-
-		elif [ -f "$FILE" ] ; then
-			#echo "$FILE" is a regular file
-			$RM "$DEST/`basename $FILE`"
-			cp "$FILE" "$DEST"
-			if [ $MODE ] ; then
-				FILE=`basename "$FILE"`
-				chmod $MODE "$DEST/$FILE"
-			fi
-		else
-			echo "Unknown type of argument: " "$FILE"
-			exit 1
-		fi
-
-		I=`expr $I + 1`
-	done
-
-	exit 0
-fi
-
-# If we get here, we didn't find anything to do
-echo "Usage:"
-echo "  install -d dir                      Create named directory"
-echo "  install [-m mode] file [...] dest   Install files in destination"
-

bin/mklib

@@ -34,7 +34,6 @@ MINOR=0
 PATCH=""
 DEPS=""
 LINK=""
-LDFLAGS=""
 CPLUSPLUS=0
 STATIC=0
 DLOPEN=0
@@ -64,14 +63,12 @@ do
 	    echo '  -LDIR         search in DIR for library dependencies'
 	    echo '  -linker L     explicity specify the linker program to use (eg: gcc, g++)'
 	    echo '                Not observed on all systems at this time.'
-	    echo '  -ldflags OPT  specify any additional linker flags in OPT'
 	    echo '  -cplusplus    link with C++ runtime'
 	    echo '  -static       make a static library (default is dynamic/shared)'
 	    echo '  -dlopen       make a shared library suitable for dynamic loading'
 	    echo '  -install DIR  put resulting library file(s) in DIR'
 	    echo '  -arch ARCH    override using `uname` to determine host system'
 	    echo '  -archopt OPT  specify an extra achitecture-specific option OPT'
-	    echo '  -altopts OPTS alternate options to override all others'
 	    echo "  -noprefix     don't prefix library name with 'lib' nor add any suffix"
 	    echo '  -exports FILE only export the symbols listed in FILE'
 	    echo '  -h, --help    display this information and exit'
@@ -97,23 +94,12 @@ do
 	    shift 1;
 	    LINK=$1
 	    ;;
-	'-ldflags')
-	    shift 1;
-	    LDFLAGS=$1
-	    ;;
 	-l*)
 	    DEPS="$DEPS $1"
 	    ;;
 	-L*)
 	    DEPS="$DEPS $1"
 	    ;;
-	-pthread)
-	    # this is a special case (see bugzilla 10876)
-	    DEPS="$DEPS $1"
-	    ;;
-	'-pthread')
-	    DEPS="$DEPS -pthread"
-	    ;;
 	'-cplusplus')
 	    CPLUSPLUS=1
 	    ;;
@@ -135,10 +121,6 @@ do
 	    shift 1;
 	    ARCHOPT=$1
 	    ;;
-	'-altopts')
-            shift 1;
-            ALTOPTS=$1
-            ;;
 	'-noprefix')
 	    NOPREFIX=1
 	    ;;
@@ -213,13 +195,8 @@ case $ARCH in
 	if [ $NOPREFIX = 1 ] ; then
 	    # No "lib" or ".so" part
 	    echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
-	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
-		OPTS="-Xlinker -Bsymbolic -shared"
-	    ;;
-	    *)
-		OPTS="-shared"
-	    ;;
-	    esac
+	    #OPTS="-shared -Wl,-soname,${LIBNAME}"  # soname???
+	    OPTS="-shared"
 
 	    # Check if objects are 32-bit and we're running in 64-bit
 	    # environment.  If so, pass -m32 flag to linker.
@@ -229,29 +206,21 @@ case $ARCH in
 		OPTS="-m32 ${OPTS}"
 	    fi
 
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
-
             rm -f ${LIBNAME}
             # make lib
-            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+            ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
             # finish up
             FINAL_LIBS="${LIBNAME}"
         elif [ $STATIC = 1 ] ; then
-            LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
-            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
+            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
             LINK="ar"
             OPTS="-ru"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
-            rm -f ${LIBNAME}
             # make lib
-            ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
-            ranlib ${LIBNAME}
+            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
+	    ranlib ${LIBNAME}.a
             # finish up
-            FINAL_LIBS=${LIBNAME}
+            FINAL_LIBS=${LIBNAME}.a
         else
 	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
 	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
@@ -281,9 +250,6 @@ case $ARCH in
 	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 		OPTS="-m32 ${OPTS}"
 	    fi
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
 
 	    if [ x${PATCH} = "x" ] ; then
 		VERSION="${MAJOR}.${MINOR}"
@@ -299,7 +265,7 @@ case $ARCH in
             rm -f ${LIBNAME}.so
 
             # make lib
-            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+            ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
             # make usual symlinks
             ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
             ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
@@ -317,9 +283,7 @@ case $ARCH in
 	    ar -ruv ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
-	    if [ $NOPREFIX = 0 ] ; then
-		LIBNAME="lib${LIBNAME}.so"
-	    fi
+	    LIBNAME="lib${LIBNAME}.so"
 	    echo "mklib: Making SunOS shared library: " ${LIBNAME}
 
 	    if [ "x$LINK" = "x" ] ; then
@@ -366,19 +330,12 @@ case $ARCH in
 	    if [ "${SPARCV9}" ] ; then
 		OPTS="${OPTS} -xarch=v9"
 	    fi
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
+
 	    # for debug:
 	    #echo "mklib: linker is" ${LINK} ${OPTS}
-	    if [ $NOPREFIX = 1 ] ; then
-		rm -f ${LIBNAME}
-		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
-	    else
-		rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
-		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
-		ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
-	    fi
+	    rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
+	    ${LINK} ${OPTS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
+	    ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
 	    FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
 	fi
 	;;
@@ -399,11 +356,8 @@ case $ARCH in
 	    # No "lib" or ".so" part
 	    echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
 	    OPTS="-shared"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
 	    rm -f ${LIBNAME}
-	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+	    ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS=${LIBNAME}
         elif [ $STATIC = 1 ] ; then
 	    STLIB="lib${LIBNAME}.a"
@@ -415,12 +369,9 @@ case $ARCH in
 	else
 	    SHLIB="lib${LIBNAME}.so.${MAJOR}"
 	    OPTS="-shared -Wl,-soname,${SHLIB}"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
 	    echo "mklib: Making FreeBSD shared library: " ${SHLIB}
 	    rm -f ${SHLIB}
-	    ${LINK} ${OPTS} ${LDFLAGS} -o ${SHLIB} ${OBJECTS} ${DEPS}
+	    ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
 	    ln -sf ${SHLIB} "lib${LIBNAME}.so"
 	    FINAL_LIBS="${SHLIB} lib${LIBNAME}.so"
 	fi
@@ -471,10 +422,6 @@ case $ARCH in
 		exit 1
 	    fi
 
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
-
 	    if [ $CPLUSPLUS = 1 ] ; then
 		LINK="CC"
 	    else
@@ -482,7 +429,7 @@ case $ARCH in
 	    fi
 
 	    echo "mklib: Making IRIX " ${ABI} " shared library: " ${LIBNAME}
-	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+	    ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	;;
@@ -555,16 +502,12 @@ case $ARCH in
 		}
 	    }' | sort -u >> ${EXPFILE}
 
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
-
             # On AIX a shared library is linked differently when
             # you want to dlopen the file
 	    if [ $DLOPEN = "1" ] ; then
-		cc -G ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+		cc -G ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    else
-		cc ${OPTS} ${LDFLAGS} -o ${OFILE} ${OBJECTS} ${DEPS}
+		cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
 		ar ${X64} -r ${LIBNAME} ${OFILE}
 	    fi
 
@@ -610,9 +553,6 @@ case $ARCH in
             echo "mklib: Making Darwin static library: " ${LIBNAME}
             LINK="ar"
             OPTS="-ruvs"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
             ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
             FINAL_LIBS=${LIBNAME}
         else
@@ -624,37 +564,19 @@ case $ARCH in
 		LIBSUFFIX="dylib"
                 OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
             fi
-
-            if [ ${EXPORTS} ] ; then
-                OPTS="${OPTS} -exported_symbols_list ${EXPORTS}"
-            fi 
-
-            LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
-            LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}"
-            LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}"
+            LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
+            LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
 
 	    # examine first object to determine ABI
     	    set ${OBJECTS}
-            ABI_PPC=`file $1 | grep ' ppc'`
-            ABI_I386=`file $1 | grep ' i386'`
-            ABI_PPC64=`file $1 | grep ' ppc64'`
-            ABI_X86_64=`file $1 | grep ' x86_64'`
-            if [ "${ABI_PPC}" ] ; then
-                OPTS="${OPTS} -arch ppc"
-            fi
-            if [ "${ABI_I386}" ] ; then
-                OPTS="${OPTS} -arch i386"
-            fi
-            if [ "${ABI_PPC64}" ] ; then
-                OPTS="${OPTS} -arch ppc64"
-            fi
-            if [ "${ABI_X86_64}" ] ; then
-                OPTS="${OPTS} -arch x86_64"
-            fi
-
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
+	    ABI_PPC=`file $1 | grep 'object ppc'`
+	    ABI_I386=`file $1 | grep 'object i386'`
+	    if [ "${ABI_PPC}" ] ; then
+		OPTS="${OPTS} -arch ppc"
+	    fi
+	    if [ "${ABI_I386}" ] ; then
+		OPTS="${OPTS} -arch i386"
+	    fi
 
 	    # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
 	    # to OPTS here?
@@ -667,11 +589,9 @@ case $ARCH in
 	    fi
 
             echo "mklib: Making Darwin shared library: " ${LIBNAME}
-
-            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+            ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
             ln -s ${LIBNAME} ${LINKNAME}
-            ln -s ${LIBNAME} ${LINKNAME2}
-            FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
+            FINAL_LIBS="${LIBNAME} ${LINKNAME}"
         fi
         ;;
 
@@ -723,9 +643,6 @@ case $ARCH in
             echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a
             LINK="ar"
             OPTS="-ruv"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
             # make lib
             ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
             # finish up
@@ -736,9 +653,6 @@ case $ARCH in
             else
                  OPTS="-shared"
             fi
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
             VERSION="${MAJOR}.${MINOR}.${PATCH}"
             echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
 
@@ -752,7 +666,7 @@ case $ARCH in
             rm -f ${LIBNAME}.so.${MAJOR}
             rm -f ${LIBNAME}.so
             # make lib
-            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+            ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
             # make usual symlinks
             ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
             ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
@@ -803,9 +717,6 @@ case $ARCH in
             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
             LINK="ar"
             OPTS="-ru"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
             # make lib
             ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
 	    ranlib ${LIBNAME}.a
@@ -813,9 +724,6 @@ case $ARCH in
             FINAL_LIBS=${LIBNAME}.a
         else
 	    OPTS="-shared -Wl,-export-all -Wl,--out-implib=${LIBNAME}-${MAJOR}.dll.a"
-            if [ "${ALTOPTS}" ] ; then
-                OPTS=${ALTOPTS}
-            fi
             echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}-${MAJOR}.dll
 
             if [ $CPLUSPLUS = 1 ] ; then
@@ -830,7 +738,7 @@ case $ARCH in
             rm -f ${LIBNAME}.a
 
             # make lib
-            ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
+            ${LINK} ${OPTS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
             # make usual symlinks
             ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
             # finish up

configs/.gitignore

@@ -1 +0,0 @@
-current

configs/aix

@@ -13,6 +13,7 @@ CXXFLAGS = -O -DAIXV3 -DPTHREADS
 
 # Misc tools and flags
 MKLIB_OPTIONS =
+COPY_LIBS = cp -f -h
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a

configs/aix-gcc

@@ -11,10 +11,6 @@ CXX = g++
 CFLAGS = -O2 -DAIXV3
 CXXFLAGS = -O2 -DAIXV3
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 MKLIB_OPTIONS = -arch aix-gcc
 GL_LIB_DEPS = -lX11 -lXext -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm

configs/beos

@@ -39,10 +39,6 @@ ifeq ($(CPU), x86)
 
 	CXXFLAGS = $(CFLAGS)
 
-	# Work around aliasing bugs - developers should comment this out
-	CFLAGS += -fno-strict-aliasing
-	CXXFLAGS += -fno-strict-aliasing
-
 	LDFLAGS += -Xlinker
 
 	ifdef DEBUG

configs/bluegene-osmesa

@@ -1,33 +0,0 @@
-# Configuration for building only libOSMesa on BlueGene, no Xlib driver
-# This doesn't really have a lot of dependencies, so it should be usable
-# on other (gcc-based) systems too.
-# It uses static linking and disables multithreading.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = bluegene-osmesa
-
-# Compiler and flags
-CC = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-gcc
-CXX = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURC
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MKLIB_OPTIONS = -static
-
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU -lm

configs/bluegene-xlc-osmesa

@@ -1,29 +0,0 @@
-# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
-# This doesn't really have a lot of dependencies, so it should be usable
-# on similar systems too.
-# It uses static linking and disables multithreading.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = bluegene-osmesa
-
-# Compiler and flags
-CC = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlc
-CXX = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlC
-CFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-CXXFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-MKLIB_OPTIONS = -static
-
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU -lm

configs/catamount-osmesa-pgi

@@ -1,32 +0,0 @@
-# Configuration for building only libOSMesa on Cray Xt3
-# for the compute nodes running Catamount using the 
-# Portland Group compiler. The Portland Group toolchain has to be 
-# enabled before using "module switch PrgEnv-gnu PrgEnv-pgi" .
-# This doesn't really have a lot of dependencies, so it should be usable
-# on other similar systems too.
-# It uses static linking and disables multithreading.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = catamount-osmesa-pgi
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta   -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-CXXFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-MKLIB_OPTIONS = -static
-
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU -lm

configs/darwin

@@ -4,22 +4,11 @@ include $(TOP)/configs/default
 
 CONFIG_NAME = darwin
 
-DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
-	  -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE \
-	  -DPTHREADS -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
-
 # Compiler and flags
-CC = gcc
-CXX = gcc
-CFLAGS = -I/usr/X11/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin $(DEFINES)
-CXXFLAGS = -I/usr/X11/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin $(DEFINES)
-
-CFLAGS += $(RC_CFLAGS)
-CXXFLAGS += $(RC_CFLAGS)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
+CC = cc
+CXX = cc
+CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.dylib
@@ -28,13 +17,13 @@ GLUT_LIB_NAME = libglut.dylib
 GLW_LIB_NAME = libGLw.dylib
 OSMESA_LIB_NAME = libOSMesa.dylib
 
-GL_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lm -lpthread
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
 GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11/lib -lX11 -lXmu -lXt -lXi -lm
+APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = glx/x11 glu glut/glx mesa
-DRIVER_DIRS = osmesa
+SRC_DIRS = mesa glu glut/glx
+

configs/darwin-fat-32bit

@@ -1,7 +0,0 @@
-# Configuration for Darwin / MacOS X, making 32bit fat dynamic libs
-
-RC_CFLAGS=-arch ppc -arch i386
-
-include $(TOP)/configs/darwin
-
-CONFIG_NAME = darwin-fat-32bit

configs/darwin-fat-all

@@ -1,7 +0,0 @@
-# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs
-
-RC_CFLAGS=-arch ppc -arch i386 -arch ppc64 -arch x86_64
-
-include $(TOP)/configs/darwin
-
-CONFIG_NAME = darwin-fat-all

configs/darwin-static

@@ -9,10 +9,6 @@ CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpen
 CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 MKLIB_OPTIONS = -static
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a

configs/darwin-static-x86ppc

@@ -11,10 +11,6 @@ CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
            -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a

configs/darwin-x86ppc

@@ -0,0 +1,33 @@
+# Configuration for Darwin / MacOS X, making dynamic libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = darwin
+
+# Compiler and flags
+CC = cc
+CXX = cc
+CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+
+MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+
+# Library names (actual file names)
+GL_LIB_NAME = libGL.dylib
+GLU_LIB_NAME = libGLU.dylib
+GLUT_LIB_NAME = libglut.dylib
+GLW_LIB_NAME = libGLw.dylib
+OSMESA_LIB_NAME = libOSMesa.dylib
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
+GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
+APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+
+# omit glw lib for now:
+SRC_DIRS = mesa glu glut/glx
+

configs/default

@@ -8,9 +8,9 @@
 CONFIG_NAME = default
 
 # Version info
-MESA_MAJOR=7
-MESA_MINOR=0
-MESA_TINY=3
+MESA_MAJOR=6
+MESA_MINOR=5
+MESA_TINY=1
 
 # external projects.  This should be useless now that we use libdrm.
 DRM_SOURCE_PATH=$(TOP)/../drm
@@ -20,7 +20,6 @@ CC = cc
 CXX = CC
 CFLAGS = -O
 CXXFLAGS = -O
-LDFLAGS =
 GLU_CFLAGS = 
 
 # Misc tools and flags
@@ -28,13 +27,12 @@ MKLIB_OPTIONS =
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
-INSTALL = $(TOP)/bin/minstall
+INSTALL = install
+COPY_LIBS = cp -f -d
 
-# Tools for regenerating glapi (generally only needed by the developers)
+# Python and flags (generally only needed by the developers)
 PYTHON2 = python
 PYTHON_FLAGS = -t -O -O
-INDENT = indent
-INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
 
 # Library names (base name)
 GL_LIB = GL
@@ -66,19 +64,17 @@ SRC_DIRS = mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples glsl xdemos
+PROGRAM_DIRS = demos redbook samples xdemos
 
 
-# Library dependencies
-#EXTRA_LIB_PATH ?=
+# Library/program dependencies
+EXTRA_LIB_PATH ?=
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
-
-# Program dependencies - specific GL/glut libraries added in Makefiles
-APP_LIB_DEPS = -lm
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 
 
 

configs/freebsd

@@ -9,11 +9,13 @@ CC = cc
 CXX = c++
 MAKE = gmake
 
+# cp -d not supported on FreeBSD (see bug 4435)
+COPY_LIBS = cp -f
+
 OPT_FLAGS  = -O2
 PIC_FLAGS  = -fPIC
 
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
-	-DHZ=100
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM -DHZ=100
 
 X11_INCLUDES = -I/usr/X11R6/include
 
@@ -23,9 +25,5 @@ CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
 
 GLUT_CFLAGS = -fexceptions
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 EXTRA_LIB_PATH = -L/usr/X11R6/lib
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm

configs/freebsd-dri

@@ -14,29 +14,22 @@ OPT_FLAGS = -O
 EXPAT_INCLUDES = -I/usr/local/include
 X11_INCLUDES = -I/usr/X11R6/include
 DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS
+	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
 
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
+CFLAGS = -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math \
 	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
 
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
+CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
 
 ASM_SOURCES = 
 
 # Library/program dependencies
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-	-lm -pthread $(LIBDRM_LIB)
+DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB)
 
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
 
 
 # Directories
@@ -49,6 +42,6 @@ DRM_SOURCE_PATH=$(TOP)/../drm
 
 # ffb and gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon tdfx \
 	   unichrome savage sis
 

configs/hpux10

@@ -8,7 +8,7 @@ CONFIG_NAME = hpux10
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
+CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
+CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
 
 APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

configs/hpux10-gcc

@@ -12,9 +12,5 @@ CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/incl
 CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
 GLUT_CFLAGS = -fexceptions
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
 

configs/hpux10-static

@@ -8,8 +8,8 @@ CONFIG_NAME = hpux10-static
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
+CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
+CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
 
 MKLIB_OPTIONS = -static
 

configs/hpux11-32

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-32
 CC = cc
 CXX = aCC
 
-CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS =
 

configs/hpux11-32-static

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-32-static
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +O3 +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS = -static
 

configs/hpux11-32-static-nothreads

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-32-static
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
+CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 
-CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
+CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 
 MKLIB_OPTIONS = -static
 

configs/hpux11-64

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-64
 CC = cc
 CXX = aCC
 
-CFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS =
 

configs/hpux11-64-static

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-64-static
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +O3 +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS = -static
 

configs/hpux11-ia64

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-ia64
 CC = cc
 CXX = aCC
 
-CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +z -Ae +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +z -Aa +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS =
 

configs/hpux11-ia64-static

@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-ia64-static
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS = -static
 

configs/hpux9

@@ -9,8 +9,8 @@ CC = cc
 # XXX fix this
 CXX = c++
 
-CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
-CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
+CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
+CXXFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
 
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm
 

configs/hpux9-gcc

@@ -8,7 +8,7 @@ CONFIG_NAME = hpux9-gcc
 CC = cc
 CXX = aCC
 
-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
+CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
+CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
 
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

configs/linux

@@ -17,8 +17,7 @@ PIC_FLAGS  = -fPIC
 ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
+	-D_BSD_SOURCE -DPTHREADS -DUSE_XSHM
 
 X11_INCLUDES = -I/usr/X11R6/include
 
@@ -28,10 +27,6 @@ CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(X11_INCLUDES) 
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 GLUT_CFLAGS = -fexceptions
 
 EXTRA_LIB_PATH = -L/usr/X11R6/lib

configs/linux-alpha

@@ -11,10 +11,6 @@ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
 GLUT_CFLAGS = -fexceptions
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11

configs/linux-alpha-static

@@ -11,11 +11,7 @@ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
-PIC_FLAGS =
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a

configs/linux-directfb

@@ -13,10 +13,6 @@ CFLAGS   = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D
 
 CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE   
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
 ifeq ($(HAVE_X86), yes)
      CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM

configs/linux-dri

@@ -22,8 +22,7 @@ ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
 
 X11_INCLUDES = -I/usr/X11R6/include
 
@@ -32,22 +31,15 @@ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
-GLUT_CFLAGS = -fexceptions
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 ASM_SOURCES = 
 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-		-lm -lpthread -ldl \
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
                 $(LIBDRM_LIB)
 
 
@@ -60,10 +52,10 @@ USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl xdemos
+PROGRAM_DIRS = egl
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = xdemos
+PROGRAM_DIRS =
 endif
 
 DRIVER_DIRS = dri
@@ -71,5 +63,5 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome ffb

configs/linux-dri-debug

@@ -1,16 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri-debug: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-debug
-OPT_FLAGS  = -O0 -g
-ARCH_FLAGS = -DDEBUG
-
-# Helpful to reduce the amount of stuff that gets built sometimes:
-#DRI_DIRS = i915tex i915 
-#DRI_DIRS = i965
-#DRI_DIRS = radeon r200 r300
-#DRI_DIRS = unichrome sis trident
-#DRI_DIRS = i810 mga r128 tdfx
-

configs/linux-dri-x86

@@ -5,6 +5,9 @@ include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-x86
 
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
+
 # Add -m32 to CFLAGS:
 ARCH_FLAGS = -m32
 

configs/linux-dri-x86-64

@@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 # the new interface.  i810 are missing because there is no x86-64
 # system where they could *ever* be used.
 #
-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
+DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
 

configs/linux-dri-xcb

@@ -22,31 +22,25 @@ ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-        -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
+	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB
 
-X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
+X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx`
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
 
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 ASM_SOURCES = 
 
 # Library/program dependencies
 EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
 
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-		-lm -lpthread -ldl $(LIBDRM_LIB) `pkg-config --libs xcb` \
-		`pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
+                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs xcb-glx`
 
 
 # This is now 0 by default since it seems to confuse the hell out of people
@@ -58,10 +52,10 @@ USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl xdemos
+PROGRAM_DIRS = egl
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = xdemos
+PROGRAM_DIRS =
 endif
 
 DRIVER_DIRS = dri
@@ -70,4 +64,4 @@ WINDOW_SYSTEM=dri
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb nouveau
+	savage sis tdfx trident unichrome ffb

configs/linux-fbdev

@@ -3,17 +3,8 @@
 include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-fbdev
+DRIVER_DIRS = fbdev
 
-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-
-SRC_DIRS = mesa glu glut/fbdev
-DRIVER_DIRS = fbdev osmesa
-PROGRAM_DIRS = fbdev demos redbook samples
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
-OSMESA_LIB_DEPS = -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
+CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DUSE_GLFBDEV_DRIVER
 
+PROGRAM_DIRS = fbdev

configs/linux-glide

@@ -12,9 +12,6 @@ CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread

configs/linux-indirect

@@ -23,8 +23,7 @@ ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DGLX_INDIRECT_RENDERING \
-	-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+	-DPTHREADS -DHAVE_ALIAS
 
 X11_INCLUDES = -I/usr/X11R6/include
 
@@ -33,9 +32,6 @@ CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 ASM_SOURCES = 
 

configs/linux-osmesa

@@ -12,9 +12,6 @@ CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 # Directories
 SRC_DIRS = mesa glu

configs/linux-osmesa16

@@ -10,9 +10,6 @@ CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 # Library names
 OSMESA_LIB = OSMesa16

configs/linux-osmesa16-static

@@ -10,11 +10,7 @@ CXX = g++
 CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
-PIC_FLAGS =
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 # Library names
 OSMESA_LIB = OSMesa16

configs/linux-osmesa32

@@ -10,9 +10,6 @@ CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 # Library names
 OSMESA_LIB = OSMesa32

configs/linux-ppc-static

@@ -5,7 +5,6 @@ include $(TOP)/configs/linux-ppc
 CONFIG_NAME = linux-ppc-static
 
 MKLIB_OPTIONS = -static
-PIC_FLAGS =
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a

configs/linux-solo

@@ -15,15 +15,8 @@ PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 
-# DRM and pciaccess
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
-PCIACCESS_CFLAGS = `pkg-config --cflags pciaccess`
-PCIACCESS_LIB = `pkg-config --libs pciaccess`
-
-
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE -DHAVE_POSIX_MEMALIGN \
+	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC -DIN_DRI_DRIVER
 
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
@@ -31,14 +24,11 @@ CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 ASM_SOURCES = 
 
 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) $(PCIACCESS_LIB)
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) 
 GL_LIB_DEPS = -lm -lpthread -ldl
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
@@ -49,5 +39,5 @@ SRC_DIRS = glx/mini mesa glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 
-#DRI_DIRS = ffb gamma sis savage tdfx unichrome fb
-DRI_DIRS = i810 i915tex i915 mach64 mga r128 r200 radeon
+#DRI_DIRS = ffb gamma sis savage
+DRI_DIRS = i810 i915 mach64 mga r128 r200 radeon tdfx unichrome fb

configs/linux-solo-x86

@@ -5,6 +5,9 @@ include $(TOP)/configs/linux-solo
 
 CONFIG_NAME = linux-solo-x86
 
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
+
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)

configs/linux-sparc

@@ -1,9 +1,30 @@
 # Configuration for Linux on Sparc
 
-include $(TOP)/configs/linux
+include $(TOP)/configs/default
 
 CONFIG_NAME = linux-sparc
 
-#ASM_FLAGS = -DUSE_SPARC_ASM
-#ASM_SOURCES = $(SPARC_SOURCES)
-#ASM_API = $(SPARC_API)
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+WARN_FLAGS = -Wall
+OPT_FLAGS  = -O2
+PIC_FLAGS  = -fPIC
+
+DEFINES = -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM
+
+X11_INCLUDES = -I/usr/X11R6/include
+
+CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	$(ASM_FLAGS) -std=c99 -ffast-math 
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+
+GLUT_CFLAGS = -fexceptions
+
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
+
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11

configs/linux-sparc5

@@ -1,7 +1,17 @@
 # Configuration for Linux on Sparc5
 
-include $(TOP)/configs/linux-sparc
+include $(TOP)/configs/default
 
 CONFIG_NAME = linux-sparc5
 
-ARCH_FLAGS += -mcpu=ultrasparc
+# Compiler and flags
+CC = gcc
+CXX = g++
+CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
+CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
+GLUT_CFLAGS = -fexceptions
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
+

configs/linux-static

@@ -5,7 +5,6 @@ include $(TOP)/configs/linux
 CONFIG_NAME = linux-static
 
 MKLIB_OPTIONS = -static
-PIC_FLAGS =
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
@@ -20,7 +19,3 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-
-# Need to specify all libraries we may need
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
-	-lstdc++ -lm

configs/linux-ultrasparc

@@ -1,7 +1,17 @@
 # Configuration for Linux on UltraSparc
 
-include $(TOP)/configs/linux-sparc
+include $(TOP)/configs/default
 
 CONFIG_NAME = linux-ultrasparc
 
-ARCH_FLAGS += -mv8 -mtune=ultrasparc
+# Compiler and flags
+CC = gcc
+CXX = g++
+CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
+CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
+GLUT_CFLAGS = -fexceptions
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

configs/linux-x86-64-static

@@ -5,7 +5,6 @@ include $(TOP)/configs/linux-x86-64
 CONFIG_NAME = linux-x86-64-static
 
 MKLIB_OPTIONS = -static
-PIC_FLAGS =
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
@@ -20,5 +19,5 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
-	-lstdc++ -lm
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+               $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm

configs/linux-x86-glide

@@ -14,9 +14,6 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
 
 GLUT_CFLAGS = -fexceptions
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
 
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)

configs/linux-x86-static

@@ -5,7 +5,6 @@ include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-static
 
 MKLIB_OPTIONS = -static
-PIC_FLAGS =
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
@@ -20,5 +19,5 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
-	-lstdc++ -lm
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+               $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm

configs/netbsd

@@ -12,6 +12,3 @@ CXXFLAGS = -O2 -fPIC
 GLUT_CFLAGS = -fexceptions
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing

configs/openbsd

@@ -10,10 +10,6 @@ CXX = g++
 CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
 CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)

configs/solaris-x86-gcc

@@ -11,10 +11,6 @@ CFLAGS = -O3 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
 CXXFLAGS = -O3 -march=i486 -fPIC
 GLUT_CFLAGS = -fexceptions
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm

configs/solaris-x86-gcc-static

@@ -12,10 +12,6 @@ CXXFLAGS = -O3 -march=i486 -fPIC
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm

configs/sunos4-gcc

@@ -11,9 +11,5 @@ CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X1
 CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4
 GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
 

configs/sunos5-gcc

@@ -28,10 +28,6 @@ CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 
 GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/openwin/lib
 

configs/sunos5-v9-cc-g++

@@ -1,35 +0,0 @@
-# Configuration for SunOS 5, SPARC V9 and cc/g++ (for C and C++ sources)
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-v9-cc-g++
-
-MKLIB_OPTIONS = -cplusplus
-
-LIB_DIR = lib64
-
-# Compiler and flags
-CC = cc
-CXX = g++
-
-CXX_WARN_FLAGS = -Wall
-CXX_PIC_FLAGS  = -fPIC
-CXX_OPT_FLAGS  = -O3 -m64 -mcpu=ultrasparc -mv8plus -mvis -g -fomit-frame-pointer -pipe
-CXX_ARCH_FLAGS = -m64
-
-
-CXXFLAGS = $(CXX_WARN_FLAGS) $(CXX_OPT_FLAGS) $(CXX_PIC_FLAGS) $(CXX_ARCH_FLAGS) $(DEFINES) \
-        -I/usr/openwin/include
-
-# Work around aliasing bugs - developers should comment this out
-CXXFLAGS += -fno-strict-aliasing
-
-CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
-#CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-GLUT_CFLAGS = -DSOLARIS_2_4_BUG
-
-GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

configs/ultrix-gcc

@@ -12,10 +12,6 @@ CXXFLAGS = -pedantic -O2
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a

descrip.mms

@@ -19,4 +19,4 @@ all :
 	$(MMS)$(MMSQUALIFIERS)
 	set default [-.xdemos]
 	$(MMS)$(MMSQUALIFIERS)
-	if f$search("[-]tests.DIR") .nes. "" then pipe set default [-.tests] ; $(MMS)$(MMSQUALIFIERS)
+	if f$search("[-]test.DIR") .nes. "" then pipe set default [-.test] ; $(MMS)$(MMSQUALIFIERS)

docs/MiniGLX.html

@@ -88,6 +88,19 @@ driver (such as <code>radeon_dri.so</code>) at runtime. &nbsp;The
 environment variable <code>LIBGL_DRIVERS_PATH</code> should name the
 directory where these modules are located.<br>
 <br>
+Prior to running a MiniGXL application, the following kernel modules
+must be installed:<br>
+<br>
+<div style="margin-left: 40px;"> agpgart.o<br>
+radeonfb.o &nbsp;(assuming Radeon hardware)<br>
+radeon.o &nbsp;(assuming Radeon hardware)<br>
+</div>
+<code></code> <br>
+Finally, MiniGLX reads a configuration file (by default,<code>
+/etc/miniglx.conf</code>) to determine basic configuration information.
+&nbsp;The configuration file may also be located in the directory
+specified by the <code>MINIGLX_CONF</code> environment variable).<br>
+<br>
 The remainder of this section describes the MiniGLX API functions.<br>
 <br>
 <h2>3.1 Initialization</h2>

docs/README.MINGW32

@@ -88,66 +88,3 @@ Running the Build:
 
 		Paul G. <pgarceau@users.sourceforge.net>
 		Daniel Borca <dborca@users.sourceforge.net>
-
-
-
-******This section is added by Heromyth <zxpmyth@yahoo.com.cn>*************
-
-====================
-Updated on 2007-7-21
-====================
-
-Notice:
-	1) The generated DLLs are *not* compatible with the ones built
-with the other compilers like VC8, especially for GLUT. 
-
-	2) Although more tests are needed, it can be used individually!
-
-	3) You can set the options about whether using STDCALL to build MESA. The 
-config file is <Mesa3D-root>\configs\config.mgw. The default setting is that:
-		ALL_USING_STDCALL = 1
-, which means using STDCALL to build MESA. 
-
-	4) Of course, you can MESA without using STDCALL,I like this:) 
-The setting is :
-		ALL_USING_STDCALL = 0
-To do this, however, you must modify wingdi.h which is in MingW's include dir. 
-For example, run:
-	notepad	C:\MingW\include\wingdi.h
-, and delete all the lines where all the wgl*() functions are. Because they would 
-be conflicted with the ones in <Mesa3D-root>\include\GL\mesa_wgl.h.
-
->>>>>>>>>> Conflicted Functions List >>>>>>>>>>
-WINGDIAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT);
-WINGDIAPI HGLRC WINAPI wglCreateContext(HDC);
-WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,int);
-WINGDIAPI BOOL WINAPI wglDeleteContext(HGLRC);
-WINGDIAPI BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR);
-WINGDIAPI HGLRC WINAPI wglGetCurrentContext(void);
-WINGDIAPI HDC WINAPI wglGetCurrentDC(void);
-WINGDIAPI int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*);
-WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR);
-WINGDIAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC);
-WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL);
-WINGDIAPI int WINAPI wglSetLayerPaletteEntries(HDC,int,int,int,const COLORREF*);
-WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC);
-WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT);
-WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD);
-WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD);
-WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
-WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-====================
-Updated on 2007-7-22
-====================
-	I havn't thought that I would find a better way to solve my problems so soon. 
-I changed the method in which the import-libs and DLLs are made. After this update,
-the DLLs of MESA are more optimized and more compatible. 
-	It seems that there is no need to keep the building way of 'NO-STDCALL'.The 
-way of USING_STDCALL is so nice! The file <Mesa3D-root>\configs\config.mgw is 
-also not needed, and can be deleted safely!
-	
-
-
-*********************************************************************************

docs/README.WIN32

@@ -1,163 +1,155 @@
-File: docs/README.WIN32
-
-Last updated: Apr 25, 2007 - Karl Schultz - kschultz@users.sourceforge.net
-
-Quick Start
------ -----
-
-Unzip the MesaLib, MesaGLUT, and MesaDemos ZIP files into the same
-directory.  The libs and demos build separately, so if you do not care
-about the demos or GLUT, you only need to unzip MesaLib.  If you unzip
-more than one ZIP file, they all need to be unzipped into the same
-directory.  Don't worry, you will not overwrite anything.
-
-The Windows build system uses Microsoft Visual Studio.  Project files
-for a specific version of Visual Studio are in their own directory in
-the top-level "windows" directory.  For example, Visual Studio 8 files
-are in windows/VC8.
-
-Support has been dropped for versions of Visual Studio prior to 8. The
-main reason is because Microsoft now provides a free compiler and
-developer environment.  Visual Studio Express can be found at
-
-http://msdn.microsoft.com/vstudio/express/visualc/default.aspx
-
-You'll also need the Platform SDK.  Instructions for obtaining and
-using the SDK with Visual Studio Express can be found at
-
-http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
-
-If you are stuck using VC6 or VC7, you may start with these project
-files, but you may need to modify them to reflect changes in the
-Mesa source code tree.  If you sucessfully update the project files,
-please submit them to the author of this document so that they may
-be included in the next distribution. 
-
-The project files to build the core Mesa library, Windows Mesa
-drivers, OSMesa, and GLU are in the mesa directory.  The project files
-to build GLUT and some demo programs are in the progs directory.
-
-Makefiles are no longer shipped or supported, but can be generated
-from the projects using Visual Studio.
-
-
-Windows Drivers
-------- -------
-
-At this time, only the GDI driver is known to work.  Most of the demos
-in progs/demos should work with this driver.
-
-Source code also exists in the tree for other drivers in
-src/mesa/drivers/windows, but the status of this code is unknown.
-
-The GDI driver operates basically by writing pixel spans into a DIB
-section and then blitting the DIB to the window.  The driver was
-recently cleaned up and rewitten and so may have bugs or may be
-missing some functionality.  The older versions of the CVS source may
-be useful in figuring out any problems, or report them to me.
-
-To build Mesa with the GDI driver, build the mesa, gdi, and glu
-projects in the Visual Studio workspace found at
-
-	windows/VC8/mesa/mesa.sln
-
-The osmesa DLL can also be built with the osmesa project.
-
-The build system creates a lib top-level directory and copies
-resulting LIB and DLL files to this lib directory.  The files are:
-
-	OPENGL32.LIB, GLU32.LIB, OSMESA32.LIB
-	OPENGL32.DLL, GLU32.DLL, OSMESA32.DLL
-
-If the MesaDemos ZIP file was extracted, the DLL files are also copied
-to the demos directory.  This facilitates running the demos as described
-below.
-
-
-GLUT and Demos
----- --- -----
-
-A Visual Studio workspace can be found at 
-
-	windows/VC8/progs/progs.sln
-
-It can be used to build GLUT and a few demos.  The GLUT lib and DLL
-are copied to the top-level lib directory, along with the Mesa libs.
-
-The demo build system expects to find the LIB files in the top level
-lib directory, so you must build the Mesa libs first.  The demo
-executables are placed in the demos directory, because some of them
-rely on data files found there.  Also, the Mesa lib DLL's were copied
-there by the Mesa lib build process.  Therefore, you should be able to
-simply run the demo executables from the demo directory.
-
-If you want to run the demos from the Visual Studio, you may have to
-change the startup directory and explicitly state where the executables are.
-
-You may also build all the demo programs by using a makefile.  Go to
-the progs/demos directory and make sure you have executed VCVARS32.BAT
-or whatever setup script is appropriate for your compiler.  Then,
-
-	nmake -f Makefile.win
-
-should build all the demos.
-
-
-Build System Notes
------ ------ -----
-
-VC6 (not actively supported)
----
-
-Visual Studio 6 does not recognize files with the .cc extension as C++
-language files, without a lot of unnatural tweaking.  So, the VC6
-build process uses custom build steps to compile these files in the
-GLU library.
-
-Two additional configurations are provided, Debug x86 and Release x86
-that activate the shader code compilation by defining SLANG_86.  It is
-unknown if and how this works.
-
-VC7 (not actively supported)
----
-
-The above-mentioned .cc problem does not exist in this version.
-
-VC8
----
-
-No notes.
-
-
-General
--------
-
-After building, you can copy the above DLL files to a place in your
-PATH such as $SystemRoot/SYSTEM32.  If you don't like putting things
-in a system directory, place them in the same directory as the
-executable(s).  Be careful about accidentially overwriting files of
-the same name in the SYSTEM32 directory.
-
-The DLL files are built so that the external entry points use the
-stdcall calling convention.
-
-Static LIB files are not built.  The LIB files that are built with are
-the linker import files associated with the DLL files.
-
-The si-glu sources are used to build the GLU libs.  This was done
-mainly to get the better tessellator code.
-
-To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE
-to the project settings.  You will also need to edit src/mesa.def to
-change all the gl* symbols to mgl*.  Because this is easy to do with a
-global replace operation in a text editor, no additional mangled
-version of mesa.def is maintained or shipped.
-
-If you have a Windows-related build problem or question, it is
-probably better to direct it to me (kschultz@users.sourceforge.net),
-rather than directly to the other Mesa developers.  I will help you as
-much as I can.  I also monitor the Mesa mailing lists and will answer
-questions in this area there as well.
-
-
-Karl Schultz
+File: docs/README.WIN32
+
+Last updated: Mar 31, 2006 - Karl Schultz - kschultz@users.sourceforge.net
+
+Quick Start
+----- -----
+
+Unzip the MesaLib, MesaGLUT, and MesaDemos ZIP files into the same
+directory.  The libs and demos build separately, so if you do not care
+about the demos or GLUT, you only need to unzip MesaLib.  If you unzip
+more than one ZIP file, they all need to be unzipped into the same
+directory.  Don't worry, you will not overwrite anything.
+
+The Windows build system uses Microsoft Visual Studio.  Project files
+for a specific version of Visual Studio are in their own directory in
+the top-level "windows" directory.  For example, Visual Studio 6 files
+are in windows/VC6.  If a directory does not exist for your version of
+Visual Studio, you can try importing the project files from an earlier
+version of Visual Studio.  At this time, project files exist for
+Version 6 and Version 7.  The code has been built with a beta version
+of Version 8 and it runs on 64-bit Windows.  If you want to try this,
+start by importing the VC7 files and create the 64-bit targets in the
+configuration manager.
+
+It is likely that the new and free Visual Studio Express can be used
+to build Mesa, but it hasn't been tried yet.  Start with the VC7
+project files.
+
+The project files to build the core Mesa library, Windows Mesa
+drivers, OSMesa, and GLU are in the mesa directory.  The project files
+to build GLUT and some demo programs are in the progs directory.
+
+Makefiles are no longer shipped or supported, but can be generated
+from the projects using Visual Studio.
+
+
+Windows Drivers
+------- -------
+
+At this time, only the GDI driver is known to work.  Most of the demos
+in progs/demos should work with this driver.
+
+Source code also exists in the tree for other drivers in
+src/mesa/drivers/windows, but the status of this code is unknown.
+
+The GDI driver operates basically by writing pixel spans into a DIB
+section and then blitting the DIB to the window.  The driver was
+recently cleaned up and rewitten and so may have bugs or may be
+missing some functionality.  The older versions of the CVS source may
+be useful in figuring out any problems, or report them to me.
+
+To build Mesa with the GDI driver, build the mesa, gdi, and glu
+projects in the Visual Studio workspace found at
+
+	windows/VC6/mesa/mesa.dsw
+or
+	windows/VC7/mesa/mesa.sln
+
+The osmesa DLL can also be built with the osmesa project.
+
+The build system creates a lib top-level directory and copies
+resulting LIB and DLL files to this lib directory.  The files are:
+
+	OPENGL32.LIB, GLU32.LIB, OSMESA32.LIB
+	OPENGL32.DLL, GLU32.DLL, OSMESA32.DLL
+
+If the MesaDemos ZIP file was extracted, the DLL files are also copied
+to the demos directory.  This facilitates running the demos as described
+below.
+
+
+GLUT and Demos
+---- --- -----
+
+A Visual Studio workspace can be found at 
+
+	windows/VC6/progs/progs.dsw
+or
+	windows/VC7/progs/progs.sln
+
+It can be used to build GLUT and a few demos.  The GLUT lib and DLL
+are copied to the top-level lib directory, along with the Mesa libs.
+
+The demo build system expects to find the LIB files in the top level
+lib directory, so you must build the Mesa libs first.  The demo
+executables are placed in the demos directory, because some of them
+rely on data files found there.  Also, the Mesa lib DLL's were copied
+there by the Mesa lib build process.  Therefore, you should be able to
+simply run the demo executables from the demo directory.
+
+If you want to run the demos from the Visual Studio, you may have to
+change the startup directory and explicitly state where the executables are.
+
+You may also build all the demo programs by using a makefile.  Go to
+the progs/demos directory and make sure you have executed VCVARS32.BAT
+or whatever setup script is appropriate for your compiler.  Then,
+
+	nmake -f Makefile.win
+
+should build all the demos.
+
+
+Build System Notes
+----- ------ -----
+
+VC6
+---
+
+Visual Studio 6 does not recognize files with the .cc extension as C++
+language files, without a lot of unnatural tweaking.  So, the VC6
+build process uses custom build steps to compile these files in the
+GLU library.
+
+Two additional configurations are provided, Debug x86 and Release x86
+that activate the shader code compilation by defining SLANG_86.  It is
+unknown if and how this works.
+
+VC7
+---
+
+The above-mentioned .cc problem does not exist in this version.
+
+
+General
+-------
+
+After building, you can copy the above DLL files to a place in your
+PATH such as $SystemRoot/SYSTEM32.  If you don't like putting things
+in a system directory, place them in the same directory as the
+executable(s).  Be careful about accidentially overwriting files of
+the same name in the SYSTEM32 directory.
+
+The DLL files are built so that the external entry points use the
+stdcall calling convention.
+
+Static LIB files are not built.  The LIB files that are built with are
+the linker import files associated with the DLL files.
+
+The si-glu sources are used to build the GLU libs.  This was done
+mainly to get the better tessellator code.
+
+To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE
+to the project settings.  You will also need to edit src/mesa.def to
+change all the gl* symbols to mgl*.  Because this is easy to do with a
+global replace operation in a text editor, no additional mangled
+version of mesa.def is maintained or shipped.
+
+If you have a Windows-related build problem or question, it is
+probably better to direct it to me (kschultz@users.sourceforge.net),
+rather than directly to the other Mesa developers.  I will help you as
+much as I can.  I also monitor the Mesa mailing lists and will answer
+questions in this area there as well.
+
+
+Karl Schultz

docs/README.directfb

@@ -6,7 +6,7 @@ Requirements
 ============
 
   To build Mesa with DirectFB (DirectFBGL) support you need:
-     - DirectFB at least 1.0.0 (http://directfb.org)
+     - DirectFB at least 0.9.21 (http://directfb.org)
      - pkg-config at least 0.9 (http://pkgconfig.sf.net)
 
 

docs/RELNOTES-6.4.1

@@ -0,0 +1,47 @@
+
+		        Mesa 6.4.1 Release Notes
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.3) designate new developmental releases.
+Even numbered versions (such as 6.4) designate stable releases.
+
+
+6.4.1 is a bug-fix release.  See the VERSIONS file for details.
+
+
+
+GLUT tarball
+------------
+
+Starting with 6.4, the GLUT library sources are distributed in a separate
+tarball.  This was done at the request of Linux distro vendors who prefer
+to use freeglut.
+
+
+
+
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa (Xlib)		implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Windows/Win32		implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)  requires updates	
+SVGA			requires updates
+DJGPP			requires updates
+GGI			requires updates
+BeOS			requires updates
+Allegro			requires updates
+D3D			requires updates
+
+The drivers which require updates mostly need to be updated to work
+with the new gl_renderbuffer / gl_framebuffer infrastructure introduced
+in Mesa 6.3.
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-6.4.1,v 3.1 2006/02/03 17:21:54 brianp Exp $

docs/RELNOTES-6.4.2

@@ -0,0 +1,47 @@
+
+		        Mesa 6.4.2 Release Notes
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.3) designate new developmental releases.
+Even numbered versions (such as 6.4) designate stable releases.
+
+
+6.4.2 is a minor bug-fix release.  See the VERSIONS file for details.
+
+
+
+GLUT tarball
+------------
+
+Starting with 6.4, the GLUT library sources are distributed in a separate
+tarball.  This was done at the request of Linux distro vendors who prefer
+to use freeglut.
+
+
+
+
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa (Xlib)		implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Windows/Win32		implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)  requires updates	
+SVGA			requires updates
+DJGPP			requires updates
+GGI			requires updates
+BeOS			requires updates
+Allegro			requires updates
+D3D			requires updates
+
+The drivers which require updates mostly need to be updated to work
+with the new gl_renderbuffer / gl_framebuffer infrastructure introduced
+in Mesa 6.3.
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-6.4.2,v 3.1 2006/02/03 17:21:54 brianp Exp $

docs/RELNOTES-6.5

@@ -0,0 +1,97 @@
+
+			Mesa 6.5 Release Notes
+
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.5) designate new developmental releases.
+Even numbered versions (such as 6.4) designate stable releases.
+
+
+
+New Features
+------------
+
+OpenGL Shading language support
+   This includes the GL_ARB_shader_objects, GL_ARB_shading_language_100,
+   GL_ARB_vertex_shader and GL_ARB_fragment_shader extensions.  Most of
+   the work was done by Michal Krol.
+   There's probably a fair number of bugs since this is a pretty large,
+   complicated body of code.
+
+   The OpenGL 2.0 interface to these features will be implemented in a
+   future version of Mesa,
+
+GL_EXT_timer_query
+   Used to measure the time of OpenGL operations at high precision.
+   Only supported in the software/Xlib driver at this time.
+
+GL_EXT_packed_depth_stencil
+   Defines a new GL_DEPTH_STENCIL_EXT pixel format.
+
+GL_EXT_framebuffer_blit
+   A simplified glCopyPixels-like feature for copying pixel rectangles.
+
+GL_ARB_half_float_pixel
+   Adds a new half-precision floating point format for image transfers,
+   such as for glDrawPixels, glReadPixels, glTexImage, etc.
+
+
+
+Removed Extensions
+------------------
+
+The following extensions have been removed:
+
+  GL_HP_occlusion_test - this is superceded by GL_ARB_occlusion_query.
+
+
+
+Known Issues
+------------
+
+Rendering to depth textures will not work.  Rendering to GL_DEPTH_STENCIL
+textures should work.
+
+
+
+Driver Interface Changes
+------------------------
+
+Stencil: The Driver.StencilOp/Func/Mask() functions have been replaced by
+the two-sided versions: Driver.Stencil*Separate().
+
+Render-to-texture: The functions for rendering to textures have changed.
+
+
+
+To Do (someday) items
+---------------------
+ Switch to freeglut
+ Increase MAX_DRAWBUFFERS
+ Fix linux-glide target/driver.
+ Fix lambda calculation for frag progs.
+
+
+
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			implements OpenGL 1.3
+Wind River UGL		implements OpenGL 1.3
+Windows/Win32		implements OpenGL 1.5
+DJGPP			implements OpenGL 1.5
+GGI			implements OpenGL 1.3
+BeOS			implements OpenGL 1.5
+Allegro			needs updating
+D3D			needs updating
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-6.5,v 3.4 2006/03/29 04:53:02 brianp Exp $

docs/VERSIONS

@@ -1471,21 +1471,14 @@ Mesa Version History
 	- paletted texturing was broken w/ floating point palettes (K. Schultz)
 	- lots of assorted framebuffer object bug fixes
 
-6.5.1  August 31, 2006
+6.5.1  month, day, 2006
     New:
-	- Intel i965 DRI driver
 	- GL_APPLE_vertex_array_object extension (Ian Romanick)
-	- GL_EXT_texture_sRGB extension
-	- GL_EXT_gpu_program_parameters (Ian Romanick)
 	- "engine" demo
-	- updated fbdev driver and GLUT for fbdev (Sean D'Epagnier)
-	- many updates to the DRI drivers
     Changes:
 	- The glVertexAttribARB functions no longer alias the conventional
 	  vertex attributes.
 	- glxinfo program prints more info with -l option
-	- GL_FRAGMENT_PROGRAM_NV and GL_FRAGMENT_PROGRAM_ARB are now
-	  compatible, in terms of glBindProgramARB()
     Bug fixes:
 	- fixed broken texture border handling for depth textures (bug 6498)
 	- removed the test for duplicated framebuffer attachments, per
@@ -1505,10 +1498,3 @@ Mesa Version History
 	- 'normalized' parameter to glVertexAttribPointerARB didn't work
 	- disable bogus GLX_SGI_video_sync extension in xlib driver
 	- fixed R128 driver locking bug (Martijn van Oosterhout)
-	- using evaluators with vertex programs caused crashes (bug 7564)
-	- fragment.position wasn't set correctly for point/line primitives
-	- fixed parser bug for scalar sources for GL_NV_fragment_program
-	- max fragment program length was incorrectly 128, now 1024
-	- writes to result.depth in fragment programs weren't clamped to [0,1]
-	- fixed potential dangling pointer bug in glBindProgram()
-	- fixed some memory leaks (and potential crashes) in Xlib driver

docs/contents.html

@@ -25,10 +25,10 @@ a:visited {
 <ul>
 <li><a href="intro.html" target="MainFrame">Introduction</a>
 <li><a href="news.html" target="MainFrame">News</a>
-<LI><A HREF="developers.html" target="MainFrame">Developers</A>
 <li><a href="systems.html" target="MainFrame">Platforms and Drivers</a>
 <li><a href="license.html" target="MainFrame">License & Copyright</a>
 <li><a href="faq.html" target="MainFrame">FAQ</a>
+<li><a href="VERSIONS" target="MainFrame">Version History</a>
 <li><a href="relnotes.html" target="MainFrame">Release Notes</a>
 <li><a href="thanks.html" target="MainFrame">Acknowledgements</a>
 <li><a href="conform.html" target="MainFrame">Conformance Testing</a>
@@ -64,17 +64,16 @@ a:visited {
 <b>Developer Topics</b>
 <ul>
 <li><a href="http://sourceforge.net/projects/mesa3d" target="_parent">SourceForge homepage</a>
-<li><a href="repository.html" target="MainFrame">Source Code Repository</a>
-<li><a href="memory.html" target="MainFrame">DRI Memory Management</a>
-<li><a href="shading.html" target="MainFrame">Shading Language</a>
+<li><a href="cvs_access.html" target="MainFrame">CVS Access</a>
+<li><a href="cvs_branches.html" target="MainFrame">CVS Branch Info</a>
 <li><a href="utilities.html" target="MainFrame">Utilities</a>
 <li><a href="helpwanted.html" target="MainFrame">Help Wanted</a>
 <li><a href="devinfo.html" target="MainFrame">Development Notes</a>
 <li><a href="sourcedocs.html" target="MainFrame">Source Documentation</a>
+<li><a href="subset.html" target="MainFrame">Subset Information</a>
 <li><a href="fbdev-dri.html" target="MainFrame">fbdev/DRI Environment</a>
-<li><a href="subset.html" target="MainFrame">Mesa Subset Driver</a>
 <li><a href="glfbdev-driver.html" target="MainFrame">glFBDev Driver</a>
-<LI><A HREF="dispatch.html" target="MainFrame">GL Dispatch</A>
+<LI><A HREF="custom.html" target="MainFrame">Custom Development</A>
 </ul>
 
 <b>Links</b>

docs/custom.html

@@ -0,0 +1,27 @@
+<HTML>
+
+<TITLE>Custom Development</TITLE>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<H1>Custom Development</H1>
+
+<p>
+Mesa is primarily developed and maintained on a volunteer basis.
+Some Mesa development work has been done in conjuction with contracted
+projects, such as the XFree86/DRI drivers.
+</p>
+
+<p>
+<pre>[Begin shameless plug]</pre>
+If you have a need for specific or custom Mesa development work,
+<a href="http://www.tungstengraphics.com/" target="_parent">
+Tungsten Graphics, Inc.</a> may be able to help you.
+<pre>[End shameless plug]</pre>
+</p>
+
+
+</body>
+</html>

docs/cvs_access.html

@@ -0,0 +1,106 @@
+<HTML>
+
+<TITLE>CVS Access</TITLE>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<h1>CVS Access</h1>
+
+<p>
+Mesa's CVS repository (code management system) is hosted on
+<a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
+</p>
+
+<p>
+You may access the repository either as an
+<a href="#anonymous">anonymous user</a> (read-only) or as a
+<a href="#developer">developer</a>
+(read/write).
+</p>
+
+<p>
+You may also 
+<a href="http://freedesktop.org/cgi-bin/viewcvs.cgi/mesa/Mesa/"
+target="_parent">browse the CVS repository</a>.
+</p>
+
+
+<a name="anonymous">
+<H2>Anonymous CVS Access</H2>
+
+<p>
+Anonymous, public, read-only access to the CVS repository is available.
+Here are the basic instructions for Unix systems:
+</p>
+
+<ol>
+<li>Install CVS client software on your computer if needed.
+    Version 1.9.28 is known to work.
+<li>Login as an anonymous user:
+    <pre>
+    cvs -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa login
+    </pre>
+    Just press Enter/Return when prompted for a password.
+    <br>
+    <br>
+<li>Check out the code:
+    <pre>
+    cvs -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa co Mesa
+    </pre>
+</ol>
+
+
+<p>To update your Mesa CVS source to the latest CVS source:</p>
+
+<ol>
+<li><code>cd Mesa</code>
+<li><code>cvs -z3 -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa update</code>
+</ol>
+
+
+<a name="developer">
+<H2>Developer CVS Access</H2>
+
+<p>
+Mesa developers working with the Mesa CVS repository need to first
+have an account on <a href="http://www.freedesktop.org" target="_parent">
+freedesktop.org</a>.
+To get an account, please ask Brian or the other Mesa developers for
+permission.
+Then, if there are no objections, follow this
+<a href="http://www.freedesktop.org/wiki/AccountRequests" target="_parent">
+procedure</a>.
+</p>
+
+<p>
+Once your account is established, you can check out the Mesa CVS tree
+with:
+<pre>
+   setenv CVS_RSH ssh        (if using a csh-like shell)
+</pre>
+<em>OR</em>
+<pre>
+   export CVS_RSH=rsh        (if using a bash-like shell)
+</pre>
+followed by:
+<pre>
+   cvs -d:ext:yourusername@cvs.freedesktop.org:/cvs/mesa co Mesa
+</pre>
+
+<p>
+Of course, replace <em>yourusername</em> with your actual login name.
+</p>
+
+<p>
+Subsequent updates should only require:
+</p>
+<pre>
+   cvs update
+</pre>
+
+
+
+</body>
+</html>

docs/cvs_branches.html

@@ -0,0 +1,80 @@
+<HTML>
+
+<TITLE>CVS Branches</TITLE>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<H1>CVS Branch Information</H1>
+
+<p>
+At any given time, there may be several active branches in Mesa's
+CVS repository.
+
+Generally, the CVS trunk contains the latest development (unstable)
+code while a CVS branch has the latest stable code.
+</p>
+
+<p>
+Currently (Oct 2004), the trunk is the Mesa 6.3 development code
+while the mesa_6_2_branch branch has the stable Mesa 6.2.x code.
+</p>
+
+<p>
+Mesa releases use an even/odd numbering scheme to represent stable/development
+releases.
+
+For example, Mesa 6.2 (0 is considered even) is a stable release while
+Mesa 6.3 is a development release.
+</p>
+
+<p>
+To checkout a specific CVS branch pass <code>-r</code> and
+the branch tag after your CVS command.
+
+For example <code>cvs checkout -r mesa_6_2_branch Mesa</code> will
+checkout the 6.2 branch and <code>cvs update -r
+mesa_6_2_branch</code> will convert your current CVS tree to the 6.2
+branch.
+
+Consult <a href="http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54"
+target="_parent">http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54</a>
+for more on branching in CVS.
+</p>
+
+<p>
+To see a list of all the CVS branches run <code>cvs log README</code> (or any
+other file) and look for the section labeled <code>symbolic names</code>.
+You'll see something like this:
+</p>
+
+<pre>  symbolic names:
+        mesa_4_0: 1.3
+        mesa_4_0_branch: 1.3.0.6
+        mesa_3_5: 1.3
+        mesa_3_4_2: 1.3
+        mesa_3_4_1: 1.3
+        mesa_3_4: 1.3
+        mesa_3_4_branch: 1.3.0.4
+        mesa_3_3: 1.3
+        mesa_3_2_1: 1.1.1.1
+        mesa_3_3_texture_env_combine2: 1.3.0.2
+        mesa_3_2: 1.1.1.1
+        mesa_3_2_beta_1: 1.1.1.1
+        mesa_3_1: 1.1.1.1
+        mesa_3_2_dev: 1.1.1.1.0.2
+        mesa_3_1_beta_3: 1.1.1.1
+        start: 1.1.1.1
+        mesa: 1.1.1
+</pre>
+
+<p>
+Most will be obsolete branches.  Generally, the newer branches are at
+the top.  Ask on the mesa3d-dev mailing list to learn which branches
+are active.
+</p>
+
+
+</body>
+</html>

docs/developers.html

@@ -1,51 +0,0 @@
-<HTML>
-
-<TITLE>Developers</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<H1>Developers</H1>
-
-<p>
-Both professional and volunteer developers contribute to Mesa.
-</p>
-<p>
-<a href="http://www.tungstengraphics.com/" target="_parent">Tungsten Graphics</a>
-employs several of the main Mesa developers including Brian Paul
-and Keith Whitwell.
-Much of the on-going work in Mesa is done through Tungsten Graphics engineering
-contracts.
-Prominent examples of this work includes:
-</p>
-<ul>
-<li>DRI drivers for Intel i965, i945, i915 and other chips
-<li>Advanced memory manager and framebuffer object support
-<li>Shading language compiler and OpenGL 2.0 support
-<li>MiniGLX environment
-</ul>
-
-<p>
-Other companies including
-<a href="http://www.intellinuxgraphics.org/index.html" target="_parent">Intel</a>
-and IBM also actively contribute to the project.
-</p>
-
-<p>
-Volunteers have made significant contributions to all parts of Mesa, including
-complete device drivers.
-</p>
-
-
-<H1>Custom Development</H1>
-<p>
-Contact <a href="http://www.tungstengraphics.com/" target="_parent">
-Tungsten Graphics</a>
-for information about custom development in Mesa, OpenGL, X and other
-graphics technologies.
-</p>
-
-
-</body>
-</html>

docs/devinfo.html

@@ -34,15 +34,11 @@ To add a new GL extension to Mesa you have to do at least the following.
    corresponding Python scripts.
 </li>
 <li>
-   Add a new entry to the <code>gl_extensions</code> struct in mtypes.h
-</li>
-<li>
-   Update the <code>extensions.c</code> file.
-</li>
-<li>
-   From this point, the best way to proceed is to find another extension,
-   similar to the new one, that's already implemented in Mesa and use it
-   as an example.
+   Find an existing extension that's similar to the new one and search
+   the sources for code related to that extension.
+   Implement new code as needed.
+   In general, new state variables will be added to mtypes.h.  If the
+   extension is rather large, try to implement it in a new source file.
 </li>
 <li>
    If the new extension adds new GL state, the functions in get.c, enable.c

docs/dispatch.html

@@ -1,274 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>GL Dispatch in Mesa</TITLE>
-<LINK REL="stylesheet" TYPE="text/css" HREF="mesa.css">
-</HEAD>
-
-<BODY>
-<H1>GL Dispatch in Mesa</H1>
-
-<p>Several factors combine to make efficient dispatch of OpenGL functions
-fairly complicated.  This document attempts to explain some of the issues
-and introduce the reader to Mesa's implementation.  Readers already familiar
-with the issues around GL dispatch can safely skip ahead to the <A
-HREF="#overview">overview of Mesa's implementation</A>.</p>
-
-<H2>1. Complexity of GL Dispatch</H2>
-
-<p>Every GL application has at least one object called a GL <em>context</em>.
-This object, which is an implicit parameter to ever GL function, stores all
-of the GL related state for the application.  Every texture, every buffer
-object, every enable, and much, much more is stored in the context.  Since
-an application can have more than one context, the context to be used is
-selected by a window-system dependent function such as
-<tt>glXMakeContextCurrent</tt>.</p>
-
-<p>In environments that implement OpenGL with X-Windows using GLX, every GL
-function, including the pointers returned by <tt>glXGetProcAddress</tt>, are
-<em>context independent</em>.  This means that no matter what context is
-currently active, the same <tt>glVertex3fv</tt> function is used.</p>
-
-<p>This creates the first bit of dispatch complexity.  An application can
-have two GL contexts.  One context is a direct rendering context where
-function calls are routed directly to a driver loaded within the
-application's address space.  The other context is an indirect rendering
-context where function calls are converted to GLX protocol and sent to a
-server.  The same <tt>glVertex3fv</tt> has to do the right thing depending
-on which context is current.</p>
-
-<p>Highly optimized drivers or GLX protocol implementations may want to
-change the behavior of GL functions depending on current state.  For
-example, <tt>glFogCoordf</tt> may operate differently depending on whether
-or not fog is enabled.</p>
-
-<p>In multi-threaded environments, it is possible for each thread to have a
-differnt GL context current.  This means that poor old <tt>glVertex3fv</tt>
-has to know which GL context is current in the thread where it is being
-called.</p>
-
-<A NAME="overview"/>
-<H2>2. Overview of Mesa's Implementation</H2>
-
-<p>Mesa uses two per-thread pointers.  The first pointer stores the address
-of the context current in the thread, and the second pointer stores the
-address of the <em>dispatch table</em> associated with that context.  The
-dispatch table stores pointers to functions that actually implement
-specific GL functions.  Each time a new context is made current in a thread,
-these pointers a updated.</p>
-
-<p>The implementation of functions such as <tt>glVertex3fv</tt> becomes
-conceptually simple:</p>
-
-<ul>
-<li>Fetch the current dispatch table pointer.</li>
-<li>Fetch the pointer to the real <tt>glVertex3fv</tt> function from the
-table.</li>
-<li>Call the real function.</li>
-</ul>
-
-<p>This can be implemented in just a few lines of C code.  The file
-<tt>src/mesa/glapi/glapitemp.h</tt> contains code very similar to this.</p>
-
-<blockquote>
-<table border="1">
-<tr><td><pre>
-void glVertex3f(GLfloat x, GLfloat y, GLfloat z)
-{
-    const struct _glapi_table * const dispatch = GET_DISPATCH();
-    
-    (*dispatch-&gt;Vertex3f)(x, y, z);
-}</pre></td></tr>
-<tr><td>Sample dispatch function</td></tr></table>
-</blockquote>
-
-<p>The problem with this simple implementation is the large amount of
-overhead that it adds to every GL function call.</p>
-
-<p>In a multithreaded environment, a niave implementation of
-<tt>GET_DISPATCH</tt> involves a call to <tt>pthread_getspecific</tt> or a
-similar function.  Mesa provides a wrapper function called
-<tt>_glapi_get_dispatch</tt> that is used by default.</p>
-
-<H2>3. Optimizations</H2>
-
-<p>A number of optimizations have been made over the years to diminish the
-performance hit imposed by GL dispatch.  This section describes these
-optimizations.  The benefits of each optimization and the situations where
-each can or cannot be used are listed.</p>
-
-<H3>3.1. Dual dispatch table pointers</H3>
-
-<p>The vast majority of OpenGL applications use the API in a single threaded
-manner.  That is, the application has only one thread that makes calls into
-the GL.  In these cases, not only do the calls to
-<tt>pthread_getspecific</tt> hurt performance, but they are completely
-unnecessary!  It is possible to detect this common case and avoid these
-calls.</p>
-
-<p>Each time a new dispatch table is set, Mesa examines and records the ID
-of the executing thread.  If the same thread ID is always seen, Mesa knows
-that the application is, from OpenGL's point of view, single threaded.</p>
-
-<p>As long as an application is single threaded, Mesa stores a pointer to
-the dispatch table in a global variable called <tt>_glapi_Dispatch</tt>.
-The pointer is also stored in a per-thread location via
-<tt>pthread_setspecific</tt>.  When Mesa detects that an application has
-become multithreaded, <tt>NULL</tt> is stored in <tt>_glapi_Dispatch</tt>.</p>
-
-<p>Using this simple mechanism the dispatch functions can detect the
-multithreaded case by comparing <tt>_glapi_Dispatch</tt> to <tt>NULL</tt>.
-The resulting implementation of <tt>GET_DISPATCH</tt> is slightly more
-complex, but it avoids the expensive <tt>pthread_getspecific</tt> call in
-the common case.</p>
-
-<blockquote>
-<table border="1">
-<tr><td><pre>
-#define GET_DISPATCH() \
-    (_glapi_Dispatch != NULL) \
-        ? _glapi_Dispatch : pthread_getspecific(&_glapi_Dispatch_key)
-</pre></td></tr>
-<tr><td>Improved <tt>GET_DISPATCH</tt> Implementation</td></tr></table>
-</blockquote>
-
-<H3>3.2. ELF TLS</H3>
-
-<p>Starting with the 2.4.20 Linux kernel, each thread is allocated an area
-of per-thread, global storage.  Variables can be put in this area using some
-extensions to GCC.  By storing the dispatch table pointer in this area, the
-expensive call to <tt>pthread_getspecific</tt> and the test of
-<tt>_glapi_Dispatch</tt> can be avoided.</p>
-
-<p>The dispatch table pointer is stored in a new variable called
-<tt>_glapi_tls_Dispatch</tt>.  A new variable name is used so that a single
-libGL can implement both interfaces.  This allows the libGL to operate with
-direct rendering drivers that use either interface.  Once the pointer is
-properly declared, <tt>GET_DISPACH</tt> becomes a simple variable
-reference.</p>
-
-<blockquote>
-<table border="1">
-<tr><td><pre>
-extern __thread struct _glapi_table *_glapi_tls_Dispatch
-    __attribute__((tls_model("initial-exec")));
-
-#define GET_DISPATCH() _glapi_tls_Dispatch
-</pre></td></tr>
-<tr><td>TLS <tt>GET_DISPATCH</tt> Implementation</td></tr></table>
-</blockquote>
-
-<p>Use of this path is controlled by the preprocessor define
-<tt>GLX_USE_TLS</tt>.  Any platform capable of using TLS should use this as
-the default dispatch method.</p>
-
-<H3>3.3. Assembly Language Dispatch Stubs</H3>
-
-<p>Many platforms has difficulty properly optimizing the tail-call in the
-dispatch stubs.  Platforms like x86 that pass parameters on the stack seem
-to have even more difficulty optimizing these routines.  All of the dispatch
-routines are very short, and it is trivial to create optimal assembly
-language versions.  The amount of optimization provided by using assembly
-stubs varies from platform to platform and application to application.
-However, by using the assembly stubs, many platforms can use an additional
-space optimization (see <A HREF="#fixedsize">below</A>).</p>
-
-<p>The biggest hurdle to creating assembly stubs is handling the various
-ways that the dispatch table pointer can be accessed.  There are four
-different methods that can be used:</p>
-
-<ol>
-<li>Using <tt>_glapi_Dispatch</tt> directly in builds for non-multithreaded
-environments.</li>
-<li>Using <tt>_glapi_Dispatch</tt> and <tt>_glapi_get_dispatch</tt> in
-multithreaded environments.</li>
-<li>Using <tt>_glapi_Dispatch</tt> and <tt>pthread_getspecific</tt> in
-multithreaded environments.</li>
-<li>Using <tt>_glapi_tls_Dispatch</tt> directly in TLS enabled
-multithreaded environments.</li>
-</ol>
-
-<p>People wishing to implement assembly stubs for new platforms should focus
-on #4 if the new platform supports TLS.  Otherwise, implement #2 followed by
-#3.  Environments that do not support multithreading are uncommon and not
-terribly relevant.</p>
-
-<p>Selection of the dispatch table pointer access method is controlled by a
-few preprocessor defines.</p>
-
-<ul>
-<li>If <tt>GLX_USE_TLS</tt> is defined, method #4 is used.</li>
-<li>If <tt>PTHREADS</tt> is defined, method #3 is used.</li>
-<li>If any of <tt>PTHREADS</tt>, <tt>USE_XTHREADS</tt>,
-<tt>SOLARIS_THREADS</tt>, <tt>WIN32_THREADS</tt>, or <tt>BEOS_THREADS</tt>
-is defined, method #2 is used.</li>
-<li>If none of the preceeding are defined, method #1 is used.</li>
-</ul>
-
-<p>Two different techniques are used to handle the various different cases.
-On x86 and SPARC, a macro called <tt>GL_STUB</tt> is used.  In the preamble
-of the assembly source file different implementations of the macro are
-selected based on the defined preprocessor variables.  The assmebly code
-then consists of a series of invocations of the macros such as:
-
-<blockquote>
-<table border="1">
-<tr><td><pre>
-GL_STUB(Color3fv, _gloffset_Color3fv)
-</pre></td></tr>
-<tr><td>SPARC Assembly Implementation of <tt>glColor3fv</tt></td></tr></table>
-</blockquote>
-
-<p>The benefit of this technique is that changes to the calling pattern
-(i.e., addition of a new dispatch table pointer access method) require fewer
-changed lines in the assembly code.</p>
-
-<p>However, this technique can only be used on platforms where the function
-implementation does not change based on the parameters passed to the
-function.  For example, since x86 passes all parameters on the stack, no
-additional code is needed to save and restore function parameters around a
-call to <tt>pthread_getspecific</tt>.  Since x86-64 passes parameters in
-registers, varying amounts of code needs to be inserted around the call to
-<tt>pthread_getspecific</tt> to save and restore the GL function's
-parameters.</p>
-
-<p>The other technique, used by platforms like x86-64 that cannot use the
-first technique, is to insert <tt>#ifdef</tt> within the assembly
-implementation of each function.  This makes the assembly file considerably
-larger (e.g., 29,332 lines for <tt>glapi_x86-64.S</tt> versus 1,155 lines for
-<tt>glapi_x86.S</tt>) and causes simple changes to the function
-implementation to generate many lines of diffs.  Since the assmebly files
-are typically generated by scripts (see <A HREF="#autogen">below</A>), this
-isn't a significant problem.</p>
-
-<p>Once a new assembly file is created, it must be inserted in the build
-system.  There are two steps to this.  The file must first be added to
-<tt>src/mesa/sources</tt>.  That gets the file built and linked.  The second
-step is to add the correct <tt>#ifdef</tt> magic to
-<tt>src/mesa/main/dispatch.c</tt> to prevent the C version of the dispatch
-functions from being built.</p>
-
-<A NAME="fixedsize"/>
-<H3>3.4. Fixed-Length Dispatch Stubs</H3>
-
-<p>To implement <tt>glXGetProcAddress</tt>, Mesa stores a table that
-associates function names with pointers to those functions.  This table is
-stored in <tt>src/mesa/glapi/glprocs.h</tt>.  For different reasons on
-different platforms, storing all of those pointers is inefficient.  On most
-platforms, including all known platforms that support TLS, we can avoid this
-added overhead.</p>
-
-<p>If the assembly stubs are all the same size, the pointer need not be
-stored for every function.  The location of the function can instead be
-calculated by multiplying the size of the dispatch stub by the offset of the
-function in the table.  This value is then added to the address of the first
-dispatch stub.</p>
-
-<p>This path is activated by adding the correct <tt>#ifdef</tt> magic to
-<tt>src/mesa/glapi/glapi.c</tt> just before <tt>glprocs.h</tt> is
-included.</p>
-
-<A NAME="autogen"/>
-<H2>4. Automatic Generation of Dispatch Stubs</H2>
-
-</BODY>
-</HTML>

docs/download.html

@@ -9,7 +9,11 @@
 <H1>Downloading</H1>
 
 <p>
-Last stable release: <b>7.0.2</b>
+Last development release: <b>6.5</b>
+</p>
+
+<p>
+Last stable release: <b>6.4.2</b>
 </p>
 
 <p>

docs/faq.html

@@ -9,7 +9,7 @@
 
 <center>
 <h1>Mesa Frequently Asked Questions</h1>
-Last updated: 21 August 2006
+Last updated: 8 June 2006
 </center>
 
 <br>
@@ -46,7 +46,7 @@ Mesa 6.x supports the OpenGL 1.5 specification.
 <h2>1.2 Does Mesa support/use graphics hardware?</h2>
 <p>
 Yes.  Specifically, Mesa serves as the OpenGL core for the open-source DRI
-drivers for XFree86/X.org.  See the <a href="http://dri.freedesktop.org/">DRI
+drivers for XFree86/X.org.  See the <a href="http://dri.sf.net/">DRI
 website</a> for more information.
 </p>
 <p>
@@ -290,8 +290,9 @@ hardware it has detected.
 <p>
 Make sure the ratio of the far to near clipping planes isn't too great.
 Look
-<a href="http://www.opengl.org/resources/faq/technical/depthbuffer.htm#0040"
-target="_parent"> here</a> for details.
+<a href="http://www.sgi.com/software/opengl/advanced97/notes/node18.html"
+target="_parent">
+here</a> for details.
 </p>
 <p>
 Mesa uses a 16-bit depth buffer by default which is smaller and faster
@@ -340,14 +341,13 @@ will fix the problem.
 <a name="part4">
 </a><h1><a name="part4">4. Developer Questions</a></h1>
 
-<h2>4.1 How can I contribute?</a></h2>
+<h2><a name="part4">4.1 How can I contribute?</a></h2>
 <p>
-First, join the <a href="http://www.mesa3d.org/lists.html">Mesa3d-dev
-mailing list</a>.
-That's where Mesa development is discussed.
+<a name="part4">First, join the Mesa3d-dev mailing list.  That's where Mesa development
+is discussed.
 </a></p>
 <p>
-The </a><a href="http://www.opengl.org/documentation" target="_parent">
+<a name="part4">The </a><a href="http://www.opengl.org/developers/documentation/specs.html" target="_parent">
 OpenGL Specification</a> is the bible for OpenGL implemention work.
 You should read it.
 </p>

docs/fbdev-dri.html

@@ -1,287 +1,258 @@
-<html><head><title>Mesa fbdev/DRI Environment</title>
-
+<html>
 
+<TITLE>Mesa fbdev/DRI Environment</TITLE>
 
 <link rel="stylesheet" type="text/css" href="mesa.css"></head>
 
-<body>
+<BODY>
 
-<center><h1>Mesa fbdev/DRI Drivers</h1></center>
-<br>
+<center><H1>Mesa fbdev/DRI Drivers</H1></center>
 
-<h1>1. Introduction</h1>
+
+<H1>1. Introduction</H1>
 
 <p>
-The fbdev/DRI environment supports hardware-accelerated 3D rendering without
-the X window system.  This is typically used for embedded applications.
+The fbdev/DRI sub-project within Mesa brings hardware accelerated OpenGL
+rendering to the Linux fbdev environment.
+The X Window System / XFree86 is not needed.
 </p>
 
 <p>
-Contributors to this project include Jon Smirl, Keith Whitwell and Dave Airlie.
+Basically, the <a href="http://dri.sf.net/">DRI</a> drivers for hardware
+accelerated OpenGL for XFree86 have been ported to fbdev so that X is
+not needed.
+This means fbdev/DRI works in full-screen mode only.
 </p>
 
 <p>
-Applications in the fbdev/DRI environment use
-the <a href="http://www.nabble.com/file/p15480666/MiniGXL.html"> MiniGLX</a> interface to choose pixel
-formats, create rendering contexts, etc.  It's a subset of the GLX and
-Xlib interfaces allowing some degree of application portability between
-the X and X-less environments.
+DRI driver writers may find this simplified environment easier to work in,
+compared to the full XFree86/DRI environment.
 </p>
 
 <p>
-Note that this environment is not well-supported and these instructions
-may not be completely up to date.
+Much of the work for this project has been done by Jon Smirl and
+Keith Whitwell.
 </p>
-<br>
+
+<p>
+To use fbdev/DRI, you'll need a Linux 2.4 or 2.6 kernel.
+</p>
+
+<h3>Background Info</h3>
+
+<p>
+The Mesa-based DRI drivers used to be hosted in the DRI tree (which is
+basically a copy of the XFree86 tree).
+Since the Mesa-based DRI drivers are moreso "Mesa drivers" than "XFree86
+drivers" and the fact that with some work, the drivers could be used
+without X, the driver code was moved into the Mesa tree.
+</p>
+
+<p>
+So now the DRI drivers can be compiled for two different environments:
+fbdev and XFree86.
+To build the drivers for XFree86, one has to download/build the DRI
+source tree.
+Eventually, we'd like to be able to build the drivers for XFree86 outside
+of the XFree86/DRI trees.
+</p>
+
 
 
 
 <h1>2. Compilation</h1>
+
+<h2>2.1 Compiling the DRM modules</h2>
+
 <p>
-
-<h2>2.1 glxproto</h2>
-
-Get <a href="http://cvsweb.xfree86.org/cvsweb/*checkout*/xc/include/GL/glxproto.h?rev=1.9">glxproto.h</a>. Copy it to the /mesa/include/GL/ directory.
+First, you'll need the DRM (Direct Rendering Manager) kernel module sources.
+They're found in a module of the DRI CVS tree.
+To obtain the code do the following:
 </p>
-
-<h2>2.2 libpciaccess</h2>
-<p>
-Check if you have libpciaccess installed:
-</p>
-
-<pre>pkg-config --modversion pciaccess
+<pre>
+   cvs -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri login
 </pre>
 <p>
-If not you can download the latest code from:
-</p>
-<pre>   git clone git://anongit.freedesktop.org/git/xorg/lib/libpciaccess
-</pre>
-<p>
-Run autogen.sh to generate a configure file. autogen.sh uses autoconf
-utility. This utility may not be installed with your linux distro,
-check if it is available. if not you can use your package manager or
-type:
-</p>
-<pre>sudo apt-get install autoconf
-</pre>
-The next step is to install the libpciaccess library. 
-<pre>make
-make install
-</pre>
-<p> Now your libpciaccess.a file is saved into /usr/local/lib
-directory. If you have a libpciaccess.a in /usr/lib you may simply copy
-and overwrite these files. Don't forget to copy libpciaccess.pc file to
-/usr/lib/pkgconfig, which is also located in /usr/local/lib/pkgconfig/.
-Or you may use the following system variables:
-</p>
-<pre>export LD_LIBRARY_PATH=/usr/local/lib
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-</pre>
-
-<h2>2.3 drm</h2>
-
-<p>The next step is to compile the drm. DRM consists of two seperate parts,
-the DRM client library(lindrm.so) and kernel device module(such as
-radeon.ko). We need to make a small change in kernel device module. So
-you need to download the kernel source. You may choose the nearest
-mirror from www.kernel.org, or you are using Fedora Core 5, for
-example, you may need to install RPMs such as:
-kernel-smp-devel-2.16.15-1.2054_FC5.i686.rpm
-kernel-devel-2.6.15-1.2054_FC5.i686.rpm
-etc. You can find a detailed information <a href="http://www.howtoforge.com/kernel_compilation_fedora">here.</a>
-</p>
-
-<p>You will find drm_drv.c at /usr/src/LINUX-VERSION/drivers/char/drm/. Edit this code and comment out the following part:
-</p>
-
-<pre>
-   /* ||
-   ((ioctl-&gt;flags &amp; DRM_MASTER) &amp;&amp; !priv-&gt;master)*/
-</pre>
-Now you are ready to compile your kernel. If your kernel version is
-identical to the version you have compiled, you can simply over write
-your new "ko" files over older ones. If you have compiled a different
-kernel, you must configure your grub or lilo to be able to boot your
-new kernel. <p>
-You'll need fbdev header files.  Check with:
+Press Enter/Return when prompted for a password.  Then,
 </p>
 <pre>
-   ls -l /usr/include/linux/fb.
-</pre>
-<p>This file may be missing if you have not installed linux header files.
-
-
-<h2>2.4 Mesa</h2>
-
-</p><p>Get latest development Mesa sources from git repository
-(currently 7.1-prerelease)
-</p>
-<pre>
-   git clone git://anongit.freedesktop.org/git/mesa/mesa
-</pre>
-
-<p>You will need the makedepend utility which is a part of mesa project
-to build your linux-solo. You probably wont have this utility. You can
-download its source from following git repulsitory:
-</p>
-<pre>
-   git clone git://anongit.freedesktop.org/git/xorg/util/makedepend
-</pre>
-
-<p>Get the latest stable mesa version from SourceForge (currently 7.0.3)
-<a href="http://sourceforge.net/project/showfiles.php?group_id=3">http://sourceforge.net/project/showfiles.php?group_id=3</a>
-</p>
-
-<p>Copy the miniglx folder from 7.1-prerelease to 7.0.3.
-You may also extract GLUT to 7.0.3 version at this step. 
-</p>
-
-<p>Edit linux-solo.conf at /conf directory, just only compile the
-graphics driver you need, delete the unwanted drivers names from the
-list(some drivers are causing problems...)
-</p>
-<pre>
-   while(build==0)
-   {
-     make linux-solo
-
-     There will be some missing header files, copy them from 7.1-prerelease
-   }
+   cvs -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri co drm
 </pre>
 
 <p>
-When complete you should have the following:
+Compile the DRM kernel modules:
 </p>
+<pre>
+  cd drm/linux
+  make
+</pre>
+
+<p>
+Note: you may need to be root in order to make a few symlinks.
+</p>
+<p>
+When compilation is done, you should have at least the following
+kernel modules:
+</p>
+<pre>
+  gamma.o
+  i810.o
+  i830.o
+  mach64.o
+  mga.o
+  r128.o
+  radeon.o
+  savage.o
+  sis.o
+  tdfx.o
+  via.o
+</pre>
+<p>
+You'll probably want to copy/move them into your kernel module directory
+(for example: <code>/lib/modules/2.4.18-14/kernel/drivers/char/drm/</code>).
+</p>
+
+
+
+<h2>2.2 Compiling the Mesa drivers</h2>
+
+<p>
+Begin by editing the <code>Mesa/configs/default</code> file to set
+the <code>DRM_SOURCE_PATH</code> variable.
+Set it to the location where the DRM module sources are located.
+For example, if your current directory in step 2.1 was <code>/home/fred/</code>
+set DRM_SOURCE_PATH to <code>/home/fred/drm</code>
+</p>
+
+<p>
+Next, assuming you're starting with a fresh Mesa CVS checkout,
+do the following:
+</p>
+<pre>
+   make linux-solo
+</pre>
+
+<p>
+If you previously built the source tree, run <code>make realclean</code>
+first to remove the old object files.
+</p>
+
+<p>
+When this is finished, check the <code>Mesa/lib/</code> directory
+to verify that the following files were made:
+</p>
+
 <ul>
-<li>lib/libGL.so - the GL library which applications link with
-</li><li>lib/*_dri_so - DRI drivers
-</li><li>lib/miniglx.conf - sample MiniGLX config file
-</li><li>progs/miniglx/* - several MiniGLX sample programs
-</li></ul>
-
-To install these files into appropriate locations in system:
-<pre>
-   make install
-</pre>
-
-Now your openGL libraries are copied to /usr/local/lib and
-miniglx.conf is copied to /etc. You may copy them to /usr/lib and
-overwrite your old GL libraries. Or you may export following variable:
-
-<pre>
-   export LIBGL_DRIVERS_PATH=/usr/local/lib
-</pre>
-<br>
+<li><code>libGL.so.1.2</code> - the client-side OpenGL library
+    (and a few symlinks to it).
+<li><code>libGLU.so.1.1</code> - the GLU library (and a few symlinks to it).
+<li><code>libglut.so.3.7</code> - the GLUT library (and a few symlinks to it).
+<li><code>mga_dri.so</code> - DRI driver for Matrox G200/G400 cards.
+<li><code>r128_dri.so</code> - DRI driver for ATI Rage 128 cards.
+<li><code>r200_dri.so</code> - DRI driver for ATI R200 Radeon cards.
+<li><code>radeon_dri.so</code> - DRI driver for original ATI Radeon cards.
+<li><code>i810_dri.so</code> - DRI driver for Intel i810/i815 chips.
+<li><code>i830_dri.so</code> - DRI driver for Intel i830/i845 chips.
+<li><code>mga_dri.so</code> - DRI driver for Matrox G200/G400 cards.
+<li><code>sis_dri.so</code> - DRI driver for SIS cards.
+<li><code>tdfx_dri.so</code> - DRI driver for 3dfx Voodoo 3/4/5 cards.
+<li><code>gamma_dri.so</code> - DRI driver for 3Dlabs gamma cards.
+<li><code>fb_dri.so</code> - software-only fbdev driver.
+<li><code>miniglx.conf</code> - configuration file for the MiniGLX interface
+</ul>
 
 
 <h1>3. Using fbdev/DRI</h1>
 
 <p>
-If an X server currently running, exit/stop it so you're working from
-the console. Following command shuts down the x window and also the multi user support.
+If XFree86 is currently running, exit/stop the X server so you're
+working from the console.
 </p>
-<pre>
-   init 1
-</pre>
 
-<p>Also you may define the runlevel as 1 in "/etc/inittab". Your system
-will always start in single user mode and without x-window with this
-option set.
-</p><h2>3.1 Load Kernel Modules</h2>
+
+<h2>3.1 Load Kernel Modules</h2>
 
 <p>
 You'll need to load the kernel modules specific to your graphics hardware.
 Typically, this consists of the agpgart module, an fbdev driver module
-and the DRM kernel module.
-</p>
-<p>
-As root, the kernel modules can be loaded as follows:
+and the DRM kernel module (from step 2.1).
 </p>
 
-<p>
-If you have Intel i915/i945 hardware:
-</p>
-<pre>   modprobe agpgart            # the AGP GART module
-   modprobe intelfb            # the Intel fbdev driver
-   modprobe i915               # the i915/945 DRI kernel module
-</pre>
 
 <p>
-If you have ATI Radeon/R200 hardware:
+If you have ATI Radeon/R200 hardware, run as root:
 </p>
-<pre>   modprobe agpgart            # the AGP GART module
+<pre>
+   modprobe agpgart            # the AGP GART module
    modprobe radeonfb           # the Radeon fbdev driver
    modprobe radeon             # the Radeon DRI kernel module
 </pre>
 
 <p>
-If you have ATI Rage 128 hardware:
+If you have ATI Rage 128 hardware, run as root:
 </p>
-<pre>   modprobe agpgart            # the AGP GART module
+<pre>
+   modprobe agpgart            # the AGP GART module
    modprobe aty128fb           # the Rage 128 fbdev driver
    modprobe r128               # the Rage 128 DRI kernel module
 </pre>
 
 <p>
-If you have Matrox G200/G400 hardware:
+If you have Matrox G200/G400 hardware, run as root:
 </p>
-<pre>   modprobe agpgart            # the AGP GART module
+<pre>
+   modprobe agpgart            # the AGP GART module
    modprobe mgafb              # the Matrox fbdev driver
    modprobe mga                # the Matrox DRI kernel module
 </pre>
 
 <p>
-To verify that the agpgart, fbdev and drm modules are loaded:
+Then run <code>lsmod</code> to be sure the modules are loaded.
+For a Radeon card, you should see something like this:
 </p>
-<pre>   ls -l /dev/agpgart /dev/fb* /dev/dri
+<pre>
+Module                  Size  Used by    Not tainted
+radeon                110308   0  (unused)
+radeonfb               21900   0  (unused)
+agpgart                43072   1 
 </pre>
-<p>
-Alternately, use lsmod to inspect the currently installed modules.
-If you have problems, look at the output of dmesg.
-</p>
+
 
 
 <h2>3.2 Configuration File</h2>
 
 <p>
-review/edit /etc/miniglx.conf.
-Alternately, the MINIGLX_CONF environment variable can be used to
-indicate the location of miniglx.conf
+The <code>Mesa/lib/miniglx.conf</code> file should be installed
+in <code>/etc/</code>.
 </p>
 
-To determine the pciBusID value, run lspci and examine the output.
-For example:
-<p></p>
-<pre>   /sbin/lspci:
-   00:02.0 VGA compatible controller: Intel Corporation 82915G/GV/910GL Express Chipset Family Graphics Controller (rev 04)
-</pre>
 <p>
-00:02.0 indicates that pciBusID should be PCI:0:2:0
+Edit <code>/etc/miniglx.conf</code> to be sure it's set up correctly
+for your hardware.
+Comments in the file explain the options.
 </p>
 
 
-
-
 <h2>3.3 Running fbdev/DRI Programs</h2>
 
 <p>
 Make sure your LD_LIBRARY_PATH environment variable is set to the
-location of the libGL.so library.  You may need to append other paths
-to LD_LIBRARY_PATH if libpciaccess.so is in a non-standard location,
-for example.
+<code>Mesa/lib/</code> directory.
 </p>
 
 <p>
 Change to the <code>Mesa/progs/miniglx/</code> directory and
 start the sample_server program in the background:
 </p>
-<pre>   ./sample_server &amp;
+<pre>
+   ./sample_server &
 </pre>
 
 <p>
 Then try running the <code>miniglxtest</code> program:
 </p>
-<pre>   ./miniglxtest
+<pre>
+   ./miniglxtest
 </pre>
 <p>
 You should see a rotating quadrilateral which changes color as it rotates.
@@ -292,30 +263,34 @@ It will exit automatically after a bit.
 If you run other tests in the miniglx/ directory, you may want to run
 them from a remote shell so that you can stop them with ctrl-C.
 </p>
-<br>
+
 
 
 <h1>4.0 Troubleshooting</h1>
 
-<ol>
-<li>
+<p>
 If you try to run miniglxtest and get the following:
-<br>
-<pre>   [miniglx] failed to probe chipset
+</p>
+<pre>
+   [miniglx] failed to probe chipset
    connect: Connection refused
    server connection lost
 </pre>
+<p>
 It means that the sample_server process is not running.
-<br>
-<br>
-</li>
-</ol>
+</p>
+
+
 
 
 <h1>5.0 Programming Information</h1>
 
 <p>
-OpenGL/Mesa is interfaced to fbdev via the <a href="http://www.nabble.com/file/p15480666/MiniGLX.html">MiniGLX</a>
+The full OpenGL API is available with fbdev/DRI.
+</p>
+
+<p>
+OpenGL/Mesa is interfaced to fbdev via the <a href="MiniGLX.html">MiniGLX</a>
 interface.
 MiniGLX is a subset of Xlib and GLX API functions which provides just
 enough functionality to setup OpenGL rendering and respond to simple
@@ -336,6 +311,5 @@ See the <code>GL/miniglx.h</code> header file for details.
 </p>
 
 
-
 </body>
 </html>

docs/glfbdev-driver.html

@@ -70,7 +70,7 @@ tty group as well
 
 <h1>4. Using fbdevglut</h1>
 Almost all of the programs in the progs directory use glut, and they compile with fbdevglut.
-
+Currently glBlendFunc is not working with glFBDev.
 <p>
 To compile the redbook sample programs:
 <pre>

docs/helpwanted.html

@@ -6,7 +6,7 @@
 
 <BODY>
 
-<H1>Help Wanted / To-Do List</H1>
+<H1>Help Wanted</H1>
 
 <p>
 We can always use more help with the Mesa project.
@@ -14,13 +14,36 @@ Here are some specific ideas and areas where help would be appreciated:
 </p>
 
 <ol>
-<li>
-Enable -Wstrict-aliasing=2 -fstrict-aliasing and track down aliasing
-issues in the code.
-<li>
-Windows 98/NT driver building, maintenance and testing
-<li>
-Maintenance and testing of lesser-used drivers, such as DOS/DJGPP, GGI, etc.
+<li><p>
+    Generate the src/mesa/main/enums.c file with a Python script which
+    uses the gl_API.xml file.
+    </p>
+<li><p>
+    Try to auto-generate the display list "save" functions seen in dlist.c
+    using a Python script and the gl_API.xml file.
+    The gl_API.xml file will probably need a new tag to indicate whether or
+    not each function gets compiled into display lists.
+    </p>
+<li><p>
+    Maintenance of assembly language files on Linux, Windows and SPARC systems.
+    </p>
+<li><p>
+    Help to incorporate the 3Dlabs' shading language compiler for OpenGL 2.0.
+    </p>
+<li><p>
+    Implement assembly language (SSE/MMX) code generation for
+    vertex/fragment programs.
+    </p>
+<li><p>
+    Windows 98/NT driver building, maintenance and testing
+    (Karl Schultz has been doing a great job of this lately).
+    </p>
+<li><p>
+    Maintenance and testing of various drivers, such as DOS/DJGPP, GGI, etc.
+    </p>
+<li><p>
+    Write new tests for Glean.
+    </p>
 </ol>
 
 

docs/install.html

@@ -57,31 +57,45 @@ the DRI hardware drivers.
 
 <li>
 <p>
-For Mesa 7.0.2 <a href="http://dri.freedesktop.org/libdrm/">
-DRM version 2.3</a> is required.
+DRM kernel modules and header files from the
+<a href="http://dri.sf.net/" target="_parent">DRI</a> project.
+</p>
+
+<p>
+If you don't already have the DRM file, you can get the sources from
+CVS by doing:
+<pre>
+cvs -z3 -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri co drm
+</pre>
+<p>
+See the <a href="http://dri.freedesktop.org/wiki/Building" target="_parent">
+DRI Building Instructions</a> for the steps to build the DRM modules.  Mesa
+6.5 requires at least libdrm 2.0.1 or greater.
 </p>
 <p>
-To check if you already have it, run:
-<br>
-<code>pkg-config --modversion libdrm</code>
-</p>
-<p>
-You can download and install a <a href="http://dri.freedesktop.org/libdrm/">
-tarball release</a> or get the code from git with:
-<br>
-<code>git clone git://anongit.freedesktop.org/git/mesa/drm</code>
-<br>
-Then revert to the drm-2.3.0 tag with:
-<br>
-<code>git-reset --hard drm-2.3.0</code>
-</p>
+You can verify that the DRM files have been properly installed by
+running <code>pkg-config --modversion libdrm</code>
+
 </li>
 
 <li>
-Relatively recent
+Recent /usr/include/GL/glxproto.h file.
+<p>You'll need this if you get any errors about _GLXvop_BindTexImageEXT
+being undefined.
+</p>
+<p>The latest version can be
+obtained from <A href="http://webcvs.freedesktop.org/*checkout*/xorg/proto/GL/glxproto.h?rev=1.9&content-type=text%2Fplain">freedesktop.org CVS</a>
+</p>
+</li>
+
+<li>DRI-enabled X server.
+<p>Visit
+<a href="http://www.xfree86.org" target="_parent">XFree86</a>
+or
 <a href="http://freedesktop.org/wiki/Software_2fXserver" target="_parent">
-X.org</a> release.
-Mesa depends on a number of X header and library files.
+X.org</a>
+for more information.
+</p>
 </li>
 
 </ol>
@@ -268,15 +282,7 @@ already installed, you'll have to choose different directories, like
 To install Mesa's headers and libraries, run <code>make install</code>.
 But first, check the Mesa/configs/default file and examine the values
 of the <b>INSTALL_DIR</b> and <b>DRI_DRIVER_INSTALL_DIR</b> variables.
-Change them if needed, then run <code>make install</code>.
-</p>
-
-<p>
-The variable
-<b>DESTDIR</b> may also be used to install the contents to a temporary
-staging directory.
-This can be useful for package management.
-For example: <code>make install DESTDIR=/somepath/</code>
+Change them if needed, then run <code>make install</code>
 </p>
 
 <p>
@@ -287,26 +293,6 @@ This is a handy way to compare multiple OpenGL implementations.
 </p>
 
 
-<H3>1.5 pkg-config support</H3>
-
-<p>
-Running <code>make install</code> will install package configuration files
-for the pkg-config utility.
-</p>
-
-<p>
-When compiling your OpenGL application you can use pkg-config to determine
-the proper compiler and linker flags.
-</p>
-
-<p>
-For example, compiling and linking a GLUT application can be done with:
-</p>
-<pre>
-   gcc `pkg-config --cflags --libs glut` mydemo.c -o mydemo
-</pre>
-
-<br>
 
 <a name="windows">
 <H2>2. Windows Compilation and Installation</H1>

docs/intro.html

@@ -9,31 +9,35 @@
 <H1>Introduction</H1>
 
 <p>
-Mesa is an open-source implementation of the
-<a href="http://www.opengl.org/" target="_parent">OpenGL</a> specification -
-a system for rendering interactive 3D graphics.
+Mesa is a 3-D graphics library with an API which is very similar to
+that of <a href="http://www.opengl.org/" target="_parent">OpenGL</a>.*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from <a
+href="http://www.sgi.com/" target="_parent">Silicon Graphics,
+Inc.</a>(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
 </p>
 
 <p>
-A variety of device drivers allows Mesa to be used in many different
-environments ranging from software emulation to complete hardware acceleration
-for modern GPUs.
+Please do not refer to the library as <em>MesaGL</em> (for legal
+reasons). It's just <em>Mesa</em> or <em>The Mesa 3-D graphics
+library</em>. <br>
 </p>
 
 <p>
-Mesa ties into several other open-source projects: the 
-<a href="http://dri.sf.net/" target="_parent">Direct Rendering Infrastructure</a>
-and <a href="http://x.org" target="_parent">X.org</a> to provide OpenGL
-support to users of X on Linux, FreeBSD and other operating systems.
+* OpenGL is a trademark of <a href="http://www.sgi.com/"
+target="_parent">Silicon Graphics Incorporated</a>.
 </p>
 
 
-
 <H1>Project History</H1>
 
 <p>
-The Mesa project was originally started by Brian Paul.
-Here's a short history of the project.
+The Mesa project was founded by me, Brian Paul.  Here's a short history
+of the project.
 </p>
 
 <p>
@@ -128,15 +132,10 @@ specification as well as the GL_ARB_vertex_program and
 GL_ARB_fragment_program extensions.
 </p>
 
-<p>
-June 2007: Mesa 7.0 is released, implementing the OpenGL 2.1 specification
-and OpenGL Shading Language.
-</p>
-
 
 <p>
 Ongoing: Mesa is used as the core of many hardware OpenGL drivers for
-the XFree86 and X.org X servers within the
+the XFree86 X.org X servers within the
 <A href="http://dri.freedesktop.org/" target="_parent">DRI project</A>.
 I continue to enhance Mesa with new extensions and features.
 </p>
@@ -146,16 +145,9 @@ I continue to enhance Mesa with new extensions and features.
 <H1>Major Versions</H1>
 
 <p>
-This is a summary of the major versions of Mesa.
-Mesa's major version number has been incremented whenever a new version
-of the OpenGL specification is implemented.
-</p>
-
-
-<H2>Version 7.x features</H2>
-<p>
-Version 7.x of Mesa implements the OpenGL 2.1 API.  The main feature
-of OpenGL 2.x is the OpenGL Shading Language.
+This is a summary of the major versions of Mesa.  Note that Mesa's major
+version number tracks OpenGL's minor version number (+1).
+Work is underway to implement the OpenGL 2.0 specification.
 </p>
 
 

docs/license.html

@@ -6,34 +6,6 @@
 
 <BODY>
 
-<H1>Disclaimer</H1>
-
-<p>
-Mesa is a 3-D graphics library with an API which is very similar to
-that of <a href="http://www.opengl.org/" target="_parent">OpenGL</a>.*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from <a
-href="http://www.sgi.com/" target="_parent">Silicon Graphics,
-Inc.</a>(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-</p>
-
-<p>
-Please do not refer to the library as <em>MesaGL</em> (for legal
-reasons). It's just <em>Mesa</em> or <em>The Mesa 3-D graphics
-library</em>. <br>
-</p>
-
-<p>
-* OpenGL is a trademark of <a href="http://www.sgi.com/"
-target="_parent">Silicon Graphics Incorporated</a>.
-</p>
-
-
-
 <H1>License / Copyright Information</H1>
 
 <p>
@@ -52,7 +24,7 @@ The default Mesa license is as follows:
 </p>
 
 <pre>
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -86,32 +58,29 @@ and their respective licenses.
 <H1>Mesa Component Licenses</H1>
 
 <pre>
-Component         Location               License
-------------------------------------------------------------------
-Main Mesa code    src/mesa/              Mesa (MIT)
+Component         Location               Primary Author      License
+----------------------------------------------------------------------------
+Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
 
-Device drivers    src/mesa/drivers/*     MIT, generally
+Device drivers    src/mesa/drivers/*     See drivers         See drivers
 
-Ext headers       include/GL/glext.h     Khronos
+Ext headers       include/GL/glext.h     SGI                 SGI Free B
                   include/GL/glxext.h
 
-GLUT              src/glut/              Mark Kilgard's copyright
+GLUT              src/glut/              Mark Kilgard        Mark's copyright
 
-SGI GLU library   src/glu/sgi/           SGI Free B
+Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
 
-demo programs     progs/demos/           see source files
+SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
 
-X demos           progs/xdemos/          see source files
+demo programs     progs/demos/           various             see source files
 
-SGI demos         progs/samples/         SGI license
+X demos           progs/xdemos/          Brian Paul          see source files
 
-RedBook demos     progs/redbook/         SGI license
+SGI demos         progs/samples/         SGI                 SGI copyright
+
+RedBook demos     progs/redbook/         SGI                 SGI copyright
 </pre>
 
-<p>
-In general, consult the source files for license terms.
-</p>
-
-
 </body>
 </html>

docs/lists.html

@@ -9,58 +9,47 @@
 <H1>Mailing Lists</H1>
 
 
-<p>There are four Mesa mailing lists:
-</p>
-
+<p>There are four Mesa mailing lists:</p>
 <ul>
-<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-announce"
-target="_parent">mesa3d-announce</a> - announcements of new Mesa
-versions are sent to this list.
-</li>
-<br>
-<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-users"
-target="_parent">mesa3d-users</a> - intended for users of the Mesa library.
-Newbie questions are appropriate, but please try the general OpenGL
-resources and Mesa documentation first.
-</li>
-<br>
-<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-dev"
-target="_parent">mesa3d-dev</a> - for discussion of Mesa development.
-Not for beginners.
-</li>
-<br>
-<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-commit"
-target="_parent">mesa-commit</a> - relays git check-in messages
-(for developers).
-<br>
-Note: the old mesa3d-cvs list is no longer in use.
-</li>
-</ul>
+<li><b>mesa3d-users</b> - intended for users of the Mesa library.
+Newbie questions are appropriate, but please try reading the Mesa documentation first.
+</li><li><b>mesa3d-dev</b> - intended for developers of the Mesa library.
+This is not for beginners.
+</li><li><b>mesa3d-cvs</b> - CVS check-in messages are sent to this list.
+This is useful for tracking ongoing development changes.
+</li><li><b>mesa3d-announce</b> - announcements of new Mesa versions are sent to this list.
+</li></ul>
 
 <p>
-<b>Notice</b>: non-member posts to any of these lists will be automatically
-rejected.
+To subscribe or unsubscribe, go to the
+<a href="http://www.sourceforge.net/mail/?group_id=3" target="_parent">
+SourceForge lists page.</a>
 </p>
 
+<p>The mailing lists are managed by SourceForge.  If you're having trouble
+with the mailing lists please contact the SourceForge administrators for help.</p>
 
-<br>
-
-<H1>OpenGL Forums</H1>
+<p>Archives of the old Mesa mailing list which was hosted by unicamp.br
+are available <a href="http://groups.yahoo.com/group/mesa/messages/"
+target="_parent">here</a>.</p>
 
 <p>
 Here are some other OpenGL-related forums you might find useful:
 </p>
 
+<p>
+Usenet newsgroups:
 <ul>
-<li><a href="http://www.opengl.org/cgi-bin/ubb/ultimatebb.cgi"
-target="_parent">OpenGL discussion forums</A> at www.opengl.org</li>
-<li>Usenet newsgroups:
-<ul>
-<li>comp.graphics.algorithms</li>
-<li>comp.graphics.api.opengl</li>
-<li>comp.os.linux.x</li>
-</ul>
+<li>comp.graphics.algorithms
+<li>comp.graphics.api.opengl
+<li>comp.os.linux.x
 </ul>
+</p>
+
+<p>
+<a href="http://www.opengl.org/" target="_parent">OpenGL discussion forums</A>
+at www.opengl.org
+</p>
 
 </HTML>
 </BODY>

docs/mangling.html

@@ -9,8 +9,8 @@
 <H1>Function Name Mangling</H1>
 
 <p>
-If you want to use both Mesa and another OpenGL library in the same
-application at the same time you may find it useful to compile Mesa with
+If you want to use Mesa and native OpenGL in the same application at
+the same time you may find it useful to compile Mesa with
 <i>name mangling</i>.
 This results in all the Mesa functions being prefixed with
 <b>mgl</b> instead of <b>gl</b>.
@@ -18,11 +18,9 @@ This results in all the Mesa functions being prefixed with
 
 <p>
 To do this, recompile Mesa with the compiler flag -DUSE_MGL_NAMESPACE.
-Add the flag to CFLAGS in the configuration file which you want to use.
-For example:
-<pre>
-CFLAGS += -DUSE_MGL_NAMESPACE
-</pre>
+Add the flag to the other compiler flags in Make-config (if using the
+old-style build system) or in src/Makefile if using GNU autoconf/
+automake to build Mesa.
 </p>
 
 

docs/memory.html

@@ -1,21 +0,0 @@
-<HTML>
-
-<TITLE>Mesa News</TITLE>
-
-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<body bgcolor="#eeeeee">
-
-<H1>DRI Memory Management</H1>
-
-<p>
-Thomas Hellstr&ouml;m's 
-<a href="http://www.tungstengraphics.com/mm.pdf">Memory Management
-whitepaper</a> describes the goals, design and implementation of the
-new DRI memory management system.
-</p>
-
-</body>
-</html>

docs/modelers.html

@@ -9,7 +9,7 @@
 <H1>Modelers, Renderers and Viewers</H1>
 
 <ul>
-        <li><a href="http://www.aqsis.org/" target="_parent">Aqsis</a> - a RenderMan compatible renderer</li>
+        <li><a href="http://www.aqsis.com/" target="_parent">Aqsis</a> - a RenderMan compatible renderer</li>
 	<li><a href="http://www.ac3d.org/" target="_parent">AC3D</a> - 3-D modeler
 	</li><li><a href="http://mesa3d.sourceforge.net/notfound.html">ARCAD</a> - CAD program
 	</li><li><a href="http://www.mediascape.com/" target="_parent">Artstream</a> - provides
@@ -28,7 +28,7 @@
 	</li><li><a href="http://innovation3d.sourceforge.net/" target="_parent">Innovation3D</a>
 	- 3D modeling program
 	</li><li><a href="http://mesa3d.sourceforge.net/notfound.html" target="_parent">KWRL</a> - VRML browser
-	</li><li><a href="http://www.openvrml.org/" target="_parent">LibVRML97/Lookat</a>
+	</li><li><a href="http://www.vermontel.com/%7Ecmorley/vrml.html" target="_parent">LibVRML97/Lookat</a>
 	- VRML viewer
 	</li><li><a href="http://aig.cs.man.ac.uk/systems/Maverik/" target="_parent">Maverik</a>
 	- VR graphics and interaction system

docs/news.html

@@ -11,124 +11,179 @@
 <H1>News</H1>
 
 
-<h2>April 4, 2008</h2>
-<p>
-<a href="relnotes-7.0.3.html">Mesa 7.0.3</a> is released.
-This is a bug-fix release.
-</p>
-
-
-<h2>November 13, 2007</h2>
-
-<p>
-Gallium3D is the codename for the new Mesa device driver architecture
-which is currently under development.
-A <a href="http://www.tungstengraphics.com/wiki/index.php/Gallium3D"
-target="_parent"> summary</a> of the architecture can be found on the
-Tungsten Graphics website.
-</p>
-<p>
-Gallium3D development is taking place on the <em>gallium-0.1</em> branch
-of the git repository.
-Currently, there's only a software-only driver and an Intel i915/945 driver
-but other drivers will be coming...
-</p>
-
-
-<h2>November 10, 2007</h2>
-<p>
-<a href="relnotes-7.0.2.html">Mesa 7.0.2</a> is released.
-This is a bug-fix release.
-</p>
-
-
-<h2>August 3, 2007</h2>
-<p>
-<a href="relnotes-7.0.1.html">Mesa 7.0.1</a> is released.
-This is a bug-fix release.
-</p>
-
-
-<h2>June 22, 2007</h2>
-<p>
-<a href="relnotes-7.0.html">Mesa 7.0</a> is released.
-This is a stable release featuring OpenGL 2.1 support.
-</p>
-
-
-<h2>April 27, 2007</h2>
-<p>
-<a href="relnotes-6.5.3.html">Mesa 6.5.3</a> is released.
-This is a development release which will lead up to the Mesa 7.0 release
-(which will advertise OpenGL 2.1 API support).
-</p>
-
-
-<h2>March 26, 2007</h2>
-<p>
-The new Shading Language compiler branch has been merged into the git
-master branch.  This is a step toward hardware support for the OpenGL
-2.0 Shading Language and will be included in the next Mesa release.
-In conjunction, <a href="http://glean.sf.net" target="_parent">Glean
-</a> has been updated with a new test that does over 130 tests of the
-shading language and built-in functions.
-</p>
-
-<h2>April 2007</h2>
-<p>
-Thomas Hellstr&ouml;m of
-<a href="http://www.tungstengraphics.com" target="_parent">
-Tungsten Graphics</a> has written a whitepaper describing the new
-<a href="http://www.tungstengraphics.com/mm.pdf">DRI memory management
-system</a>.
-</p>
-
-<h2>December 5, 2006</h2>
-<p>
-Mesa is now using git as its source code management system.
-The previous CVS repository should no longer be used.
-See the <a href="repository.html">repository page</a> for more information.
-</p>
-
-<h2>December 2, 2006</h2>
-<p>
-<a href="relnotes-6.5.2.html">Mesa 6.5.2</a> has been released.
-This is a new development release.
-</p>
-
-<h2>September 15, 2006</h2>
-<p>
-<a href="relnotes-6.5.1.html">Mesa 6.5.1</a> has been released.
-This is a new development release.
-</p>
-
 <h2>March 31, 2006</h2>
 <p>
-<a href="relnotes-6.5.html">Mesa 6.5</a> has been released.
-This is a new development release.
+Mesa 6.5 has been released.  This is a new development release.
 </p>
+<pre>
+    New:
+	- OpenGL Shading Language support through GL_ARB_shader_objects,
+	  GL_ARB_shading_language_100, GL_ARB_vertex_shader and
+	  GL_ARB_fragment_shader (done by Michal Krol)
+	- GL_EXT_packed_depth_stencil extension
+	- GL_EXT_timer_query extension
+	- GL_EXT_framebuffer_blit extension
+	- GL_ARB_half_float_pixel
+	- GLX_MESA_copy_sub_buffer for DRI drivers (Dave Reveman)
+	- reflect demo improved to support multiple windows
+	- singlebuffer demo (shows no/little-flicker single-buffered rendering)
+	- r200: enable GL_ARB_texture_env_crossbar, separate the texture
+	  sampling unit bits from the texture env combine enable bits
+	- r200: add support for GL_ATI_fragment_shader
+	- added fast XOR-mode line drawing optimization
+	- radeon: add support for all 3 tmus, GL_ARB_texture_cube_map
+	  and GL_EXT_fog_coord
+	- MESA_GLX_ALPHA_BITS env var for xlib driver
+	- many DRI driver updates (including screen rotation support
+	  for the Intel DRI driver)
+    Changes:
+	- removed GL_HP_occlusion_test (use GL_ARB_occlusion_query instead)
+	- removed GL_SGIX/SGIS_pixel_texture extensions
+    Bug fixes:
+	- fixed glxcontextmodes.c datatype problem (bug 5835)
+	- fixed aix-gcc build/install bugs (bug 5874)
+	- fixed some bugs in texture env program generation
+	- glXCopyContext() didn't handle texture object bindings properly
+	- glXCopyContext() didn't copy all lighting state
+	- fixed FreeBSD config (Pedro Giffuni)
+	- fixed some minor framebuffer object bugs
+	- replaced dprintf() with _glu_printf() in GLU (bug 6244)
+	- fixed a number of thread safety bugs/regressions
+	- fixed a number of GLU tesselator bugs (John Shell, bug 6339)
+	- paletted texturing was broken w/ floating point palettes (K. Schultz)
+	- lots of assorted framebuffer object bug fixes
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+657be3b92f6dabc78a67ed9cb8d67813  MesaLib-6.5.tar.gz
+61beda590bfc5b4a12e979d5f2d70d7a  MesaLib-6.5.tar.bz2
+19d48b872d579d4f91466060804a59ac  MesaLib-6.5.zip
+694ad3a7007010c7418a9c72d1cba5b7  MesaDemos-6.5.tar.gz
+ab95b590dcd640726a2d89e62068c66e  MesaDemos-6.5.tar.bz2
+b792c303fefd87294488e2b7eab976e5  MesaDemos-6.5.zip
+ac1d585483617db0c91e5c15cb5ec3a3  MesaGLUT-6.5.tar.gz
+59f0bf2b2ffb67fe23ee479f9b044f31  MesaGLUT-6.5.tar.bz2
+005decb2136718e22222ac1c4805cd15  MesaGLUT-6.5.zip
+</pre>
 
 
 <h2>February 2, 2006</h2>
 <p>
-<a href="relnotes-6.4.2.html">Mesa 6.4.2</a> has been released.
-This is stable, bug-fix release.
+Mesa 6.4.2 has been released.  This is primarily a bug-fix release.
 </p>
+<pre>
+    New items:
+	- added OSMesaColorClamp() function/feature
+	- added wglGetExtensionStringARB() function
+    Bug fixes:
+	- fixed some problems when building on Windows
+	- GLw header files weren't installed by installmesa script (bug 5396)
+	- GL/glfbdev.h file was missing from tarballs
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+cb0d745d520fa7c2bb9178058b763544  MesaLib-6.4.2.tar.gz
+7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2
+d224e1325b33ff71a0f3893fc6b4d594  MesaLib-6.4.2.zip
+d4b345d4588fc750cd3d34f3ac26673e  MesaDemos-6.4.2.tar.gz
+9cae1ab874af533ce356bd7dfe2e0bb0  MesaDemos-6.4.2.tar.bz2
+2da6e1d1245e441d27813595c6ba50de  MesaDemos-6.4.2.zip
+84427d18c3453f0ea52388eeba7169b5  MesaGLUT-6.4.2.tar.gz
+b157ba8ad1ea63260cf5339132e7aac6  MesaGLUT-6.4.2.tar.bz2
+fe1523744fc05edc3811dfc6a1bf4181  MesaGLUT-6.4.2.zip
+</pre>
 
 
 <h2>November 29, 2005</h2>
 <p>
-<a href="relnotes-6.4.1.html">Mesa 6.4.1</a> has been released.
-This is stable, bug-fix release.
+Mesa 6.4.1 has been released.  This is a stable, bug-fix release.
 </p>
+<pre>
+    Bug fixes:
+	- redefining a vertex program string didn't take effect in TNL module
+	- fixed occasional segfault upon vertex/fragment parsing error
+	- vertex program LIT instruction didn't handle 0^0=1 correctly
+	- fragment program fog option didn't work with glDrawPixels, glBitmap
+	- USE_MGL_NAMESPACE didn't work for x86-64
+	- OSMesa demos were missing from previous release tarballs
+	- fixed problem with float->ushort conversion in glClear (bug 4992)
+	- popping of GL_EYE_PLANE texgen state was broken (bug 4996)
+	- popping of GL_SPOT_DIRECTION light state was broken (bug 5005)
+	- fixed occasional triangle color interpolation problem on VMS
+	- work around invalid free() call (bug 5131)
+	- fixed BSD X server compilation problem by including stdint.h
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+698ceb574cf882b0226761f5913c0da9  MesaLib-6.4.1.tar.gz
+ea148c828ec6f645526451db1b8556f1  MesaLib-6.4.1.tar.bz2
+42e93279468975ed2bf3111b8721e5d9  MesaLib-6.4.1.zip
+e3b0d50807fd2bdcd1a95aaddd786f13  MesaDemos-6.4.1.tar.gz
+99df1fdcb98d391666b476ca6f1dda8a  MesaDemos-6.4.1.tar.bz2
+b999d2c6d92fb4b7740a3dbd889348e3  MesaDemos-6.4.1.zip
+eadfe01fe5ddfb1eb8227dd567b31635  MesaGLUT-6.4.1.tar.gz
+bd003bb4f981a4f91dee4c38644d4f3f  MesaGLUT-6.4.1.tar.bz2
+71c401c037088bf688a88afdaeb3420f  MesaGLUT-6.4.1.zip
+</pre>
+
 
 
 
 <h2>October 24, 2005</h2>
 <p>
-<a href="relnotes-6.4.html">Mesa 6.4</a> has been released.
-This is stable, bug-fix release.
+Mesa 6.4 has been released.  This is a stable, bug-fix release.
 </p>
+<pre>
+    New:
+	- Added a fast XOR line drawing function in Xlib driver
+	- Added support for GL_ARB_texture_mirrored_repeat to savage
+	  driver (supported only on Savage4 hardware).
+    Changes:
+	- Mesa now packaged in three parts: Library, Demos and GLUT
+    Bug fixes:
+	- GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig
+	- Some files were present multiple times in the 6.3.2 tarballs
+	- r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207)
+	- glxgears_fbconfig demo didn't work (bug 4237)
+	- fixed bug when bilinear sampling 2d textures with borders
+	- glXCreatePbuffer() could segfault instead of returning 0 (bug 4235)
+	- fixed undefined frexp and rand in X.org libGLcore.a (bug 4242)
+	- fixed a few problems with proxy color tables (bug 4270)
+	- fixed precision problem in Z clearing (bug 4395)
+	- glBitmap, glDraw/CopyPixels mistakenly generated selection hits
+	- fixed potential segfault caused by reading pixels outside
+	  of renderbuffer bounds
+	- glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB
+	- fixed memory corruption bug involving software alpha buffers
+	- glReadPixels clipped by window bounds was sometimes broken
+	- glDraw/CopyPixels of stencil data ignored the stencil write mask
+	- glReadPixels from a texture bound to a framebuffer object didn't work
+	- glIsRender/FramebufferEXT weren't totally correct
+	- fixed a number of point size attenuation/fade bugs
+	- fixed glFogCoord bug 4729
+	- GLX encoding for transpose matrix functions was broken
+	- fixed broken fragment program KIL and SWZ instructions
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+1cce0c1eb4fd15e9dfe837a1ce0c9812  MesaLib-6.4.tar.gz
+85a84e47a3f718f752f306b9e0954ef6  MesaLib-6.4.tar.bz2
+b976fea4f3ee06354c53f91b6e3f2ffc  MesaLib-6.4.zip
+d8734f2c69bcf7ef9f5ae454a85743ba  MesaDemos-6.4.tar.gz
+1a8c4d4fc699233f5fdb902b8753099e  MesaDemos-6.4.tar.bz2
+607ab7c7a7de0cc5febbdde2bfa03098  MesaDemos-6.4.zip
+3260156f66174322a092be0767962d34  MesaGLUT-6.4.tar.gz
+0465d053f83775f44a12dec4050dfd78  MesaGLUT-6.4.tar.bz2
+02abfcdcdf72ba938ae00f6e3b70fbe0  MesaGLUT-6.4.zip
+</pre>
 
 
 <h2>August 19, 2005</h2>
@@ -136,7 +191,23 @@ This is stable, bug-fix release.
 Mesa 6.3.2 has been released.
 Note: there was no public release of version 6.3.1.
 </p>
-<a href="versions.html#6.3.2">Changes in version 6.3.1</a>
+<pre>
+    New:
+	- The distribution now includes the DRI drivers and GLX code
+    Changes:
+	- Made the DRI "new" driver interface standard, remove old code
+    Bug fixes:
+	- GL_ARB_vertex/fragment_shader were mistakenly listed in the
+	  extensions string
+	- negative relative addressing in vertex programs was broken
+	- update/fix SPARC assembly code for vertex transformation
+	- fixed memory leak when freeing GLX drawables/renderbuffers
+	- fixed display list memory leak
+	- the GL_PIXEL_MAP_I_TO_I table is now floating point, not integer
+	- wglGetProcAddress() didn't handle wgl-functions
+	- fixed glxext.h cross-compile issue (Colin Harrison)
+	- assorted DRI driver fixes
+</pre>
 <p>
 The MD5 checksums are:
 </p>
@@ -1155,6 +1226,6 @@ source code</a>.</p>
 
 
 <hr>
-$Id: news.html,v 3.33 2006/12/02 18:18:41 brianp Exp $
+$Id: news.html,v 3.28 2006/04/01 02:29:40 brianp Exp $
 </body>
 </html>

docs/relnotes-6.4.1.html

@@ -1,68 +0,0 @@
-<HTML>
-
-<TITLE>Mesa Release Notes</TITLE>
-
-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<body bgcolor="#eeeeee">
-
-<H1>Mesa 6.4.1 / November 29, 2006</H1>
-
-<p>
-Mesa 6.4.1 is a stable, bug-fix release.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-698ceb574cf882b0226761f5913c0da9  MesaLib-6.4.1.tar.gz
-ea148c828ec6f645526451db1b8556f1  MesaLib-6.4.1.tar.bz2
-42e93279468975ed2bf3111b8721e5d9  MesaLib-6.4.1.zip
-e3b0d50807fd2bdcd1a95aaddd786f13  MesaDemos-6.4.1.tar.gz
-99df1fdcb98d391666b476ca6f1dda8a  MesaDemos-6.4.1.tar.bz2
-b999d2c6d92fb4b7740a3dbd889348e3  MesaDemos-6.4.1.zip
-eadfe01fe5ddfb1eb8227dd567b31635  MesaGLUT-6.4.1.tar.gz
-bd003bb4f981a4f91dee4c38644d4f3f  MesaGLUT-6.4.1.tar.bz2
-71c401c037088bf688a88afdaeb3420f  MesaGLUT-6.4.1.zip
-</pre>
-
-
-<h2>Bug fixes</h2>
-<ul>
-<li>redefining a vertex program string didn't take effect in TNL module
-<li>fixed occasional segfault upon vertex/fragment parsing error
-<li>vertex program LIT instruction didn't handle 0^0=1 correctly
-<li>fragment program fog option didn't work with glDrawPixels, glBitmap
-<li>USE_MGL_NAMESPACE didn't work for x86-64
-<li>OSMesa demos were missing from previous release tarballs
-<li>fixed problem with float->ushort conversion in glClear (bug 4992)
-<li>popping of GL_EYE_PLANE texgen state was broken (bug 4996)
-<li>popping of GL_SPOT_DIRECTION light state was broken (bug 5005)
-<li>fixed occasional triangle color interpolation problem on VMS
-<li>work around invalid free() call (bug 5131)
-<li>fixed BSD X server compilation problem by including stdint.h
-</ul>
-
-
-<h2>Driver Status</h2>
-
-<pre>
-Driver			Status
-----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Windows/Win32		implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)  requires updates	
-SVGA			requires updates
-DJGPP			requires updates
-GGI			requires updates
-BeOS			requires updates
-Allegro			requires updates
-D3D			requires updates
-</pre>
-
-</body>
-</html>

docs/relnotes-6.4.2.html

@@ -1,75 +0,0 @@
-<HTML>
-
-<TITLE>Mesa Release Notes</TITLE>
-
-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<body bgcolor="#eeeeee">
-
-<H1>Mesa 6.4.2 / February 2, 2006</H1>
-
-<p>
-Mesa 6.4.2 is a stable, bug-fix release.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-cb0d745d520fa7c2bb9178058b763544  MesaLib-6.4.2.tar.gz
-7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2
-d224e1325b33ff71a0f3893fc6b4d594  MesaLib-6.4.2.zip
-d4b345d4588fc750cd3d34f3ac26673e  MesaDemos-6.4.2.tar.gz
-9cae1ab874af533ce356bd7dfe2e0bb0  MesaDemos-6.4.2.tar.bz2
-2da6e1d1245e441d27813595c6ba50de  MesaDemos-6.4.2.zip
-84427d18c3453f0ea52388eeba7169b5  MesaGLUT-6.4.2.tar.gz
-b157ba8ad1ea63260cf5339132e7aac6  MesaGLUT-6.4.2.tar.bz2
-fe1523744fc05edc3811dfc6a1bf4181  MesaGLUT-6.4.2.zip
-</pre>
-
-
-<h2>New features</h2>
-<ul>
-<li>added OSMesaColorClamp() function/feature
-<li>added wglGetExtensionStringARB() function
-</ul>
-
-<h2>Changes</h2>
-<ul>
-<li>GLUT tarball
-<br>
-Starting with 6.4, the GLUT library sources are distributed in a separate
-tarball.  This was done at the request of Linux distro vendors who prefer
-to use freeglut.
-</ul>
-
-<h2>Bug fixes</h2>
-<ul>
-<li>fixed some problems when building on Windows
-<li>GLw header files weren't installed by installmesa script (bug 5396)
-<li>GL/glfbdev.h file was missing from tarballs
-<li>fixed TNL initialization bug which could lead to crash (bug 5791)
-</ul>
-
-
-<h2>Driver Status</h2>
-
-<pre>
-Driver			Status
-----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Windows/Win32		implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)  requires updates	
-SVGA			requires updates
-DJGPP			requires updates
-GGI			requires updates
-BeOS			requires updates
-Allegro			requires updates
-D3D			requires updates
-</pre>
-
-</body>
-</html>

docs/relnotes-6.4.html

@@ -1,90 +0,0 @@
-<HTML>
-
-<TITLE>Mesa Release Notes</TITLE>
-
-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<body bgcolor="#eeeeee">
-
-<H1>Mesa 6.4 / October 24, 2005</H1>
-
-<p>
-Mesa 6.4 is a stable, bug-fix release.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-1cce0c1eb4fd15e9dfe837a1ce0c9812  MesaLib-6.4.tar.gz
-85a84e47a3f718f752f306b9e0954ef6  MesaLib-6.4.tar.bz2
-b976fea4f3ee06354c53f91b6e3f2ffc  MesaLib-6.4.zip
-d8734f2c69bcf7ef9f5ae454a85743ba  MesaDemos-6.4.tar.gz
-1a8c4d4fc699233f5fdb902b8753099e  MesaDemos-6.4.tar.bz2
-607ab7c7a7de0cc5febbdde2bfa03098  MesaDemos-6.4.zip
-3260156f66174322a092be0767962d34  MesaGLUT-6.4.tar.gz
-0465d053f83775f44a12dec4050dfd78  MesaGLUT-6.4.tar.bz2
-02abfcdcdf72ba938ae00f6e3b70fbe0  MesaGLUT-6.4.zip
-</pre>
-
-
-<h2>New</h2>
-<ul>
-<li>Added a fast XOR line drawing function in Xlib driver
-<li>Added support for GL_ARB_texture_mirrored_repeat to savage driver (supported only on Savage4 hardware).
-</ul>
-
-<h2>Changes</h2>
-<ul>
-<li>Mesa now packaged in three parts: Library, Demos and GLUT
-</ul>
-
-<h2>Bug fixes</h2>
-<ul>
-<li>GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig
-<li>Some files were present multiple times in the 6.3.2 tarballs
-<li>r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207)
-<li>glxgears_fbconfig demo didn't work (bug 4237)
-<li>fixed bug when bilinear sampling 2d textures with borders
-<li>glXCreatePbuffer() could segfault instead of returning 0 (bug 4235)
-<li>fixed undefined frexp and rand in X.org libGLcore.a (bug 4242)
-<li>fixed a few problems with proxy color tables (bug 4270)
-<li>fixed precision problem in Z clearing (bug 4395)
-<li>glBitmap, glDraw/CopyPixels mistakenly generated selection hits
-<li>fixed potential segfault caused by reading pixels outside
-	of renderbuffer bounds
-<li>glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB
-<li>fixed memory corruption bug involving software alpha buffers
-<li>glReadPixels clipped by window bounds was sometimes broken
-<li>glDraw/CopyPixels of stencil data ignored the stencil write mask
-<li>glReadPixels from a texture bound to a framebuffer object didn't work
-<li>glIsRender/FramebufferEXT weren't totally correct
-<li>fixed a number of point size attenuation/fade bugs
-<li>fixed glFogCoord bug 4729
-<li>GLX encoding for transpose matrix functions was broken
-<li>fixed broken fragment program KIL and SWZ instructions
-<li>fragment programs that wrote result.depth.z didn't work
-</ul>
-
-
-<h2>Driver Status</h2>
-
-<pre>
-Driver			Status
-----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Windows/Win32		implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)  requires updates	
-SVGA			requires updates
-DJGPP			requires updates
-GGI			requires updates
-BeOS			requires updates
-Allegro			requires updates
-D3D			requires updates
-</pre>
-
-</body>
-</html>