Merge branch 'debian-experimental' into debian-unstable

5 files changed, 27 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 1ece9610261..8598ffe93c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (6.5.2-4) UNRELEASED; urgency=low
   * Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
     static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
     (closes: #374904).
+  * Add 06_fix_texture_data_corruption.patch (closes: #412346).
 
  -- Brice Goglin <Brice.Goglin@ens-lyon.org>  Fri, 30 Mar 2007 19:44:53 +0200
 
diff --git a/debian/control b/debian/control
index 8400b0414ae..c6f0de3d584 100644
--- a/debian/control
+++ b/debian/control
@@ -302,7 +302,6 @@ Package: libglw1-mesa
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libgl1-mesa-swx11 (<< 6.5.2-4)
 Provides: libglw1
 Description: A free implementation of the OpenGL API -- runtime
  Mesa is a 3-D graphics library with an API which is very similar to
@@ -322,7 +321,7 @@ Section: libdevel
 Architecture: any
 Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
 Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
-Conflicts: libgl1-mesa-swx11-dev (<< 6.5.2-4)
+Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4)
 Replaces: libglw-dev
 Description: A free implementation of the OpenGL API -- development support files
  This package provides the development environment required for
diff --git a/debian/libglw1-mesa.shlibs b/debian/libglw1-mesa.shlibs
new file mode 100644
index 00000000000..488d4da327f
--- /dev/null
+++ b/debian/libglw1-mesa.shlibs
@@ -0,0 +1 @@
+libGLw 1 libglw1-mesa | libglw1
diff --git a/debian/patches/06_fix_texture_data_corruption.patch b/debian/patches/06_fix_texture_data_corruption.patch
new file mode 100644
index 00000000000..5bca17af5a4
--- /dev/null
+++ b/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
diff --git a/debian/patches/series b/debian/patches/series
index 280a2f3548e..e4a761e6237 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 03_optional-progs-and-install.patch
 04_cleanup-osmesa-configs.patch
 05_static-nonpic.patch
+06_fix_texture_data_corruption.patch