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.

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
+

debian/changelog

@@ -1,3 +1,51 @@
+mesa (6.5.2-7) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * libgl1-mesa-dev does not need to depend on libgl1-mesa-dri,
+    libgl1-mesa-glx is enough (since their split in 6.4.1-0.1);
+    closes: #432081.  Thanks, Samuel Thibault!
+
+  [ Julien Cristau ]
+  * libgl1-mesa-dev Depends on libgl1-mesa-glx (>= ${source:Upstream-Version})
+    instead of >= ${Source-Version}.  This way it's still installable on
+    architectures where mesa isn't built yet when a minor revision is
+    uploaded.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 11 Jul 2007 05:50:45 +0200
+
+mesa (6.5.2-6) unstable; urgency=low
+
+  * libgl1-mesa-swx11 needs to depend on libosmesa6 (>= 6.5.2-1) because
+    it used to contain libOSMesa.so.6.  This means that programs linked
+    against this lib got a dependency on -swx11 which was broken since
+    6.5.2-1.
+  * Fix build on hurd-i386 (build libgl1-mesa-glx without dri support and
+    don't build the dri drivers); closes: #420403.  Thanks, Samuel Thibault!
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 05 Jul 2007 00:56:35 +0200
+
+mesa (6.5.2-5) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
+    (closes: #420164). Thanks to Christian Ohm.
+  * Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
+  * Add 09_i915_always_enable_pixel_fog.patch
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 18 May 2007 13:36:25 +0200
+
+mesa (6.5.2-4) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * debian/control: libgl1-mesa-dri now suggests libglide3, with an
+    explanation in the description (closes: #387339).
+  * Upload to unstable.
+
+  [ Brice Goglin ]
+  * Add 06_fix_texture_data_corruption.patch (closes: #412346).
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 20 Apr 2007 05:57:35 +0200
+
 mesa (6.5.2-3) experimental; urgency=low
 
   * Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override

debian/control

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2
 Package: libgl1-mesa-swx11
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+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
@@ -158,8 +158,9 @@ Description: A free implementation of the OpenGL API -- GLX runtime -- debugging
 Package: libgl1-mesa-dri
 Section: libs
 Priority: optional
-Architecture: any
+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
@@ -172,11 +173,13 @@ Description: A free implementation of the OpenGL API -- DRI modules
  .
  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: any
+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
@@ -215,7 +218,7 @@ Description: A free implementation of the OpenGL API -- DRI modules -- debugging
 Package: libgl1-mesa-dev
 Section: libdevel
 Architecture: all
-Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${Source-Version}), libgl1-mesa-dri (>= ${Source-Version})
+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

debian/libglw1-mesa.shlibs

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

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

@@ -4,3 +4,7 @@
 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/scripts/choose-configs

@@ -22,10 +22,14 @@ else
 endif
 
 # and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
-	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+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
 
 ##############################################################################