Merge branch 'debian-unstable' of git+ssh://git.debian.org/git/pkg-xorg/lib/mesa into debian-experimental

Conflicts:
	ChangeLog
	debian/changelog

6 files changed, 25 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index 039fb1e5402..275356a1a0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,17 @@ mesa (7.7~rc2-1) experimental; urgency=low
 
  -- Brice Goglin <bgoglin@debian.org>  Sat, 12 Dec 2009 13:02:55 +0100
 
+mesa (7.6.1-1) unstable; urgency=low
+
+  * New upstream release
+    + Pull upstream mesa_7_6_branch up to commit da876fa3
+  * Bump linux-libc-dev build-dep to 2.6.31 for the r600 dri driver (fixes
+    ftbfs on mips).
+  * Drop hunk from 05_hurd-ftbfs.diff that was applied upstream.  Refresh
+    other patches.
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 29 Dec 2009 10:42:24 +0000
+
 mesa (7.6.1~rc3-1) unstable; urgency=low
 
   * New upstream release candidate.
diff --git a/debian/control b/debian/control
index 2a2ef3b09ce..da80a1b8752 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40), pkg-config,
  x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev,
  libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev,
  libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 1.99.3),
- linux-libc-dev (>= 2.6.29) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
+ linux-libc-dev (>= 2.6.31) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
index ac8699a9131..e60b0044d60 100644
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -6,7 +6,7 @@ Index: mesa/src/mesa/main/compiler.h
 ===================================================================
 --- mesa.orig/src/mesa/main/compiler.h
 +++ mesa/src/mesa/main/compiler.h
-@@ -347,8 +347,9 @@
+@@ -351,8 +351,9 @@
   * USE_IEEE: Determine if we're using IEEE floating point
   */
  #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch
index d426b88afc4..97d8d5fd2c4 100644
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -52,4 +52,4 @@ Index: mesa/progs/Makefile
 +	done
  
  clean:
- 	-@for dir in $(SUBDIRS) tests ; do \
+ 	@list='$(SUBDIRS)'; for dir in $$list tests ; do \
diff --git a/debian/patches/05_hurd-ftbfs.diff b/debian/patches/05_hurd-ftbfs.diff
index f3de3e0f398..4d81262811d 100644
--- a/debian/patches/05_hurd-ftbfs.diff
+++ b/debian/patches/05_hurd-ftbfs.diff
@@ -6,28 +6,11 @@ Subject: Fix build on GNU/Hurd
  src/glx/x11/dri2.c |    2 ++
  2 files changed, 16 insertions(+), 11 deletions(-)
 
-Index: mesa-7.6.1~rc2/src/glx/x11/dri2.c
+Index: mesa/configure.ac
 ===================================================================
---- mesa-7.6.1~rc2.orig/src/glx/x11/dri2.c	2009-12-05 23:51:01.000000000 +0100
-+++ mesa-7.6.1~rc2/src/glx/x11/dri2.c	2009-12-06 00:10:10.000000000 +0100
-@@ -30,6 +30,7 @@
-  *   Kristian Høgsberg (krh@redhat.com)
-  */
- 
-+#ifdef GLX_DIRECT_RENDERING
- 
- #define NEED_REPLIES
- #include <X11/Xlibint.h>
-@@ -377,3 +378,4 @@
-    UnlockDisplay(dpy);
-    SyncHandle();
- }
-+#endif
-Index: mesa-7.6.1~rc2/configure.ac
-===================================================================
---- mesa-7.6.1~rc2.orig/configure.ac	2009-12-05 23:50:57.000000000 +0100
-+++ mesa-7.6.1~rc2/configure.ac	2009-12-06 00:10:27.000000000 +0100
-@@ -538,6 +538,13 @@
+--- mesa.orig/configure.ac
++++ mesa/configure.ac
+@@ -539,6 +539,13 @@
      enable_xcb=no
  fi
  
@@ -41,7 +24,7 @@ Index: mesa-7.6.1~rc2/configure.ac
  dnl
  dnl libGL configuration per driver
  dnl
-@@ -571,11 +578,13 @@
+@@ -572,11 +579,13 @@
          AC_MSG_ERROR([Can't use static libraries for DRI drivers])
      fi
  
@@ -58,9 +41,9 @@ Index: mesa-7.6.1~rc2/configure.ac
 +        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
 +    fi
  
-     PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no)
+     PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no)
  
-@@ -656,12 +665,6 @@
+@@ -657,12 +666,6 @@
      [DRI_DRIVER_SEARCH_DIR="$withval"],
      [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
  AC_SUBST([DRI_DRIVER_SEARCH_DIR])
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff
index 0dff9d486d2..87faef76125 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -8,11 +8,11 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690
  configure.ac |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: mesa-7.6.1~rc2/configure.ac
+Index: mesa/configure.ac
 ===================================================================
---- mesa-7.6.1~rc2.orig/configure.ac	2009-12-06 00:10:10.000000000 +0100
-+++ mesa-7.6.1~rc2/configure.ac	2009-12-06 00:10:10.000000000 +0100
-@@ -745,7 +745,7 @@
+--- mesa.orig/configure.ac
++++ mesa/configure.ac
+@@ -746,7 +746,7 @@
              ;;
          esac
          ;;