Merge branch 'debian-experimental' into test

Conflicts:
	Makefile
	configs/default
	docs/download.html
	docs/news.html
	docs/relnotes-7.4.2.html
	doxygen/.gitignore
	include/GL/internal/dri_interface.h
	include/GLES/egl.h
	progs/demos/Windows/all.dsp
	progs/demos/Windows/bounce.dsp
	progs/demos/Windows/clearspd.dsp
	progs/demos/Windows/cubemap.dsp
	progs/demos/Windows/demos.dsw
	progs/demos/Windows/drawpix.dsp
	progs/demos/Windows/fire.dsp
	progs/demos/Windows/gears.dsp
	progs/demos/Windows/geartrain.dsp
	progs/demos/Windows/glinfo.dsp
	progs/demos/Windows/gloss.dsp
	progs/demos/Windows/gltestperf.dsp
	progs/demos/Windows/glutfx.dsp
	progs/demos/Windows/ipers.dsp
	progs/demos/Windows/isosurf.dsp
	progs/demos/Windows/loadbias.dsp
	progs/demos/Windows/morph3d.dsp
	progs/demos/Windows/multiarb.dsp
	progs/demos/Windows/occlude.dsp
	progs/demos/Windows/osdemo.dsp
	progs/demos/Windows/paltex.dsp
	progs/demos/Windows/pixeltex.dsp
	progs/demos/Windows/pointblast.dsp
	progs/demos/Windows/rain.dsp
	progs/demos/Windows/ray.dsp
	progs/demos/Windows/readpix.dsp
	progs/demos/Windows/reflect.dsp
	progs/demos/Windows/renormal.dsp
	progs/demos/Windows/shadowtex.dsp
	progs/demos/Windows/spectex.dsp
	progs/demos/Windows/spriteblast.dsp
	progs/demos/Windows/stex3d.dsp
	progs/demos/Windows/teapot.dsp
	progs/demos/Windows/terrain.dsp
	progs/demos/Windows/tessdemo.dsp
	progs/demos/Windows/texcyl.dsp
	progs/demos/Windows/texdown.dsp
	progs/demos/Windows/texenv.dsp
	progs/demos/Windows/texobj.dsp
	progs/demos/Windows/trispd.dsp
	progs/demos/Windows/tunnel.dsp
	progs/demos/Windows/tunnel2.dsp
	progs/demos/Windows/winpos.dsp
	progs/demos/dinoshade.c
	progs/demos/projtex.c
	progs/egl/Makefile
	progs/egl/demo1.c
	progs/egl/demo2.c
	progs/egl/demo3.c
	progs/egl/eglgears.c
	progs/egl/eglinfo.c
	progs/fp/.gitignore
	progs/fp/Makefile
	progs/miniglx/Makefile
	progs/redbook/Windows/redbook.dsw
	progs/redbook/Windows/teapots.dsp
	progs/slang/windows/vc60/cltest.dsp
	progs/slang/windows/vc60/framework.dsp
	progs/slang/windows/vc60/slang.dsw
	progs/slang/windows/vc60/sotest.dsp
	progs/slang/windows/vc60/vstest.dsp
	progs/tests/.gitignore
	progs/tests/Makefile
	progs/tests/afsmultiarb.c
	progs/tests/antialias.c
	progs/tests/api_speed.c
	progs/tests/arbfpspec.c
	progs/tests/arbfptest1.c
	progs/tests/arbfptexture.c
	progs/tests/arbfptrig.c
	progs/tests/arbnpot-mipmap.c
	progs/tests/arbnpot.c
	progs/tests/arbvptest1.c
	progs/tests/arbvptest3.c
	progs/tests/arbvptorus.c
	progs/tests/arbvpwarpmesh.c
	progs/tests/arraytexture.c
	progs/tests/blendminmax.c
	progs/tests/blendsquare.c
	progs/tests/blendxor.c
	progs/tests/bufferobj.c
	progs/tests/bug_3050.c
	progs/tests/bug_3101.c
	progs/tests/bug_3195.c
	progs/tests/copypixrate.c
	progs/tests/crossbar.c
	progs/tests/cva.c
	progs/tests/debugger.c
	progs/tests/drawbuffers.c
	progs/tests/exactrast.c
	progs/tests/ext422square.c
	progs/tests/fbotest1.c
	progs/tests/fbotest2.c
	progs/tests/floattex.c
	progs/tests/fog.c
	progs/tests/fogcoord.c
	progs/tests/fptest1.c
	progs/tests/fptexture.c
	progs/tests/interleave.c
	progs/tests/invert.c
	progs/tests/jkrahntest.c
	progs/tests/lineclip.c
	progs/tests/manytex.c
	progs/tests/minmag.c
	progs/tests/mipmap_limits.c
	progs/tests/multipal.c
	progs/tests/multitexarray.c
	progs/tests/multiwindow.c
	progs/tests/no_s3tc.c
	progs/tests/packedpixels.c
	progs/tests/pbo.c
	progs/tests/prog_parameter.c
	progs/tests/random.c
	progs/tests/readrate.c
	progs/tests/rubberband.c
	progs/tests/seccolor.c
	progs/tests/shader_api.c
	progs/tests/stencil_twoside.c
	progs/tests/stencil_wrap.c
	progs/tests/stencilwrap.c
	progs/tests/subtexrate.c
	progs/tests/tex1d.c
	progs/tests/texcmp.c
	progs/tests/texcompress2.c
	progs/tests/texfilt.c
	progs/tests/texgenmix.c
	progs/tests/texline.c
	progs/tests/texrect.c
	progs/tests/texwrap.c
	progs/tests/unfilledclip.c
	progs/tests/vao-01.c
	progs/tests/vao-02.c
	progs/tests/vparray.c
	progs/tests/vpeval.c
	progs/tests/vptest1.c
	progs/tests/vptest2.c
	progs/tests/vptest3.c
	progs/tests/vptorus.c
	progs/tests/vpwarpmesh.c
	progs/tests/yuvrect.c
	progs/tests/yuvsquare.c
	progs/tests/zreaddraw.c
	progs/trivial/.gitignore
	progs/trivial/Makefile
	progs/trivial/clear.c
	progs/trivial/dlist-dangling.c
	progs/trivial/dlist-edgeflag-dangling.c
	progs/trivial/dlist-edgeflag.c
	progs/trivial/drawarrays.c
	progs/trivial/drawelements.c
	progs/trivial/drawrange.c
	progs/trivial/line-clip.c
	progs/trivial/line-cull.c
	progs/trivial/line-userclip-clip.c
	progs/trivial/line-userclip-nop-clip.c
	progs/trivial/line-userclip-nop.c
	progs/trivial/line-userclip.c
	progs/trivial/line.c
	progs/trivial/lineloop-clip.c
	progs/trivial/lineloop.c
	progs/trivial/point-clip.c
	progs/trivial/point-param.c
	progs/trivial/point-wide.c
	progs/trivial/point.c
	progs/trivial/poly-flat.c
	progs/trivial/poly-unfilled.c
	progs/trivial/poly.c
	progs/trivial/quad-clip-all-vertices.c
	progs/trivial/quad-clip-nearplane.c
	progs/trivial/quad-clip.c
	progs/trivial/quad-degenerate.c
	progs/trivial/quad-flat.c
	progs/trivial/quad-offset-factor.c
	progs/trivial/quad-offset-unfilled.c
	progs/trivial/quad-offset-units.c
	progs/trivial/quad-tex-2d.c
	progs/trivial/quad-tex-3d.c
	progs/trivial/quad-tex-pbo.c
	progs/trivial/quad-unfilled.c
	progs/trivial/quad.c
	progs/trivial/quads.c
	progs/trivial/quadstrip-flat.c
	progs/trivial/quadstrip.c
	progs/trivial/tri-blend.c
	progs/trivial/tri-clip.c
	progs/trivial/tri-cull.c
	progs/trivial/tri-dlist.c
	progs/trivial/tri-edgeflag.c
	progs/trivial/tri-flat-clip.c
	progs/trivial/tri-flat.c
	progs/trivial/tri-tex-3d.c
	progs/trivial/tri-unfilled-clip.c
	progs/trivial/tri-unfilled-smooth.c
	progs/trivial/tri-unfilled-userclip.c
	progs/trivial/tri-unfilled.c
	progs/trivial/tri-userclip.c
	progs/trivial/tri.c
	progs/trivial/tristrip-clip.c
	progs/trivial/tristrip.c
	progs/trivial/vbo-drawarrays.c
	progs/trivial/vbo-drawelements.c
	progs/trivial/vbo-drawrange.c
	progs/trivial/vp-array.c
	progs/trivial/vp-clip.c
	progs/trivial/vp-line-clip.c
	progs/trivial/vp-tri.c
	progs/trivial/vp-unfilled.c
	progs/vp/Makefile
	progs/vp/vp-tris.c
	src/egl/Makefile
	src/egl/drivers/demo/Makefile
	src/egl/drivers/demo/demo.c
	src/egl/drivers/dri/Makefile
	src/egl/drivers/dri/egldri.c
	src/egl/drivers/dri/egldri.h
	src/egl/main/Makefile
	src/egl/main/eglapi.c
	src/egl/main/eglapi.h
	src/egl/main/eglconfig.c
	src/egl/main/eglconfig.h
	src/egl/main/eglcontext.c
	src/egl/main/eglcontext.h
	src/egl/main/egldisplay.c
	src/egl/main/egldisplay.h
	src/egl/main/egldriver.c
	src/egl/main/egldriver.h
	src/egl/main/eglglobals.c
	src/egl/main/eglglobals.h
	src/egl/main/egllog.c
	src/egl/main/eglmode.h
	src/egl/main/eglsurface.c
	src/egl/main/eglsurface.h
	src/egl/main/egltypedefs.h
	src/glx/mini/Makefile
	src/glx/x11/dri2_glx.c
	src/mesa/drivers/allegro/amesa.c
	src/mesa/drivers/dri/intel/intel_buffers.c
	src/mesa/drivers/dri/intel/intel_clear.c
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_pixel.c
	src/mesa/drivers/dri/r300/r300_texstate.c
	src/mesa/drivers/dri/radeon/radeon_screen.c
	src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
	src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
	src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
	src/mesa/main/glheader.h
	src/mesa/main/light.c
	src/mesa/main/teximage.c
	src/mesa/main/texparam.c
	src/mesa/main/version.h
	src/mesa/swrast/s_texfilter.c

1 files changed, 238 insertions, 0 deletions

diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000000..17ca3285c34
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,238 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian mesa package
+# Copyright © 2006 Thierry Reding <[email protected]>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+        confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+        confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+# choose which configurations to build
+include debian/scripts/choose-configs
+
+# build the following configurations by default
+CONFIGS = $(SWX11_GLU_CONFIGS) \
+	  dri \
+	  osmesa \
+	  osmesa-static \
+	  osmesa16 \
+	  osmesa16-static \
+	  osmesa32 \
+	  osmesa32-static
+
+STAMP_DIR = debian/stamp
+STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
+BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
+INSTALL_TARGETS = $(addprefix install-, $(CONFIGS))
+
+QUILT_STAMPFN = $(STAMP_DIR)/patch
+include /usr/share/quilt/quilt.make
+
+confflags-common = \
+	--disable-glu \
+	--disable-glut \
+	--disable-glw \
+	CFLAGS="$(CFLAGS)"
+
+DRI_DRIVERS = swrast
+
+# hurd doesn't do direct rendering
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+	DIRECT_RENDERING = --disable-driglx-direct
+else
+	DIRECT_RENDERING = --enable-driglx-direct
+  ifeq ($(DEB_HOST_ARCH), lpia)
+	DRI_DRIVERS += i915 i965
+  else ifneq ($(DEB_HOST_ARCH), s390)
+	DRI_DRIVERS += mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
+    ifeq ($(DEB_HOST_GNU_CPU), i486)
+	DRI_DRIVERS += i810 i915 i965 sis unichrome
+    else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
+	DRI_DRIVERS += i915 i965 sis unichrome
+    else ifeq ($(DEB_HOST_ARCH), sparc)
+	DRI_DRIVERS += ffb
+    endif
+  endif
+endif
+
+confflags-dri = \
+	--with-driver=dri \
+	--with-dri-drivers="$(DRI_DRIVERS)" \
+	--with-demos=xdemos \
+	--libdir=/usr/lib/glx \
+	--with-dri-driverdir=/usr/lib/dri \
+	--enable-glx-tls \
+	$(DIRECT_RENDERING) \
+	$(confflags-common)
+
+confflags-osmesa = \
+	--with-driver=osmesa \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa-static = \
+	--with-driver=osmesa \
+	--enable-static \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa16 = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=16 \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa16-static = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=16 \
+	--enable-static \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa32 = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=32 \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa32-static = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=32 \
+	--enable-static \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-swx11+glu = \
+	--with-driver=xlib \
+	--disable-gl-osmesa \
+	--with-demos= \
+	--disable-glut \
+	--enable-motif \
+	CFLAGS="$(CFLAGS)"
+
+confflags-swx11+glu-static = \
+	--with-driver=xlib \
+	--disable-gl-osmesa \
+	--enable-static \
+	--with-demos= \
+	--disable-glut \
+	--enable-motif \
+	CFLAGS="$(CFLAGS)"
+
+confflags-swx11+glu-i386-i686 = \
+	--with-driver=xlib \
+	--disable-gl-osmesa \
+	--with-demos= \
+	--disable-glut \
+	--enable-motif \
+	--libdir=/usr/lib/i686/cmov \
+	CFLAGS="$(CFLAGS) -march=i686"
+
+configure: $(QUILT_STAMPFN) configure.ac
+	autoreconf -vfi
+
+# list the configurations that will built
+configs:
+	@echo Building the following configurations: $(CONFIGS)
+
+$(STAMP_DIR)/stamp:
+	dh_testdir
+	mkdir -p $(STAMP_DIR)
+	>$@
+
+$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
+
+build: $(BUILD_STAMPS)
+
+$(STAMP)-build-%: configure
+	dh_testdir
+
+	mkdir -p $(DEB_BUILD_DIR)/$*
+	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
+		xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
+	cd $(DEB_BUILD_DIR)/$* && \
+	../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+	             --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+	             --localstatedir=/var $(confflags) $(confflags-$*)
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+
+	touch $@
+
+install:
+	# Add here commands to install the package into debian/tmp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) -f debian/rules $(INSTALL_TARGETS)
+
+install-%: $(STAMP)-build-%
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf .pc
+	
+	rm -f config.cache config.log config.status
+	rm -f */config.cache */config.log */config.status
+	rm -f conftest* */conftest*
+	rm -rf autom4te.cache */autom4te.cache
+	rm -rf obj-*
+	rm -rf configure config.guess config.sub config.h.in
+	rm -rf $$(find -name Makefile.in)
+	rm -rf aclocal.m4 missing depcomp install-sh ltmain.sh
+	rm -rf $(STAMP_DIR)
+	
+	dh_clean
+
+# Build architecture-independent files here.
+binary-indep: install
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_install -s --sourcedir=debian/tmp --list-missing
+	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