Prepare changelog for upload.

Change the >= ${source:Version} dependency to >= ${source:Upstream-Version}.
This way libgl1-mesa-dev stays installable after a minor revision bump on
architectures where mesa isn't built yet.

.gitignore

@@ -1,8 +0,0 @@
-*~
-*.a
-*.o
-*.so
-depend
-depend.bak
-lib
-lib64

Makefile

@@ -92,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 \

Makefile.orig

@@ -0,0 +1,453 @@
+# Top-level Mesa makefile
+
+TOP = .
+
+SUBDIRS = src progs
+
+
+default: $(TOP)/configs/current
+	@for dir in $(SUBDIRS) ; do \
+		(cd $$dir ; $(MAKE)) || exit 1 ; \
+	done
+
+
+doxygen:
+	(cd doxygen ; make) ; \
+
+clean:
+	@for dir in $(SUBDIRS) ; do \
+		(cd $$dir ; $(MAKE) clean) ; \
+	done
+
+
+realclean:
+	touch $(TOP)/configs/current
+	$(MAKE) clean
+	-rm -rf lib*
+	-rm -f $(TOP)/configs/current
+	-rm -f `find . -name \*.o`
+	-rm -f `find . -name \*.a`
+	-rm -f `find . -name \*.so`
+	-rm -f `find . -name depend`
+
+
+
+install:
+	@echo "Installing"
+	$(TOP)/bin/installmesa $(DESTDIR)
+
+# DirectFBGL module installation
+linux-directfb-install:
+	cd src/mesa/drivers/directfb && $(MAKE) install
+
+# If there's no current configuration file
+$(TOP)/configs/current:
+	@echo
+	@echo
+	@echo "Please choose a configuration from the following list:"
+	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS"
+	@echo
+	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
+	@echo "(ignore the following error message)"
+	@exit 1
+
+
+# Rules to set/install a specific build configuration
+aix \
+aix-64 \
+aix-gcc \
+aix-static \
+beos \
+darwin \
+darwin-static \
+freebsd \
+freebsd-dri \
+freebsd-dri-amd64 \
+freebsd-dri-x86 \
+hpux10 \
+hpux10-gcc \
+hpux10-static \
+hpux11-32 \
+hpux11-32-static \
+hpux11-32-static-nothreads \
+hpux11-64 \
+hpux11-64-static \
+hpux9 \
+hpux9-gcc \
+irix6-64 \
+irix6-64-static \
+irix6-n32 \
+irix6-n32-static \
+irix6-o32 \
+irix6-o32-static \
+linux \
+linux-alpha \
+linux-alpha-static \
+linux-debug \
+linux-directfb \
+linux-dri \
+linux-dri-x86 \
+linux-dri-x86-64 \
+linux-dri-ppc \
+linux-dri-xcb \
+linux-indirect \
+linux-fbdev \
+linux-glide \
+linux-icc \
+linux-icc-static \
+linux-osmesa16 \
+linux-osmesa16-static \
+linux-osmesa32 \
+linux-ppc \
+linux-ppc-static \
+linux-solo \
+linux-solo-x86 \
+linux-solo-ia64 \
+linux-sparc \
+linux-sparc5 \
+linux-static \
+linux-ultrasparc \
+linux-tcc \
+linux-x86 \
+linux-x86-debug \
+linux-x86-32 \
+linux-x86-64 \
+linux-x86-64-debug \
+linux-x86-64-static \
+linux-x86-glide \
+linux-x86-static \
+netbsd \
+openbsd \
+osf1 \
+solaris-x86 \
+solaris-x86-gcc \
+sunos4 \
+sunos4-gcc \
+sunos4-static \
+sunos5 \
+sunos5-gcc \
+sunos5-64-gcc \
+sunos5-smp \
+ultrix-gcc:
+	(cd configs && rm -f current && ln -s $@ current)
+	$(MAKE) default
+
+
+# Rules for making release tarballs
+
+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/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					\
+	$(DIRECTORY)/include/GL/glext.h					\
+	$(DIRECTORY)/include/GL/gl_mangle.h				\
+	$(DIRECTORY)/include/GL/glu.h					\
+	$(DIRECTORY)/include/GL/glu_mangle.h				\
+	$(DIRECTORY)/include/GL/glx.h					\
+	$(DIRECTORY)/include/GL/glxext.h				\
+	$(DIRECTORY)/include/GL/glx_mangle.h				\
+	$(DIRECTORY)/include/GL/glfbdev.h				\
+	$(DIRECTORY)/include/GL/mesa_wgl.h				\
+	$(DIRECTORY)/include/GL/mglmesa.h				\
+	$(DIRECTORY)/include/GL/osmesa.h				\
+	$(DIRECTORY)/include/GL/svgamesa.h				\
+	$(DIRECTORY)/include/GL/ugl*.h					\
+	$(DIRECTORY)/include/GL/vms_x_fix.h				\
+	$(DIRECTORY)/include/GL/wmesa.h					\
+	$(DIRECTORY)/include/GL/xmesa.h					\
+	$(DIRECTORY)/include/GL/xmesa_x.h				\
+	$(DIRECTORY)/include/GL/xmesa_xf86.h				\
+	$(DIRECTORY)/include/GLView.h					\
+	$(DIRECTORY)/src/Makefile					\
+	$(DIRECTORY)/src/descrip.mms					\
+	$(DIRECTORY)/src/mesa/Makefile*					\
+	$(DIRECTORY)/src/mesa/sources					\
+	$(DIRECTORY)/src/mesa/descrip.mms				\
+	$(DIRECTORY)/src/mesa/depend					\
+	$(DIRECTORY)/src/mesa/main/*.[chS]				\
+	$(DIRECTORY)/src/mesa/main/descrip.mms				\
+	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
+	$(DIRECTORY)/src/mesa/glapi/descrip.mms				\
+	$(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/shader/*.[ch]				\
+	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
+	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
+	$(DIRECTORY)/src/mesa/shader/grammar/descrip.mms		\
+	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
+	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
+	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
+	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
+	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
+	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
+	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
+	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
+	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
+	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
+	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
+	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
+	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
+	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
+	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in	\
+	$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in		\
+	$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
+	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
+	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
+	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
+	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86/Makefile				\
+	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86/*.S					\
+	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86-64/Makefile				\
+	$(DIRECTORY)/progs/Makefile					\
+	$(DIRECTORY)/progs/util/README					\
+	$(DIRECTORY)/progs/util/*.[ch]					\
+	$(DIRECTORY)/progs/util/sampleMakefile				\
+	$(DIRECTORY)/vms/analyze_map.com				\
+	$(DIRECTORY)/vms/xlib.opt					\
+	$(DIRECTORY)/vms/xlib_share.opt					\
+	$(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		\
+	$(DIRECTORY)/include/GL/internal/sarea.h			\
+	$(DIRECTORY)/src/glx/Makefile					\
+	$(DIRECTORY)/src/glx/x11/Makefile				\
+	$(DIRECTORY)/src/glx/x11/*.[ch]					\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
+	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch]		\
+	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
+
+SGI_GLU_FILES = \
+	$(DIRECTORY)/src/glu/Makefile					\
+	$(DIRECTORY)/src/glu/descrip.mms				\
+	$(DIRECTORY)/src/glu/sgi/Makefile				\
+	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
+	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
+	$(DIRECTORY)/src/glu/sgi/glu.def				\
+	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
+	$(DIRECTORY)/src/glu/sgi/descrip.mms				\
+	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
+	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
+	$(DIRECTORY)/src/glu/sgi/libtess/README				\
+	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
+	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
+	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
+
+MESA_GLU_FILES = \
+	$(DIRECTORY)/src/glu/mesa/README[12]		\
+	$(DIRECTORY)/src/glu/mesa/Makefile*		\
+	$(DIRECTORY)/src/glu/mesa/descrip.mms		\
+	$(DIRECTORY)/src/glu/mesa/mms_depend		\
+	$(DIRECTORY)/src/glu/mesa/*.def			\
+	$(DIRECTORY)/src/glu/mesa/depend		\
+	$(DIRECTORY)/src/glu/mesa/*.[ch]
+
+GLW_FILES = \
+	$(DIRECTORY)/src/glw/*.[ch]			\
+	$(DIRECTORY)/src/glw/Makefile*			\
+	$(DIRECTORY)/src/glw/README			\
+	$(DIRECTORY)/src/glw/depend
+
+DEMO_FILES = \
+	$(DIRECTORY)/progs/beos/*.cpp			\
+	$(DIRECTORY)/progs/beos/Makefile		\
+	$(DIRECTORY)/progs/images/*.rgb			\
+	$(DIRECTORY)/progs/images/*.rgba		\
+	$(DIRECTORY)/progs/demos/Makefile*		\
+	$(DIRECTORY)/progs/demos/descrip.mms		\
+	$(DIRECTORY)/progs/demos/*.[ch]			\
+	$(DIRECTORY)/progs/demos/*.cxx			\
+	$(DIRECTORY)/progs/demos/*.dat			\
+	$(DIRECTORY)/progs/demos/README			\
+	$(DIRECTORY)/progs/osdemos/Makefile		\
+	$(DIRECTORY)/progs/osdemos/*.c			\
+	$(DIRECTORY)/progs/xdemos/Makefile*		\
+	$(DIRECTORY)/progs/xdemos/descrip.mms		\
+	$(DIRECTORY)/progs/xdemos/*.[chf]		\
+	$(DIRECTORY)/progs/redbook/Makefile*		\
+	$(DIRECTORY)/progs/redbook/README		\
+	$(DIRECTORY)/progs/redbook/*.[ch]		\
+	$(DIRECTORY)/progs/samples/Makefile*		\
+	$(DIRECTORY)/progs/samples/README		\
+	$(DIRECTORY)/progs/samples/*.c			\
+	$(DIRECTORY)/progs/windml/Makefile.ugl		\
+	$(DIRECTORY)/progs/windml/*.c			\
+	$(DIRECTORY)/progs/windml/*.bmp			\
+	$(DIRECTORY)/progs/ggi/*.c			\
+	$(DIRECTORY)/windows/VC6/progs/demos/*.dsp	\
+	$(DIRECTORY)/windows/VC6/progs/progs.dsw	\
+	$(DIRECTORY)/windows/VC7/progs/demos/*.vcproj	\
+	$(DIRECTORY)/windows/VC7/progs/progs.sln
+
+GLUT_FILES = \
+	$(DIRECTORY)/include/GL/glut.h			\
+	$(DIRECTORY)/include/GL/glutf90.h		\
+	$(DIRECTORY)/src/glut/glx/Makefile*		\
+	$(DIRECTORY)/src/glut/glx/depend		\
+	$(DIRECTORY)/src/glut/glx/*def			\
+	$(DIRECTORY)/src/glut/glx/descrip.mms		\
+	$(DIRECTORY)/src/glut/glx/mms_depend		\
+	$(DIRECTORY)/src/glut/glx/*.[ch]		\
+	$(DIRECTORY)/src/glut/beos/*.[ch]		\
+	$(DIRECTORY)/src/glut/beos/*.cpp		\
+	$(DIRECTORY)/src/glut/beos/Makefile		\
+	$(DIRECTORY)/src/glut/dos/*.[ch]		\
+	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
+	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
+	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
+	$(DIRECTORY)/src/glut/ggi/Makefile		\
+	$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp	\
+	$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
+
+DEPEND_FILES = \
+	$(TOP)/src/mesa/depend		\
+	$(TOP)/src/glw/depend		\
+	$(TOP)/src/glut/glx/depend	\
+	$(TOP)/src/glu/sgi/depend
+
+
+LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
+
+
+# Everything for new a Mesa release:
+tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
+
+
+rm_depend:
+	@for dep in $(DEPEND_FILES) ; do \
+		rm -f $$dep ; \
+		touch $$dep ; \
+	done
+
+lib_gz:
+	rm -f configs/current ; \
+	cd .. ; \
+	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
+	gzip $(LIB_NAME).tar ; \
+	mv $(LIB_NAME).tar.gz $(DIRECTORY)
+
+demo_gz:
+	cd .. ; \
+	tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+	gzip $(DEMO_NAME).tar ; \
+	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
+
+glut_gz:
+	cd .. ; \
+	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
+	gzip $(GLUT_NAME).tar ; \
+	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
+
+lib_bz2:
+	rm -f configs/current ; \
+	cd .. ; \
+	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
+	bzip2 $(LIB_NAME).tar ; \
+	mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
+
+demo_bz2:
+	cd .. ; \
+	tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+	bzip2 $(DEMO_NAME).tar ; \
+	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
+
+glut_bz2:
+	cd .. ; \
+	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
+	bzip2 $(GLUT_NAME).tar ; \
+	mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
+
+lib_zip:
+	rm -f configs/current ; \
+	rm -f $(LIB_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
+	mv $(LIB_NAME).zip $(DIRECTORY)
+
+demo_zip:
+	rm -f $(DEMO_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
+	mv $(DEMO_NAME).zip $(DIRECTORY)
+
+glut_zip:
+	rm -f $(GLUT_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
+	mv $(GLUT_NAME).zip $(DIRECTORY)
+
+md5:
+	@-md5sum $(LIB_NAME).tar.gz
+	@-md5sum $(LIB_NAME).tar.bz2
+	@-md5sum $(LIB_NAME).zip
+	@-md5sum $(DEMO_NAME).tar.gz
+	@-md5sum $(DEMO_NAME).tar.bz2
+	@-md5sum $(DEMO_NAME).zip
+	@-md5sum $(GLUT_NAME).tar.gz
+	@-md5sum $(GLUT_NAME).tar.bz2
+	@-md5sum $(GLUT_NAME).zip

bin/minstall

@@ -65,7 +65,6 @@ if [ $# -ge 2 ] ; then
 
 		elif [ -f "$FILE" ] ; then
 			#echo "$FILE" is a regular file
-			$RM "$DEST/`basename $FILE`"
 			cp "$FILE" "$DEST"
 			if [ $MODE ] ; then
 				FILE=`basename "$FILE"`

configs/.gitignore

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

configs/debian-default

@@ -0,0 +1,18 @@
+# Define Debian-specific defaults.
+
+CONFIG_NAME = debian-default
+
+OPT_FLAGS = -O2 -g
+CFLAGS += -fno-strict-aliasing
+
+# override settings in configs/linux-x86-64
+LIB_DIR = lib
+EXTRA_LIB_PATH =
+
+SRC_DIRS = mesa
+PROGRAM_DIRS =
+
+INSTALL_DIR = $(DESTDIR)/usr
+
+# vim: ft=make
+

configs/debian-dri-amd64

@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on i386.
+
+include $(TOP)/configs/linux-dri-x86-64
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-amd64
+
+# vim: ft=make
+

configs/debian-dri-any

@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-dri
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-any
+
+# vim: ft=make
+

configs/debian-dri-default

@@ -0,0 +1,36 @@
+# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
+# libGL.
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-dri-default
+
+SRC_DIRS = glx/x11 mesa progs
+DRIVER_DIRS = dri
+PROGRAM_DIRS = xdemos
+PROGS = glxdemo \
+        glxgears \
+        glxheads \
+        glxinfo
+
+LIB_DIR = lib/glx
+
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+
+DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
+
+ARCH_X86 = i386 amd64
+
+ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
+	DRI_DIRS += i810 i915 i915tex i965 sis unichrome
+endif
+
+ifeq ($(DEB_BUILD_ARCH), sparc)
+	DRI_DIRS += ffb
+endif
+
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+
+# vim: ft=make
+

configs/debian-dri-i386

@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on i386.
+
+include $(TOP)/configs/linux-dri-x86
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-i386
+
+# vim: ft=make
+

configs/debian-dri-i386-i686

@@ -0,0 +1,14 @@
+# Configuration for building the DRI drivers on i386.
+
+include $(TOP)/configs/linux-dri-x86
+include $(TOP)/configs/debian-dri-optimized-default
+
+CONFIG_NAME = debian-dri-i386-i686
+
+ARCH_FLAGS = -march=i686
+LIB_DIR = lib/glx/i686/cmov
+
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov
+
+# vim: ft=make
+

configs/debian-dri-optimized-default

@@ -0,0 +1,13 @@
+# Configuration defaults for CPU-optimized builds of the DRI drivers and
+# DRI/GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-optimized-default
+
+# override so that the utility programs are not rebuilt with CPU-specific
+# optimizations
+SRC_DIRS = glx/x11 mesa
+
+# vim: ft=make
+

configs/debian-indirect-default

@@ -0,0 +1,7 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+DRI_DIRS = 

configs/debian-indirect-hurd-i386

@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+

configs/debian-osmesa

@@ -0,0 +1,9 @@
+# Configuration for building only OSMesa on Debian.
+
+include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa
+
+# vim: ft=make
+

configs/debian-osmesa-default

@@ -0,0 +1,10 @@
+# Configuration defaults for building OSMesa.
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-osmesa-default
+
+DRIVER_DIRS = osmesa
+
+# vim: ft=make
+

configs/debian-osmesa-static

@@ -0,0 +1,9 @@
+# Configuration for building only OSMesa (static version) on Debian.
+
+include $(TOP)/configs/linux-osmesa-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa-static
+
+# vim: ft=make
+

configs/debian-osmesa16

@@ -0,0 +1,10 @@
+# Configuration for building OSMesa with support for 16 bits per color
+# channel.
+
+include $(TOP)/configs/linux-osmesa16
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa16
+
+# vim: ft=make
+

configs/debian-osmesa16-static

@@ -0,0 +1,10 @@
+# Configuration for building a static version of OSMesa with support for 16
+# bits per color channel.
+
+include $(TOP)/configs/linux-osmesa16-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa16-static
+
+# vim: ft=make
+

configs/debian-osmesa32

@@ -0,0 +1,10 @@
+# Configuration for building OSMesa with support for 32 bits per color
+# channel.
+
+include $(TOP)/configs/linux-osmesa32
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa32
+
+# vim: ft=make
+

configs/debian-osmesa32-static

@@ -0,0 +1,10 @@
+# Configuration for building a static version of OSMesa with support for 32
+# bits per color channel.
+
+include $(TOP)/configs/linux-osmesa32-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa32-static
+
+# vim: ft=make
+

configs/debian-swx11+glu-alpha-ev5

@@ -0,0 +1,12 @@
+# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
+
+include $(TOP)/configs/linux-alpha
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-alpha-ev5
+
+SRC_DIRS = mesa
+LIB_DIR = lib/ev5/cmov
+
+# vim: ft=make
+

configs/debian-swx11+glu-amd64

@@ -0,0 +1,10 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on amd64.
+
+include $(TOP)/configs/linux-x86-64
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-amd64
+
+# vim: ft=make
+

configs/debian-swx11+glu-any

@@ -0,0 +1,9 @@
+# Configuration for building Mesa (swx11 and GLU) on the build architecture.
+
+include $(TOP)/configs/linux
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-any
+
+# vim: ft=make
+

configs/debian-swx11+glu-default

@@ -0,0 +1,14 @@
+# Configuration defaults for building Mesa (swx11 and GLU).
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-swx11+glu-default
+
+SRC_DIRS = mesa glu glw
+DRIVER_DIRS = x11
+
+GLW_SOURCES += GLwMDrawA.c
+GLW_LIB_DEPS += -lXm
+
+# vim: ft=make
+

configs/debian-swx11+glu-i386

@@ -0,0 +1,10 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on i386.
+
+include $(TOP)/configs/linux-x86
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-i386
+
+# vim: ft=make
+

configs/debian-swx11+glu-i386-i686

@@ -0,0 +1,14 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on i386 (i686 optimized).
+
+include $(TOP)/configs/linux-x86
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-i386-i686
+
+ARCH_FLAGS += -march=i686
+SRC_DIRS = mesa
+LIB_DIR = lib/i686/cmov
+
+# vim: ft=make
+

configs/debian-swx11+glu-powerpc-603

@@ -0,0 +1,13 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on powerpc (603 optimized).
+
+include $(TOP)/configs/linux-ppc
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-powerpc-603
+
+SRC_DIRS = mesa
+LIB_DIR = lib/603/cmov
+
+# vim: ft=make
+

configs/debian-swx11+glu-ppc64

@@ -0,0 +1,11 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on ppc64.
+
+include $(TOP)/configs/debian-swx11+glu-any
+
+CONFIG_NAME = debian-swx11+glu-ppc64
+
+LIB_DIR = lib64
+
+# vim: ft=make
+

configs/debian-swx11+glu-sparc

@@ -0,0 +1,10 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on sparc.
+
+include $(TOP)/configs/linux-sparc
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-sparc
+
+# vim: ft=make
+

configs/debian-swx11+glu-sparc-ultrasparc

@@ -0,0 +1,13 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on sparc (ultrasparc-optimized).
+
+include $(TOP)/configs/linux-ultrasparc
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
+
+SRC_DIRS = mesa
+LIB_DIR = lib/ultrasparc/cmov
+
+# vim: ft=make
+

configs/debian-swx11+glu-static-amd64

@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on amd64.
+
+include $(TOP)/configs/linux-x86-64-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-amd64
+
+# vim: ft=make
+

configs/debian-swx11+glu-static-any

@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on the build architecture.
+
+include $(TOP)/configs/linux-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-any
+
+# vim: ft=make
+

configs/debian-swx11+glu-static-i386

@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on i386.
+
+include $(TOP)/configs/linux-x86-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-i386
+
+# vim: ft=make
+

configs/debian-swx11+glu-static-ppc64

@@ -0,0 +1,11 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on ppc64.
+
+include $(TOP)/configs/debian-swx11+glu-static-any
+
+CONFIG_NAME = debian-swx11+glu-static-ppc64
+
+LIB_DIR = lib64
+
+# vim: ft=make
+

configs/default-bp

@@ -0,0 +1,75 @@
+# Default/template configuration
+
+# This is included by other config files which may override some
+# of these variables.
+
+CONFIG_NAME = default
+
+# Version info
+MESA_MAJOR=6
+MESA_MINOR=3
+MESA_TINY=0
+
+# external projects
+#DRM_SOURCE_PATH=$(TOP)/../drm
+DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm
+
+# Compiler and flags
+CC = cc
+CXX = CC
+CFLAGS = -O
+CXXFLAGS = -O
+GLU_CFLAGS = 
+
+# Misc tools and flags
+MKLIB_OPTIONS = 
+MKDEP = makedepend
+MKDEP_OPTIONS = -fdepend
+MAKE = make
+
+# Library names (base name)
+GL_LIB = GL
+GLU_LIB = GLU
+GLUT_LIB = glut
+GLW_LIB = GLw
+OSMESA_LIB = OSMesa
+
+
+# Library names (actual file names)
+GL_LIB_NAME = lib$(GL_LIB).so
+GLU_LIB_NAME = lib$(GLU_LIB).so
+GLUT_LIB_NAME = lib$(GLUT_LIB).so
+GLW_LIB_NAME = lib$(GLW_LIB).so
+OSMESA_LIB_NAME = lib$(OSMesa).so
+
+
+# Optional assembly language optimization files for libGL
+ASM_SOURCES = 
+
+# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
+# order to build the Motif widget too)
+GLW_SOURCES = GLwDrawA.c
+
+
+# Directories
+LIB_DIR = $(TOP)/lib
+INSTALL_PREFIX = /usr/local
+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 xdemos
+
+
+# Library/program dependencies
+GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
+OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+
+
+# Shading language support (set to 0 or 1)
+SHADING_LANGUAGE = 0
+

configs/diffs

@@ -0,0 +1,37 @@
+? default-bp
+? diffs
+? linux-dri-bp
+? linux-tcc
+Index: linux-icc-static
+===================================================================
+RCS file: /cvs/mesa/Mesa/configs/linux-icc-static,v
+retrieving revision 1.4
+diff -r1.4 linux-icc-static
+9c9
+< CXX = g++
+---
+> CXX = icpc
+11c11
+< CXXFLAGS = -O3
+---
+> CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
+22,25c22,24
+< GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+< GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+< APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+< MKLIB_OPTIONS = -arch icc
+---
+> GL_LIB_DEPS =
+> GLUT_LIB_DEPS =
+> APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
+29,30d27
+< 
+< 
+Index: linux-x86-64-static
+===================================================================
+RCS file: /cvs/mesa/Mesa/configs/linux-x86-64-static,v
+retrieving revision 1.6
+diff -r1.6 linux-x86-64-static
+21a22,23
+> APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+>                $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm

configs/freebsd-dri

@@ -28,8 +28,7 @@ ASM_SOURCES =
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-	-lm -lpthread $(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

configs/linux-dri

@@ -41,8 +41,7 @@ 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)
 
 
@@ -67,4 +66,4 @@ 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 \
-	savage sis tdfx trident unichrome ffb nouveau
+	savage sis tdfx trident unichrome ffb

configs/linux-dri-bp

@@ -0,0 +1,55 @@
+# -*-makefile-*-
+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+MKDEP = /usr/X11R6/bin/makedepend
+#MKDEP = gcc -M
+#MKDEP_OPTIONS = -MF depend
+
+WARN_FLAGS = -Wall
+OPT_FLAGS  = -g
+PIC_FLAGS  = -fPIC
+
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+	-D_BSD_SOURCE -D_GNU_SOURCE \
+	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
+
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+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)
+
+
+ASM_SOURCES = 
+
+# Library/program dependencies
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
+
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
+GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS  = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+
+
+# Directories
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS = 
+WINDOW_SYSTEM=dri
+
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
+	savage sis tdfx trident unichrome fb

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-osmesa-static

@@ -0,0 +1,14 @@
+# Configuration for building only libOSMesa on Linux, no Xlib driver
+# This doesn't really have any Linux dependencies, so it should be usable
+# on other (gcc-based) systems.
+
+include $(TOP)/configs/linux-osmesa
+
+CONFIG_NAME = linux-osmesa-static
+
+# Compiler and flags
+MKLIB_OPTIONS = -static
+
+# Library names
+OSMESA_LIB_NAME = libOSMesa.a
+

configs/linux-osmesa32-static

@@ -0,0 +1,28 @@
+# Configuration for 32 bits/channel OSMesa library on Linux
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-osmesa32-static
+
+# Compiler and flags
+CC = gcc
+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=32 -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
+
+
+# Library names
+OSMESA_LIB = OSMesa32
+OSMESA_LIB_NAME = libOSMesa32.a
+
+
+# Directories
+SRC_DIRS = mesa glu
+DRIVER_DIRS = osmesa
+PROGRAM_DIRS = 
+
+
+# Dependencies
+OSMESA_LIB_DEPS = -lm -lpthread
+APP_LIB_DEPS = -lOSMesa32

configs/linux-tcc

@@ -0,0 +1,22 @@
+# Configuration for debugging on Linux
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-tcc
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+TCC_DIR=/home/progs/tcc-0.9.20
+
+CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
+
+CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
+
+GLUT_CFLAGS = -fexceptions
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -0,0 +1,327 @@
+Source: mesa
+Section: graphics
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2.0) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19)
+
+Package: libgl1-mesa-swx11
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libosmesa6 (>= 6.5.2-1)
+Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
+Provides: libgl1, mesag3, libgl1-mesa-swrast
+Replaces: libgl1, mesag3, libgl1-mesa-swrast
+Description: A free implementation of the OpenGL API -- runtime
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc.  However, the author makes no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+
+Package: libgl1-mesa-swx11-dbg
+Section: libs
+Priority: extra
+Architecture: any
+Depends: libgl1-mesa-swx11 (= ${binary:Version})
+Conflicts: libgl1-mesa-swrast-dbg
+Provides: libgl1-mesa-swrast-dbg
+Replaces: libgl1-mesa-swrast-dbg
+Description: A free implementation of the OpenGL API -- debugging symbols
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc.  However, the author makes no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+ .
+ This package contains debugging symbols for the software rasterization GL
+ library.
+
+Package: libgl1-mesa-swx11-i686
+Section: libs
+Priority: extra
+Architecture: i386
+Pre-Depends: libgl1-mesa-swx11
+Description: A free implementation of the OpenGL API -- runtime [i686 optimized]
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc.  However, the author makes no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+ .
+ This set of libraries is optimized for i686 machines and will only be used if
+ you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+ Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+ such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
+Package: libgl1-mesa-swx11-dev
+Section: libdevel
+Architecture: any
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
+Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-dev, mesag-dev, libgl1-mesa-swrast-dev
+Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
+Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
+Description: A free implementation of the OpenGL API -- development support files
+ This package provides the development environment required for
+ compiling programs with Mesa.  For a complete description of Mesa,
+ please look at the libgl1-mesa-swx11 package.
+ .
+ This package also provides a simple widgets library, libGLw, which
+ allows Motif-based applications to embed an OpenGL drawing context.
+ The headers and static libraries for compiling programs that use this
+ library are included.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-dev.
+
+Package: libgl1-mesa-glx
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
+Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
+Provides: libgl1
+Description: A free implementation of the OpenGL API -- GLX runtime
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the modules themselves: these can be found
+ in the libgl1-mesa-dri package.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swx11 package.
+
+Package: libgl1-mesa-glx-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libgl1-mesa-glx (= ${binary:Version})
+Description: A free implementation of the OpenGL API -- GLX runtime -- debugging symbols
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the modules themselves: these can be found
+ in the libgl1-mesa-dri package.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swx11 package.
+ .
+ This package contains debugging symbols for the GL library with GLX and DRI
+ capabilities.
+
+#Package: libgl1-mesa-glx-i686
+#Section: libs
+#Priority: extra
+#Architecture: i386
+#Pre-Depends: libgl1-mesa-glx
+#Description: A free implementation of the OpenGL API -- GLX runtime [i686 optimized]
+# This version of Mesa provides GLX and DRI capabilities: it is capable of
+# both direct and indirect rendering.  For direct rendering, it can use DRI
+# modules from the libgl1-mesa-dri package to accelerate drawing.
+# .
+# This package does not include the modules themselves: these can be found
+# in the libgl1-mesa-dri package.
+# .
+# For a complete description of Mesa, please look at the
+# libgl1-mesa-swx11 package.
+# .
+# This set of libraries is optimized for i686 machines and will only be used if
+# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
+Package: libgl1-mesa-dri
+Section: libs
+Priority: optional
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
+Suggests: libglide3
+Conflicts: xlibmesa-dri (<< 1:7.0.0)
+Replaces: xlibmesa-dri (<< 1:7.0.0)
+Description: A free implementation of the OpenGL API -- DRI modules
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the OpenGL library itself, only the DRI
+ modules for accelerating direct rendering.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swx11 package.
+ .
+ The tdfx DRI module needs libglide3 to enable direct rendering.
+
+Package: libgl1-mesa-dri-dbg
+Section: libdevel
+Priority: extra
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+Depends: libgl1-mesa-dri (= ${binary:Version})
+Description: A free implementation of the OpenGL API -- DRI modules -- debugging symbols
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the OpenGL library itself, only the DRI
+ modules for accelerating direct rendering.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swx11 package.
+ .
+ This package contains debugging symbols for the DRI modules.
+
+#Package: libgl1-mesa-dri-i686
+#Section: libs
+#Priority: extra
+#Architecture: i386
+#Pre-Depends: libgl1-mesa-dri
+#Description: A free implementation of the OpenGL API -- DRI modules [i686 optimized]
+# This version of Mesa provides GLX and DRI capabilities: it is capable of
+# both direct and indirect rendering.  For direct rendering, it can use DRI
+# modules from the libgl1-mesa-dri package to accelerate drawing.
+# .
+# This package does not include the OpenGL library itself, only the DRI
+# modules for accelerating direct rendering.
+# .
+# For a complete description of Mesa, please look at the
+# libgl1-mesa-swx11 package.
+# .
+# This set of libraries is optimized for i686 machines and will only be used if
+# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
+Package: libgl1-mesa-dev
+Section: libdevel
+Architecture: all
+Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${source:Upstream-Version})
+Conflicts: libgl-dev, libgl1-mesa-dri-dev
+Replaces: libgl-dev, libgl1-mesa-dri-dev
+Provides: libgl-dev, libgl1-mesa-dri-dev
+Description: A free implementation of the OpenGL API -- GLX development support files
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package includes headers and static libraries for compiling
+ programs with Mesa.
+ .
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
+ package.
+
+Package: mesa-common-dev
+Section: devel
+Architecture: all
+Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), libgl1-mesa-dev (<< 6.5.2)
+Depends: libx11-dev
+Description: Developer documentation for Mesa
+ This package includes the specifications for the Mesa-specific OpenGL
+ extensions, the complete set of release release notes and the
+ development header files common to all Mesa packages.
+
+Package: libosmesa6
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libgl1-mesa-swx11 (<< 6.5.2)
+Description: Mesa Off-screen rendering extension
+ OSmesa is a Mesa extension that allows programs to render to an
+ off-screen buffer using the OpenGL API without having to create a
+ rendering context on an X Server.  It uses a pure software renderer.
+ .
+ This package provides both 16-bit and 32-bit versions of the off-screen
+ renderer which do not require external libraries to work.
+
+Package: libosmesa6-dev
+Section: devel
+Architecture: any
+Depends: libosmesa6 (= ${binary:Version}), mesa-common-dev (= ${source:Version}) | libgl-dev
+Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
+Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), mesa-common-dev (<< 6.5.2)
+Provides: xlibosmesa-dev, libosmesa-dev
+Description: Mesa Off-screen rendering extension -- development support files
+ This package provides the required environment for developing programs
+ that use the off-screen rendering extension of Mesa.
+ .
+ For more information on OSmesa see the libosmesa6 package.
+
+Package: libglu1-mesa
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libgl1-mesa-glx | libgl1
+Provides: libglu1
+Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
+Replaces: libglu1
+Description: The OpenGL utility library (GLU)
+ GLU offers simple interfaces for building mipmaps; checking for the
+ presence of extensions in the OpenGL (or other libraries which follow
+ the same conventions for advertising extensions); drawing
+ piecewise-linear curves, NURBS, quadrics and other primitives
+ (including, but not limited to, teapots); tesselating surfaces; setting
+ up projection matrices and unprojecting screen coordinates to world
+ coordinates.
+ .
+ On Linux, this library is also known as libGLU or libGLU.so.1.
+ .
+ This package provides the SGI implementation of GLU shipped with the
+ Mesa package (ergo the "-mesa" suffix).
+
+Package: libglu1-mesa-dev
+Section: libdevel
+Architecture: any
+Depends: libglu1-mesa (= ${binary:Version}), libgl1-mesa-dev | libgl-dev
+Provides: libglu-dev, xlibmesa-glu-dev
+Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1), mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev
+Replaces: libglu-dev
+Description: The OpenGL utility library -- development support files
+ Includes headers and static libraries for compiling programs with GLU.
+ .
+ For a complete description of GLU, please look at the libglu1-mesa
+ package.
+
+Package: mesa-swx11-source
+Section: libdevel
+Architecture: all
+Description: Mesa software rasteriser source -- development support files
+ This package contains the source to the Mesa software rasteriser, which
+ implements all of Mesa's GL support in software.  It powers the X11 and
+ X server backends (assuming unaccelerated indirect).  This package is
+ provided mainly for modular X servers which support GL, and need the
+ software rasteriser source to build the GLcore module for unaccelerated
+ indirect rendering.
+
+Package: mesa-utils
+Section: x11
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: xbase-clients (<< 6.8.2-38)
+Description: Miscellaneous Mesa GL utilities
+ This package provides several basic GL utilities built by Mesa, including
+ glxinfo and glxgears.
+
+# vim: tw=0

debian/copyright

@@ -0,0 +1,444 @@
+This package was debianized by James A. Treacy treacy@debian.org on Thu,
+6 Jan 2000 01:11:34 -0500.  It was newly debianized by Marcelo E.
+Magallon <mmagallo@debian.org> on Sat, 25 Dec 2004 14:50:02 -0600. It was
+again debianized by Thierry Reding <thierry@gilfi.de> on Sat, 14 Oct 2006
+02:01:12 +0200.
+
+It was downloaded from http://www.mesa3d.org/download.html
+
+For more information see:
+
+  http://www.mesa3d.org/
+
+Copyright:
+
+Upstream Author: Brian Paul <brian.paul@tungstengraphics.com>
+
+License:
+
+                    License / Copyright Information
+
+   The Mesa distribution consists of several components. Different
+   copyrights and licenses apply to different components. For
+   example, GLUT is copyrighted by Mark Kilgard, some demo programs
+   are copyrighted by SGI, some of the Mesa device drivers are
+   copyrighted by their authors. See below for a list of Mesa's
+   components and the copyright/license for each.
+
+   The core Mesa library is licensed according to the terms of the
+   XFree86 copyright (an MIT-style license). This allows integration
+   with the XFree86/DRI project. Unless otherwise stated, the Mesa
+   source code and documentation is licensed as follows:
+
+ Copyright (C) 1999-2003  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"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+                        Attention, Contributors
+
+   When contributing to the Mesa project you must agree to relinquish
+   your work to the holder of the copyright for the particular
+   component you're contributing to. That is, you can't put your own
+   copyright on the code, unless it's a modular piece that can be
+   omitted from Mesa (like a new device driver). If for example, you
+   contribute a bug fix to Mesa's texture mapping code, your code
+   will become a part of the body of work which is copyrighted by
+   Brian Paul and licensed by the above terms.
+
+----------------------------------------------------------------------
+
+Some files, as listed below, are made available under the SGI Free B 
+license.  This license is as follows:
+
+           SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000])
+
+1.  Definitions.
+
+1.1. "Additional Notice Provisions" means such additional provisions as
+     appear in the Notice in Original Code under the heading "Additional
+     Notice Provisions."
+
+1.2. "Covered Code" means the Original Code or Modifications, or any
+     combination thereof.
+
+1.3. "Hardware" means any physical device that accepts input, processes
+     input, stores the results of processing, and/or provides output.
+
+1.4. "Larger Work" means a work that combines Covered Code or portions
+     thereof with code not governed by the terms of this License.
+
+1.5. "Licensable" means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+1.6. "License" means this document.
+
+1.7. "Licensed Patents" means patent claims Licensable by SGI that are
+     infringed by the use or sale of Original Code or any Modifications
+     provided by SGI, or any combination thereof.
+
+1.8. "Modifications" means any addition to or deletion from the
+     substance or structure of the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files,
+     a Modification is: 
+
+     A. Any addition to the contents of a file containing Original Code
+        and/or addition to or deletion from the contents of a file
+        containing previous Modifications.
+
+     B. Any new file that contains any part of the Original Code or
+        previous Modifications.
+
+1.9. "Notice" means any notice in Original Code or Covered Code, as
+     required by and in compliance with this License.
+
+1.10. "Original Code" means source code of computer software code that
+      is described in the source code Notice required by Exhibit A as
+      Original Code, and updates and error corrections specifically 
+      thereto.
+
+1.11. "Recipient" means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License
+      or a future version of this License issued under Section 8. For
+      legal entities, "Recipient" includes any entity that controls, is
+      controlled by, or is under common control with Recipient. For
+      purposes of this definition, "control" of an entity means (a) the
+      power, direct or indirect, to direct or manage such entity, or (b)
+      ownership of fifty percent (50%) or more of the outstanding shares
+      or beneficial ownership of such entity.
+
+1.12. "Recipient Patents" means patent claims Licensable by a Recipient
+      that are infringed by the use or sale of Original Code or any
+      Modifications provided by SGI, or any combination thereof.
+
+1.13. "SGI" means Silicon Graphics, Inc.
+
+1.14. "SGI Patents" means patent claims Licensable by SGI other than the
+      Licensed Patents.
+
+2.  License Grant and Restrictions.
+
+2.1. SGI License Grant. Subject to the terms of this License and any
+     third party intellectual property claims, for the duration of
+     intellectual property protections inherent in the Original Code,
+     SGI hereby grants Recipient a worldwide, royalty-free,
+     non-exclusive license, to do the following: (i) under copyrights
+     Licensable by SGI, to reproduce, distribute, create derivative
+     works from, and, to the extent applicable, display and perform the
+     Original Code and/or any Modifications provided by SGI alone and/or
+     as part of a Larger Work; and (ii) under any Licensable Patents, to
+     make, have made, use, sell, offer for sale, import and/or otherwise
+     transfer the Original Code and/or any Modifications provided by
+     SGI. Recipient accepts the terms and conditions of this License by
+     undertaking any of the aforementioned actions. The patent license
+     shall apply to the Covered Code if, at the time any related
+     Modification is added, such addition of the Modification causes
+     such combination to be covered by the Licensed Patents. The patent
+     license in Section 2.1(ii) shall not apply to any other
+     combinations that include the Modification. No patent license is
+     provided under SGI Patents for infringements of SGI Patents by
+     Modifications not provided by SGI or combinations of Original Code
+     and Modifications not provided by SGI.
+
+2.2. Recipient License Grant. Subject to the terms of this License and
+     any third party intellectual property claims, Recipient hereby
+     grants SGI and any other Recipients a worldwide, royalty-free,
+     non-exclusive license, under any Recipient Patents, to make, have
+     made, use, sell, offer for sale, import and/or otherwise transfer
+     the Original Code and/or any Modifications provided by SGI.
+
+2.3. No License For Hardware Implementations. The licenses granted in
+     Section 2.1 and 2.2 are not applicable to implementation in
+     Hardware of the algorithms embodied in the Original Code or any
+     Modifications provided by SGI .
+
+3.  Redistributions. 
+
+3.1. Retention of Notice/Copy of License. The Notice set forth in
+     Exhibit A, below, must be conspicuously retained or included in any
+     and all redistributions of Covered Code. For distributions of the
+     Covered Code in source code form, the Notice must appear in every
+     file that can include a text comments field; in executable form,
+     the Notice and a copy of this License must appear in related
+     documentation or collateral where the Recipient’s rights relating
+     to Covered Code are described. Any Additional Notice Provisions
+     which actually appears in the Original Code must also be retained
+     or included in any and all redistributions of Covered Code.
+
+3.2. Alternative License. Provided that Recipient is in compliance with
+     the terms of this License, Recipient may, so long as without
+     derogation of any of SGI’s rights in and to the Original Code,
+     distribute the source code and/or executable version(s) of Covered
+     Code under (1) this License; (2) a license identical to this
+     License but for only such changes as are necessary in order to
+     clarify Recipient’s role as licensor of Modifications; and/or (3) a
+     license of Recipient’s choosing, containing terms different from
+     this License, provided that the license terms include this Section
+     3 and Sections 4, 6, 7, 10, 12, and 13, which terms may not be
+     modified or superseded by any other terms of such license. If
+     Recipient elects to use any license other than this License,
+     Recipient must make it absolutely clear that any of its terms which
+     differ from this License are offered by Recipient alone, and not by
+     SGI. It is emphasized that this License is a limited license, and,
+     regardless of the license form employed by Recipient in accordance
+     with this Section 3.2, Recipient may relicense only such rights, in
+     Original Code and Modifications by SGI, as it has actually been
+     granted by SGI in this License.
+
+3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any
+     liability incurred by SGI as a result of any such alternative
+     license terms Recipient offers.
+
+4.  Termination. This License and the rights granted hereunder will
+    terminate automatically if Recipient breaches any term herein and
+    fails to cure such breach within 30 days thereof. Any sublicense to 
+    the Covered Code that is properly granted shall survive any
+    termination of this License, absent termination by the terms of such
+    sublicense. Provisions that, by their nature, must remain in effect
+    beyond the termination of this License, shall survive.
+
+5.  No Trademark Or Other Rights. This License does not grant any rights
+    to: (i) any software apart from the Covered Code, nor shall any
+    other rights or licenses not expressly granted hereunder arise by
+    implication, estoppel or otherwise with respect to the Covered Code;
+    (ii) any trade name, trademark or service mark whatsoever, including
+    without limitation any related right for purposes of endorsement or
+    promotion of products derived from the Covered Code, without prior
+    written permission of SGI; or (iii) any title to or ownership of the
+    Original Code, which shall at all times remains with SGI. All rights
+    in the Original Code not expressly granted under this License are
+    reserved.
+
+6.  Compliance with Laws; Non-Infringement. There are various worldwide
+    laws, regulations, and executive orders applicable to dispositions
+    of Covered Code, including without limitation export, re-export, and
+    import control laws, regulations, and executive orders, of the U.S.
+    government and other countries, and Recipient is reminded it is
+    obliged to obey such laws, regulations, and executive orders.
+    Recipient may not distribute Covered Code that (i) in any way
+    infringes (directly or contributorily) any intellectual property
+    rights of any kind of any other person or entity or (ii) breaches
+    any representation or warranty, express, implied or statutory, to
+    which, under any applicable law, it might be deemed to have been
+    subject.
+
+7.  Claims of Infringement. If Recipient learns of any third party claim
+    that any disposition of Covered Code and/or functionality wholly or
+    partially infringes the third party's intellectual property rights,
+    Recipient will promptly notify SGI of such claim.
+
+8.  Versions of the License. SGI may publish revised and/or new versions
+    of the License from time to time, each with a distinguishing version
+    number. Once Covered Code has been published under a particular
+    version of the License, Recipient may, for the duration of the
+    license, continue to use it under the terms of that version, or
+    choose to use such Covered Code under the terms of any subsequent
+    version published by SGI. Subject to the provisions of Sections 3
+    and 4 of this License, only SGI may modify the terms applicable to
+    Covered Code created under this License.
+
+9.  DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL
+    EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED,
+    INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS
+    OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR
+    PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY
+    AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE
+    IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR SERVICING,
+    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS AN ESSENTIAL
+    PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED
+    HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
+
+10.  LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY,
+     WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT
+     LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR
+     BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+     CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+     LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF
+     DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
+
+11.  Indemnity. Recipient shall be solely responsible for damages
+     arising, directly or indirectly, out of its utilization of rights
+     under this License. Recipient will defend, indemnify and hold
+     harmless Silicon Graphics, Inc. from and against any loss,
+     liability, damages, costs or expenses (including the payment of
+     reasonable attorneys fees) arising out of Recipient's use,
+     modification, reproduction and distribution of the Covered Code or
+     out of any representation or warranty made by Recipient.
+
+12.  U.S. Government End Users. The Covered Code is a "commercial item"
+     consisting of "commercial computer software" as such terms are
+     defined in title 48 of the Code of Federal Regulations and all U.S.
+     Government End Users acquire only the rights set forth in this
+     License and are subject to the terms of this License.
+
+13.  Miscellaneous. This License represents the complete agreement
+     concerning the its subject matter. If any provision of this License
+     is held to be unenforceable, such provision shall be reformed so as
+     to achieve as nearly as possible the same legal and economic effect
+     as the original provision and the remainder of this License will
+     remain in effect. This License shall be governed by and construed
+     in accordance with the laws of the United States and the State of
+     California as applied to agreements entered into and to be
+     performed entirely within California between California residents.
+     Any litigation relating to this License shall be subject to the
+     exclusive jurisdiction of the Federal Courts of the Northern
+     District of California (or, absent subject matter jurisdiction in
+     such courts, the courts of the State of California), with venue
+     lying exclusively in Santa Clara County, California, with the
+     losing party responsible for costs, including without limitation,
+     court costs and reasonable attorneys fees and expenses. The
+     application of the United Nations Convention on Contracts for the
+     International Sale of Goods is expressly excluded. Any law or
+     regulation that provides that the language of a contract shall be
+     construed against the drafter shall not apply to this License.
+
+Exhibit A
+
+License Applicability. Except to the extent portions of this file are
+made subject to an alternative license as permitted in the SGI Free
+Software License B, Version 1.1 (the "License"), the contents of this
+file are subject only to the provisions of the License. You may not use
+this file except in compliance with the License. You may obtain a copy
+of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+
+http://oss.sgi.com/projects/FreeB
+
+Note that, as provided in the License, the Software is distributed on an
+"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+
+Original Code. The Original Code is: [name of software, version number,
+and release date], developed by Silicon Graphics, Inc. The Original Code
+is Copyright (c) [dates of first publication, as appearing in the Notice
+in the Original Code] Silicon Graphics, Inc. Copyright in any portions
+created by third parties is as indicated elsewhere herein. All Rights
+Reserved.
+
+Additional Notice Provisions: [such additional provisions, if any, as 
+appear in the Notice in the Original Code under the heading "Additional 
+Notice Provisions"]
+
+--------------------------------------------------------------------------
+
+Some other files listed below are made available from Silicon Graphics,
+Inc. under a more liberal, MIT-style license, as follows:
+
+   Permission to use, copy, modify, and distribute this software for
+   any purpose and without fee is hereby granted, provided that the above
+   copyright notice appear in all copies and that both the copyright notice
+   and this permission notice appear in supporting documentation, and that
+   the name of Silicon Graphics, Inc. not be used in advertising
+   or publicity pertaining to distribution of the software without specific,
+   written prior permission.
+
+   THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
+   AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE
+   INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
+   FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
+   GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
+   SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
+   KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
+   LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
+   THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
+   ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
+   ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+   POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
+   
+   US Government Users Restricted Rights
+   Use, duplication, or disclosure by the Government is subject to
+   restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
+   (c)(1)(ii) of the Rights in Technical Data and Computer Software
+   clause at DFARS 252.227-7013 and/or in similar or successor
+   clauses in the FAR or the DOD or NASA FAR Supplement.
+   Unpublished-- rights reserved under the copyright laws of the
+   United States.  Contractor/manufacturer is Silicon Graphics,
+   Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
+
+--------------------------------------------------------------------------
+
+ Mesa Component Licenses:
+
+ Component       Files                 Primary Author      License
+ ----------------------------------------------------------------------------
+ core Mesa code  src/*.[ch]            Brian Paul          Mesa
+                 include/GL/gl.h
+
+ GLX driver      src/X/*               Brian Paul          Mesa
+                 include/GL/glx.h
+                 include/GL/xmesa.h
+
+ OS/Mesa driver  src/OSmesa/*          Brian Paul          Mesa
+                 include/GL/osmesa.h
+
+ 3Dfx driver     src/FX/*              David Bucciarelli   Mesa
+                 include/GL/fxmesa.h
+
+ BeOS R4 driver  mesa/drivers/beos/    Brian Paul          Mesa
+
+ MGL driver      include/GL/mglmesa.h  SciTech, Inc        GNU LGPL
+
+ Windows driver  mesa/drivers/windows/ Li Wei              GNU LGPL
+                 include/GL/wmesa.h
+
+ SVGA driver     mesa/drivers/svga/    Brian Paul          GNU LGPL
+                 include/GL/svgamesa.h
+
+ DOS driver      mesa/drivers/dos/     Charlie Wallace     GNU LGPL
+                 include/GL/dosmesa.h
+
+ GGI driver      mesa/drivers/ggi/     Uwe Maurer          GNU LGPL
+                 include/GL/ggimesa.h
+
+ GLUT            src/glut/*            Mark Kilgard        Mark's copyright
+                 include/GL/*glut*.h
+
+ GLU library     src/glu/*             Brian Paul          GNU LGPL
+
+ SGI GLU library src/glu/sgi/*         SGI                 SGI Free B
+                 include/GL/glu.h
+
+ Ext registry    include/GL/glext.h    SGI                 SGI Free B
+                 include/GL/glxext.h
+
+ demo programs   progs/demos/*         various             see source files
+
+ X demos         progs/xdemos/*        Brian Paul          see source files
+
+ SGI demos       progs/samples/*       SGI                 SGI MIT-style
+
+ RedBook demos   progs/redbook/*       SGI                 SGI MIT-style
+
+
+On Debian systems the full text of the GNU LGPL license is found in
+/usr/share/common-licenses/LGPL.
+
+------------------------------------------------------------------------------
+
+The Debian packaging is (C) 2006, Thierry Reding <thierry@gilfi.de> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+

debian/glxdemo.1

@@ -0,0 +1,15 @@
+.TH glxdemo 1 "2006-11-29"
+.SH NAME
+glxdemo \- a demonstration of the GLX functions
+.SH SYNOPSIS
+.B glxdemo
+.SH DESCRIPTION
+The \fIglxdemo\fP program shows how to use the GLX functions in order to
+create an OpenGL program running on top of an X server. This program is most
+useful when studied in its source code form.
+.SH AUTHOR
+glxdemo was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
+Debian project (but may be used by others).
+

debian/glxgears.1

@@ -0,0 +1,29 @@
+.TH glxgears 1 "2006-11-29"
+.SH NAME
+glxgears \- ``gears'' demo for GLX
+.SH SYNOPSIS
+.B glxgears
+.RI [ options ]
+.SH DESCRIPTION
+The \fIglxgears\fP program is a port of the ``gears'' demo to GLX. It displays
+a set of rotating gears and prints out the frame rate at regular intervals. It
+has become quite popular as basic benchmarking tool.
+.SH OPTIONS
+.TP 8
+.B \-display \fIdisplay\fP
+Specify which X display to run on.
+.TP 8
+.B \-info
+Display OpenGL renderer information.
+.TP 8
+.B \-stereo
+Use a stereo enabled GLX visual.
+.TP 8
+.B \-fullscreen
+Run in fullscreen mode.
+.SH AUTHOR
+glxgears was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
+Debian project (but may be used by others).
+

debian/glxheads.1

@@ -0,0 +1,30 @@
+.TH glxheads 1 "2006-11-29"
+.SH NAME
+glxheads \- exercise multiple GLX connections
+.SH SYNOPSIS
+.B glxheads
+[\fIdisplay\fP ...]
+.SH DESCRIPTION
+The \fIglxheads\fP program will try to open GLX connections on multiple X
+displays as specified on the command-line. If a connection can be made it will
+try to create a direct GLX context (and fallback to using indirect contexts if
+that fails) and open a window displaying a spinning green triangle.
+.PP
+If no display names are specified, \fIglxheads\fP will default to opening a
+single local connection on display 0.
+.SH EXAMPLE
+To open a local connection on display 0 and two remote connections to the
+hosts \fImars\fP (display 0) and \fIvenus\fP (display 1), run glxheads with
+the following command-line:
+.PP
+.RS 3n
+.nf
+$ glxheads :0 mars:0 venus:1
+.fi
+.RE
+.SH AUTHOR
+glxheads was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de> for the
+Debian project (but may be used by others).
+

debian/glxinfo.1

@@ -0,0 +1,41 @@
+.TH glxinfo 1 "2006-11-29"
+.SH NAME
+glxinfo \- show information about the GLX implementation
+.SH SYNOPSIS
+.B glxinfo
+.RI [ options ]
+.SH DESCRIPTION
+The \fIglxinfo\fP program shows information about the OpenGL and GLX
+implementations running on a given X display.
+.PP
+The information includes details about the server- and client-side GLX
+implementation, the OpenGL and GLU implementations as well as a list
+of available GLX visuals.
+.SH OPTIONS
+.TP 8
+.B \-v
+Print visuals info in verbose form.
+.TP 8
+.B \-t
+Print verbose table.
+.TP 8
+.B \-display \fIdisplay\fP
+Specify the X display to interrogate.
+.TP 8
+.B \-h
+Print usage information.
+.TP 8
+.B \-i
+Force an indirect rendering context.
+.TP 8
+.B \-b
+Find the ``best'' visual and print it's number.
+.TP 8
+.B \-l
+Print interesting OpenGL limits.
+.SH AUTHOR
+glxinfo was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
+Debian project (but may be used by others).
+

debian/libgl1-mesa-dev.install

@@ -0,0 +1 @@
+usr/lib/libGL.so

debian/libgl1-mesa-dri-i686.install

@@ -0,0 +1 @@
+usr/lib/dri/i686/cmov/*.so

debian/libgl1-mesa-dri.install

@@ -0,0 +1 @@
+usr/lib/dri/*.so

debian/libgl1-mesa-glx-i686.install

@@ -0,0 +1 @@
+usr/lib/glx/i686/cmov/libGL.so.* usr/lib/i686/cmov

debian/libgl1-mesa-glx.install

@@ -0,0 +1 @@
+usr/lib/glx/libGL.so.* usr/lib

debian/libgl1-mesa-glx.shlibs

@@ -0,0 +1 @@
+libGL 1 libgl1-mesa-glx | libgl1

debian/libgl1-mesa-swx11-dev.install

@@ -0,0 +1,4 @@
+usr/include/GL/GLw*A.h
+usr/lib/libGL.a
+usr/lib/libGL.so
+usr/lib/libGLw.a

debian/libgl1-mesa-swx11-i686.install

@@ -0,0 +1 @@
+usr/lib/i686/cmov/libGL.so.*

debian/libgl1-mesa-swx11.install

@@ -0,0 +1 @@
+usr/lib/libGL.so.*

debian/libgl1-mesa-swx11.shlibs

@@ -0,0 +1 @@
+libGL 1 libgl1-mesa-glx | libgl1

debian/libglu1-mesa-dev.install

@@ -0,0 +1,4 @@
+usr/include/GL/glu.h
+usr/include/GL/glu_mangle.h
+usr/lib/libGLU.a
+usr/lib/libGLU.so

debian/libglu1-mesa.install

@@ -0,0 +1 @@
+usr/lib/libGLU.so.*

debian/libglu1-mesa.shlibs

@@ -0,0 +1 @@
+libGLU 1 libglu1-mesa | libglu1

debian/libglw1-mesa.shlibs

@@ -0,0 +1 @@
+libGLw 1 libglw1-mesa | libglw1

debian/libosmesa6-dev.install

@@ -0,0 +1,7 @@
+usr/include/GL/osmesa.h
+usr/lib/libOSMesa.a
+usr/lib/libOSMesa.so
+usr/lib/libOSMesa16.a
+usr/lib/libOSMesa16.so
+usr/lib/libOSMesa32.a
+usr/lib/libOSMesa32.so

debian/libosmesa6.install

@@ -0,0 +1,3 @@
+usr/lib/libOSMesa.so.*
+usr/lib/libOSMesa16.so.*
+usr/lib/libOSMesa32.so.*

debian/libosmesa6.shlibs

@@ -0,0 +1,3 @@
+libOSMesa 6 libosmesa6 (>= 6.5.2-1) | libgl1-mesa-glide3
+libOSMesa16 6 libosmesa6 (>= 6.5.2-1)
+libOSMesa32 6 libosmesa6 (>= 6.5.2-1)

debian/mesa-common-dev.docs

@@ -0,0 +1,8 @@
+docs/bugs.html
+docs/debugging.html
+docs/envvars.html
+docs/faq.html
+docs/osmesa.html
+docs/RELNOTES-*
+docs/relnotes*
+docs/*.spec

debian/mesa-common-dev.install

@@ -0,0 +1,4 @@
+usr/include/GL/gl.h
+usr/include/GL/glext.h
+usr/include/GL/gl_mangle.h
+usr/include/GL/glx*.h

debian/mesa-swx11-source.install

@@ -0,0 +1 @@
+usr/share/mesa-source/*

debian/mesa-utils.install

@@ -0,0 +1,4 @@
+usr/bin/glxdemo
+usr/bin/glxgears
+usr/bin/glxheads
+usr/bin/glxinfo

debian/mesa-utils.manpages

@@ -0,0 +1,4 @@
+debian/glxdemo.1
+debian/glxgears.1
+debian/glxheads.1
+debian/glxinfo.1

debian/patches/00_create-libdir.patch

@@ -0,0 +1,17 @@
+Patch that allows the Mesa makefile to create a LIB_DIR that is more than one
+level below TOP.
+
+This patch by Thierry Reding.
+Not submitted to Mesa.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,7 +29,7 @@
+ 	done
+ 
+ $(TOP)/$(LIB_DIR):
+-	-mkdir $(TOP)/$(LIB_DIR)
++	mkdir -p $(TOP)/$(LIB_DIR)
+ 
+ 
+ clean:

debian/patches/01_fix-makefile.patch

@@ -0,0 +1,16 @@
+Do not build OSMesa for a standalone configuration, since Debian only ships
+OSMesa in a separate package.
+
+This patch by Thierry Reding.
+
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -107,7 +107,7 @@
+ 	$(OSMESA_DRIVER_OBJECTS)
+ 
+ 
+-stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
++stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+ 
+ osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
+ 

debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch

@@ -0,0 +1,17 @@
+Patch that fixes Debian bug #349437.
+
+This patch by David Nusinow.
+
+--- a/src/mesa/main/imports.h
++++ b/src/mesa/main/imports.h
+@@ -155,8 +155,9 @@
+  *** USE_IEEE: Determine if we're using IEEE floating point
+  ***/
+ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
+-    defined(__s390x__) || defined(__powerpc__) || \
++    defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \
+     defined(__amd64__) || \
++    defined(__m68k__) || \
+     defined(ia64) || defined(__ia64__) || \
+     defined(__hppa__) || defined(hpux) || \
+     defined(__mips) || defined(_MIPS_ARCH) || \

debian/patches/03_optional-progs-and-install.patch

@@ -0,0 +1,45 @@
+Allow the programs that are to be built to be defined in the build
+configuration.
+
+Provide an install target for installing the programs in $(INSTALL_DIR)/bin.
+
+This patch by Thierry Reding.
+Not submitted to Mesa.
+
+--- a/progs/xdemos/Makefile
++++ b/progs/xdemos/Makefile
+@@ -8,7 +8,7 @@
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
+ 
+-PROGS = glthreads \
++PROGS ?= glthreads \
+ 	glxdemo \
+ 	glxgears \
+ 	glxgears_fbconfig \
+@@ -44,6 +44,9 @@
+ 
+ default: $(PROGS)
+ 
++install: $(PROGS)
++	$(INSTALL) -d $(INSTALL_DIR)/bin
++	$(INSTALL) -m 755 $(PROGS) $(INSTALL_DIR)/bin
+ 
+ clean:
+ 	-rm -f $(PROGS)
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -21,8 +21,12 @@
+ 		fi \
+ 	done
+ 
+-# Dummy install target
+ install:
++	@for dir in $(SUBDIRS) ; do \
++		if [ -d $$dir ] ; then \
++			(cd $$dir ; $(MAKE) install) ; \
++		fi \
++	done
+ 
+ clean:
+ 	@for dir in $(SUBDIRS) tests ; do \

debian/patches/04_cleanup-osmesa-configs.patch

@@ -0,0 +1,189 @@
+diff --git a/configs/linux-osmesa b/configs/linux-osmesa
+index cc1fbbd..aabab59 100644
+--- a/configs/linux-osmesa
++++ b/configs/linux-osmesa
+@@ -9,8 +9,17 @@ CONFIG_NAME = linux-osmesa
+ # Compiler and flags
+ CC = gcc
+ 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
++
++PIC_FLAGS  = -fPIC
++
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
++	-D_BSD_SOURCE -D_GNU_SOURCE \
++	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
++
++CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
++	$(ASM_FLAGS) -ffast-math
++
++CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+ 
+ 
+ # Directories
+@@ -23,3 +33,4 @@ PROGRAM_DIRS = osdemos
+ OSMESA_LIB_DEPS = -lm -lpthread
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa -lGLU
++
+diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
+index 465f83c..eb3575f 100644
+--- a/configs/linux-osmesa-static
++++ b/configs/linux-osmesa-static
+@@ -8,7 +8,8 @@ CONFIG_NAME = linux-osmesa-static
+ 
+ # Compiler and flags
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+ 
+ # Library names
+-OSMESA_LIB_NAME = libOSMesa.a
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+ 
+diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
+index 1fb0186..2a06254 100644
+--- a/configs/linux-osmesa16
++++ b/configs/linux-osmesa16
+@@ -1,28 +1,17 @@
+ # Configuration for 16 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa
+ 
+ CONFIG_NAME = linux-osmesa16
+ 
+-# Compiler and flags
+-CC = gcc
+-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
+-
++DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
+ 
+ # Library names
+ OSMESA_LIB = OSMesa16
+-OSMESA_LIB_NAME = libOSMesa16.so
+-
+ 
+ # Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+ PROGRAM_DIRS = 
+ 
+-
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+-APP_LIB_DEPS = -lOSMesa16
++APP_LIB_DEPS = -l$(OSMESA_LIB)
++
+diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
+index 6645504..894cf82 100644
+--- a/configs/linux-osmesa16-static
++++ b/configs/linux-osmesa16-static
+@@ -1,28 +1,13 @@
+ # Configuration for 16 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa16
+ 
+ CONFIG_NAME = linux-osmesa16-static
+ 
+ # Compiler and flags
+-CC = gcc
+-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 =
+ 
+ # Library names
+-OSMESA_LIB = OSMesa16
+-OSMESA_LIB_NAME = libOSMesa16.a
+-
+-
+-# Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+-PROGRAM_DIRS = 
+-
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+ 
+-# Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-APP_LIB_DEPS = -lOSMesa16
+diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
+index a1e5a35..5a703f6 100644
+--- a/configs/linux-osmesa32
++++ b/configs/linux-osmesa32
+@@ -1,28 +1,18 @@
+ # Configuration for 32 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa
+ 
+ CONFIG_NAME = linux-osmesa32
+ 
+ # Compiler and flags
+-CC = gcc
+-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
+-
++DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+ 
+ # Library names
+ OSMESA_LIB = OSMesa32
+-OSMESA_LIB_NAME = libOSMesa32.so
+-
+ 
+ # Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+ PROGRAM_DIRS = 
+ 
+-
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+-APP_LIB_DEPS = -lOSMesa32
++APP_LIB_DEPS = -l$(OSMESA_LIB)
++
+diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
+index 6db8bc0..ecbb72e 100644
+--- a/configs/linux-osmesa32-static
++++ b/configs/linux-osmesa32-static
+@@ -1,28 +1,13 @@
+ # Configuration for 32 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa32
+ 
+ CONFIG_NAME = linux-osmesa32-static
+ 
+ # Compiler and flags
+-CC = gcc
+-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=32 -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 =
+ 
+ # Library names
+-OSMESA_LIB = OSMesa32
+-OSMESA_LIB_NAME = libOSMesa32.a
+-
+-
+-# Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+-PROGRAM_DIRS = 
+-
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+ 
+-# Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-APP_LIB_DEPS = -lOSMesa32

debian/patches/05_static-nonpic.patch

@@ -0,0 +1,60 @@
+diff --git a/configs/linux-alpha-static b/configs/linux-alpha-static
+index 2a30af9..eb6a08a 100644
+--- a/configs/linux-alpha-static
++++ b/configs/linux-alpha-static
+@@ -11,6 +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 =
+ 
+ 
+ # Library names (actual file names)
+diff --git a/configs/linux-ppc-static b/configs/linux-ppc-static
+index d0e1688..3f3dc55 100644
+--- a/configs/linux-ppc-static
++++ b/configs/linux-ppc-static
+@@ -5,6 +5,7 @@ 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
+diff --git a/configs/linux-static b/configs/linux-static
+index 85141ea..1592668 100644
+--- a/configs/linux-static
++++ b/configs/linux-static
+@@ -5,6 +5,7 @@ include $(TOP)/configs/linux
+ CONFIG_NAME = linux-static
+ 
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+ 
+ # Library names (actual file names)
+ GL_LIB_NAME = libGL.a
+diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
+index 0257430..2d0b664 100644
+--- a/configs/linux-x86-64-static
++++ b/configs/linux-x86-64-static
+@@ -5,6 +5,7 @@ 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
+diff --git a/configs/linux-x86-static b/configs/linux-x86-static
+index 9915987..e6a3696 100644
+--- a/configs/linux-x86-static
++++ b/configs/linux-x86-static
+@@ -5,6 +5,7 @@ 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

debian/patches/06_fix_texture_data_corruption.patch

@@ -0,0 +1,23 @@
+From: Michel Dänzer <michel@tungstengraphics.com>
+Date: Thu, 14 Dec 2006 09:01:43 +0000 (+0100)
+Subject: _mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=9c09259b8bef8f120cc6f4bb1a44f0eae37d71b3
+
+_mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.
+
+This fixes texture data corruption with glTexSubimage (and probably glTexImage
+under some circumstances) with the texstore swizzle path.
+---
+
+--- a/src/mesa/main/texstore.c
++++ b/src/mesa/main/texstore.c
+@@ -808,7 +808,8 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx
+ 
+ /*    _mesa_printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
+ 
+-   if (srcRowStride == srcWidth * srcComponents &&
++   if (srcRowStride == dstRowStride &&
++       srcRowStride == srcWidth * srcComponents &&
+        dimensions < 3) {
+       /* 1 and 2D images only */
+       GLubyte *dstImage = (GLubyte *) dstAddr

debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch

@@ -0,0 +1,56 @@
+From: Michel Dänzer <michel@tungstengraphics.com>
+Date: Tue, 6 Mar 2007 12:22:35 +0000 (+0100)
+Subject: r300: Call radeonSetCliprects from radeonMakeCurrent.
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=6f9b1afc862851532e4820705c412388b497ad58
+
+r300: Call radeonSetCliprects from radeonMakeCurrent.
+
+Based on a patch by Panagiotis Papadakos.
+
+Among other things, this makes sure the framebuffer object associated with the
+drawable has the correct size when _mesa_make_current is called, so the default
+viewport is set up correctly.
+
+Also update radeon->lastStamp in radeonSetCliprects.
+---
+
+--- a/src/mesa/drivers/dri/r300/radeon_context.c
++++ b/src/mesa/drivers/dri/r300/radeon_context.c
+@@ -51,6 +51,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
+ #include "radeon_macros.h"
+ #include "radeon_reg.h"
+ 
++#include "radeon_state.h"
+ #include "r300_state.h"
+ 
+ #include "utils.h"
+@@ -279,6 +280,8 @@ GLboolean radeonMakeCurrent(__DRIcontext
+ 
+ 			r300UpdateWindow(radeon->glCtx);
+ 			r300UpdateViewportOffset(radeon->glCtx);
++
++			radeonSetCliprects(radeon);
+ 		}
+ 
+ 		_mesa_make_current(radeon->glCtx,
+--- a/src/mesa/drivers/dri/r300/radeon_lock.c
++++ b/src/mesa/drivers/dri/r300/radeon_lock.c
+@@ -90,7 +90,6 @@ static void r300RegainedLock(radeonConte
+ #else
+ 		radeonUpdateScissor(radeon->glCtx);
+ #endif
+-		radeon->lastStamp = drawable->lastStamp;
+ 	}
+ 
+ 	if (sarea->ctx_owner != radeon->dri.hwContext) {
+--- a/src/mesa/drivers/dri/r300/radeon_state.c
++++ b/src/mesa/drivers/dri/r300/radeon_state.c
+@@ -185,6 +185,8 @@ void radeonSetCliprects(radeonContextPtr
+ 
+ 	if (radeon->state.scissor.enabled)
+ 		radeonRecalcScissorRects(radeon);
++
++	radeon->lastStamp = drawable->lastStamp;
+ }
+ 
+ 

debian/patches/08_r300_update_window_state_when_bound_but_stamp_changed.patch

@@ -0,0 +1,35 @@
+From: Michel Dänzer <michel@tungstengraphics.com>
+Date: Fri, 9 Mar 2007 08:43:17 +0000 (+0100)
+Subject: r300: Also update window state when it's already bound but its stamp changed.
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=4d9901a1cab8e0d55b1b2309cf3ffec235e53149
+
+r300: Also update window state when it's already bound but its stamp changed.
+
+And set new cliprects before deriving other state from them. This ensures
+cliprects aren't accessed after having been freed.
+
+Thanks to Panagiotis Papadakos for testing various iterations of this.
+---
+
+--- a/src/mesa/drivers/dri/r300/radeon_context.c
++++ b/src/mesa/drivers/dri/r300/radeon_context.c
+@@ -273,15 +273,15 @@ GLboolean radeonMakeCurrent(__DRIcontext
+ 					      &radeon->vbl_seq);
+ 		}
+ 
++		radeon->dri.readable = driReadPriv;
++
+ 		if (radeon->dri.drawable != driDrawPriv ||
+-		    radeon->dri.readable != driReadPriv) {
++		    radeon->lastStamp != driDrawPriv->lastStamp) {
+ 			radeon->dri.drawable = driDrawPriv;
+-			radeon->dri.readable = driReadPriv;
+ 
++			radeonSetCliprects(radeon);
+ 			r300UpdateWindow(radeon->glCtx);
+ 			r300UpdateViewportOffset(radeon->glCtx);
+-
+-			radeonSetCliprects(radeon);
+ 		}
+ 
+ 		_mesa_make_current(radeon->glCtx,

debian/patches/09_i915_always_enable_pixel_fog.patch

@@ -0,0 +1,31 @@
+From: Zou Nan hai <nanhai.zou@intel.com>
+Date: Fri, 2 Feb 2007 01:35:17 +0000 (+0800)
+Subject:   Fix fd.o #9686, when fall into vertex fog,
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=2dfb3a217f730d6783fb2ac8b73248dc682f923c
+
+  Fix fd.o #9686, when fall into vertex fog,
+  fog factors are precomputed in t_vb_fog.c compute_fog_blend_factors,
+  which is incompatible with appended fragment fog code.
+  That will make GoogleEarth display abnormally.
+  always use pixel fog.
+---
+
+--- a/src/mesa/drivers/dri/i915/i915_state.c
++++ b/src/mesa/drivers/dri/i915/i915_state.c
+@@ -611,10 +611,12 @@ void i915_update_fog( GLcontext *ctx )
+ 	 i915->state.Ctx[I915_CTXREG_LIS5] &= ~S5_FOG_ENABLE;
+    }
+ 
+-   if (enabled) {
+-      _tnl_allow_vertex_fog( ctx, (i915->vertex_fog == I915_FOG_VERTEX) ); 
+-      _tnl_allow_pixel_fog( ctx, (i915->vertex_fog != I915_FOG_VERTEX) ); 
+-   }
++   /* always enbale pixel fog
++    * vertex fog use precaculted fog coord will conflict with appended
++    * fog program
++    */
++    _tnl_allow_vertex_fog( ctx, 0 );
++    _tnl_allow_pixel_fog( ctx, 1 );
+ }
+ 
+ static void i915Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)

debian/patches/series

@@ -0,0 +1,10 @@
+00_create-libdir.patch
+01_fix-makefile.patch
+02_use-ieee-fp-on-s390-and-m68k.patch
+03_optional-progs-and-install.patch
+04_cleanup-osmesa-configs.patch
+05_static-nonpic.patch
+06_fix_texture_data_corruption.patch
+07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
+08_r300_update_window_state_when_bound_but_stamp_changed.patch
+09_i915_always_enable_pixel_fog.patch

debian/rules

@@ -0,0 +1,139 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian mesa package
+# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+STAMP_DIR = debian/stamp
+
+QUILT_STAMPFN = $(STAMP_DIR)/patch
+include /usr/share/quilt/quilt.make
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+export DEB_BUILD_ARCH
+
+# choose which configurations to build
+SWX11_GLU_CONFIGS =
+DRI_CONFIGS =
+
+include debian/scripts/choose-configs
+
+# build the following configurations by default
+CONFIGS = $(SWX11_GLU_CONFIGS) \
+          $(DRI_CONFIGS) \
+          debian-osmesa \
+          debian-osmesa-static \
+          debian-osmesa16 \
+          debian-osmesa16-static \
+          debian-osmesa32 \
+          debian-osmesa32-static
+
+STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
+BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
+INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS)) \
+                 $(STAMP_DIR)/install-source
+
+# list the configurations that will built
+configs:
+	@echo Building the following configurations: $(CONFIGS)
+
+$(STAMP_DIR):
+	dh_testdir
+	mkdir -p $@
+
+$(QUILT_STAMPFN): $(STAMP_DIR)
+
+
+build: $(BUILD_STAMPS)
+
+$(STAMP)-build-%: patch
+	dh_testdir
+	mkdir -p $(DEB_BUILD_DIR)/$*
+	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
+		xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
+	ln -sf $* $(DEB_BUILD_DIR)/$*/configs/current
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+	touch $@
+
+pre-install:
+	dh_testdir
+	dh_testroot
+	dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
+	rm -rf $(INSTALL_STAMPS)
+
+install: pre-install $(INSTALL_STAMPS)
+
+$(STAMP)-install-%: $(STAMP)-build-%
+	# Add here commands to install the package into debian/tmp
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	touch $@
+
+$(STAMP_DIR)/install-source:
+	# install Mesa source for mesa-swx11-source package
+	chmod a+x debian/scripts/install-source.sh
+	debian/scripts/install-source.sh
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean --exclude ./Makefile.orig
+	rm -rf $(DEB_BUILD_DIR) $(STAMP_DIR)
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install --sourcedir=debian/tmp --list-missing -i
+	dh_installman -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_install --sourcedir=debian/tmp --list-missing -s
+	dh_installman -s
+	dh_link -s
+	dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
+	dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
+	dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+
+binary: binary-indep binary-arch
+.PHONY: configs build clean binary-indep binary-arch binary install configure
+

debian/scripts/choose-configs

@@ -0,0 +1,56 @@
+# Script to choose which configurations are to be built depending on the value
+# of the DEB_BUILD_ARCH variable.
+#
+# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
+
+##############################################################################
+## architecture-specific configurations ######################################
+
+# choose an architecture-specific build of swx11 and GLU if a matching
+# configuration exists
+ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
+	SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
+else
+	SWX11_GLU_CONFIGS := debian-swx11+glu-any
+endif
+
+# same for static builds
+ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
+	SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
+else
+	SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
+endif
+
+# and for the GLX/DRI-enabled libGL
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+	DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
+else
+  ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+  else
+	DRI_CONFIGS := debian-dri-any
+  endif
+endif
+
+##############################################################################
+## CPU-optimized configurations ##############################################
+
+ifeq ($(DEB_BUILD_ARCH), i386)
+	SWX11_GLU_CONFIGS += debian-swx11+glu-i386-i686
+#	DRI_CONFIGS += debian-dri-i386-i686
+endif
+
+#ifeq ($(DEB_BUILD_ARCH), alpha)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-alpha-ev5
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH), powerpc)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-powerpc-603
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH), sparc)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc
+#endif
+
+# vim: ft=make
+

debian/scripts/install-source.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+if [ -n "$1" ]; then
+	TOP="$1"
+else
+	TOP=`pwd`
+fi
+
+SOURCE_DIRS='
+	include/GL/internal
+	src/glx/x11
+	src/mesa/array_cache
+	src/mesa/drivers/common
+	src/mesa/drivers/dri/common
+	src/mesa/drivers/dri/glcore
+	src/mesa/drivers/x11
+	src/mesa/glapi
+	src/mesa/main
+	src/mesa/math
+	src/mesa/ppc
+	src/mesa/shader
+	src/mesa/sparc
+	src/mesa/swrast_setup
+	src/mesa/swrast
+	src/mesa/tnl_dd
+	src/mesa/tnl
+	src/mesa/x86-64
+	src/mesa/x86
+'
+
+FILTER="-not -path '*/.svn*'"
+TARGET=${TOP}/debian/tmp/usr/share/mesa-source
+
+(
+	find $SOURCE_DIRS $FILTER -name '*.[ch]';
+	find include/GL $FILTER -name 'xmesa*.h';
+) | \
+	while read x; do
+		DIRNAME=`dirname "$x"`
+		mkdir -p "$TARGET/$DIRNAME"
+		cp -lf "$x" "$TARGET/$DIRNAME"
+	done
+
+# fix permissions
+find "$TARGET" -type f | xargs chmod 0644
+

debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz

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/RELNOTES-6.5.1

@@ -0,0 +1,60 @@
+
+			Mesa 6.5.1 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.
+
+
+
+Mesa 6.5.1 is a 6.5 follow-on development release mostly consisting of
+bug fixes (see the VERSIONS file).
+
+
+New Features
+------------
+
+  Intel i965 "broadwater" DRI driver
+
+  GL_APPLE_vertex_array_object - allows encapsulation of a set of vertex
+	arrays in an object.
+
+  GL_EXT_texture_sRGB - non-linearly mapped texture formats
+
+  GL_EXT_gpu_program_parameters - addes a few new functions for setting
+	multiple vertex/fragment program parameters with one call.
+
+
+
+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.1,v 1.2 2006/08/18 20:24:54 brianp Exp $

docs/contents.html

@@ -63,8 +63,8 @@ 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="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>

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/download.html

@@ -9,7 +9,7 @@
 <H1>Downloading</H1>
 
 <p>
-Last development release: <b>6.5.2</b>
+Last development release: <b>6.5.1</b>
 </p>
 
 <p>

docs/drivers.html

@@ -0,0 +1,221 @@
+<HTML>
+
+<TITLE>Writing Mesa Device Drivers</TITLE>
+
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">
+
+<center><h1>Writing Mesa Device Drivers</h1></center>
+
+<h2>Introduction</h2>
+
+<p>
+Several different classes of drivers can be identified:
+</p>
+<ul>
+<li><b>100% Software Driver</b> -
+    a software driver that does not utilize accelerated graphics hardware.
+    Such a driver will basically just write (and read) pixel values to the
+    computer's frame buffer or a malloc'd color buffer.
+    Examples include the X11/XMesa driver, the Windows driver and OSMesa.
+</li>
+<br>
+<li><b>Hardware Rasterization Driver</b> -
+    for graphics hardware that implements accelerated point/line/triangle
+    rasterization, but relies on core Mesa for vertex transformation.
+    Examples include the DRI 3Dfx, Matrox, and Rage 128 drivers.
+</li>
+<br>
+<li><b>Hardware Transformation and Rasterization Driver</b> -
+    for graphics hardware that implements accelerated rasterization and vertex
+    transformation.
+    Examples include the DRI Radeon and R200 drivers.
+</li>
+</ul>
+
+<p>
+Each class of driver builds on the functionality of the preceeding one.
+For example, a hardware rasterization driver may need to fall back to
+software rasterization when a particular OpenGL state combination is set
+but not supported by the hardware (perhaps smooth, stippled, textured
+triangles).
+</p>
+
+<p>
+Likewise, a hardware transformation driver might need to fall back to
+software-based transformation when a particular, seldom-used lighting
+mode is enabled.
+</p>
+
+
+<h2>Getting Started</h2>
+
+<p>
+The best way to get started writing a new driver is to find an existing
+driver similar to what you plan to implement, and then study it.
+</p>
+<p>
+It's not feasible for this document to explain every detail of writing
+a driver.
+The minute details can be gleaned by looking at existing drivers.
+This document focuses on the high-level concepts and will perhaps expand
+on the details in the future.
+</p>
+<p>
+For examples of 100% software drivers, the OSMesa and XMesa (fake/stand-alone
+GLX) drivers are the best examples.
+</p>
+<p>
+For examples of hardware drivers, the DRI Radeon and R200 drivers are good
+examples.
+</p>
+
+
+
+<h2>Programming API vs. Drivers</h2>
+
+<p>
+There are two aspects to a Mesa device driver:
+</p>
+
+<ul>
+<li><b>Public programming API</b> -
+    this is the interface which application programmers use.
+    Examples are the GLX, WGL and OSMesa interfaces.
+    If you're developing a device driver for a new operating system or
+    window system you'll have to design and implement an <em>OpenGL glue</em>
+    interface similar to these.
+    This interface will, in turn, communicate with the internal driver code.
+</li>
+<br>
+<li><b>Private/internal driver code</b> -
+    this is the code which (effectively) translates OpenGL API calls into
+    rendering operations.
+    The device driver must manage hardware resources, track OpenGL state
+    and implement or dispatch the fundamental rendering operations such as
+    point, line, triangle and image rendering.
+</li>
+</ul>
+
+<p>
+The remainder of this document will focus on the later part.
+Furthermore, we'll use the GLX interface for examples.
+</p>
+
+<p>
+In the case of the DRI drivers, the public GLX interface is contained in
+the <b>libGL.so</b> library.
+libGL.so, in turn, dynamically loads one of the DRI drivers (such as
+radeon_dri.so).
+Both libGL.so and the driver modules talk to the X window system via the
+DRI extension.
+Furthermore, the driver modules interface to the graphics hardware with
+the help of a kernel module and the conventional 2D X server driver.
+</p>
+
+
+
+
+<h2>Software Driver Overview</h2>
+
+<p>
+A software driver is primarily concerned with writing pixel values to the
+system's color buffer (and reading them back).
+The color buffers might be window canvases (typically the front
+color buffer) and/or off-screen image buffers (typically the back color
+buffer).
+The depth, stencil and accumulation buffers will be implemented within
+core Mesa.
+</p>
+<p>
+The software driver must also be concerned with allocation and deallocation
+of rendering contexts, frame buffers and pixel formats (visuals).
+</p>
+
+
+<h3>Rendering Contexts</h3>
+
+<p>
+The glue interface will always have a function for creating new rendering
+contexts (such as glXCreateContext).
+The device driver must have a function which allocates and initializes
+a device-specific rendering context.
+</p>
+
+
+<h3>Frame Buffers</h3>
+
+<p>
+The <em>frame buffer</em> can either be a screen region defined by a window
+or the entire screen.
+</p>
+<p>
+In either case, the device driver must implement functions for allocating,
+initializing and managing frame buffers.
+<p>
+
+
+<h3>Spans</h3>
+
+<p>
+The fundamental rendering operation is to write (and read)
+<em>spans</em> of pixels to the front / back color buffers.
+A span is a horizontal array of pixel colors with an array of mask
+flags.  The span begins at a particular (x,y) screen coordinate,
+extends for N pixels, describes N RGBA colors (or color indexes) and
+has an array of N boolean flags indicating which pixels to write and skip.
+<p>
+
+<h3>Miscellaneous functions</h3>
+
+<p>
+Additionally, a software driver will typically have functions for
+binding rendering contexts to frame buffers (via glXMakeCurrent),
+swapping color buffers (via glXSwapBuffers), synchronization
+(via glFlush/glFinish) and queries (via glGetString).
+</p>
+
+<h3>Optimizations</h3>
+
+<p>
+A software driver might implement optimized routines for drawing lines
+and triangles for common cases (such as smooth shading with depth-testing).
+Then, the span functions can be bypassed for a little extra speed.
+The OSMesa and XMesa drivers have examples of this.
+</p>
+
+
+
+
+
+
+
+<h2>Hardware Driver Overview</h2>
+
+<p>
+To do...
+</p>
+
+
+
+<h2>OOP-Style Inheritance and Specialization</h2>
+
+<p>
+Even though Mesa and most device drivers are written in C, object oriented
+programming principles are used in several places.
+</p>
+
+<h3>Rendering Contexts</h3>
+
+<p>
+Every Mesa device driver will need to define a device-specific rendering
+context structure.
+</p>
+
+
+<h2>State Tracking</h2>
+
+
+
+
+</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/news.html

@@ -11,13 +11,6 @@
 <H1>News</H1>
 
 
-<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.