Drop 07_sparc64_xform_asm.patch, applied upstream
diff --git a/debian/changelog b/debian/changelog
index 6966eaa..9522376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@
* New upstream release candidate.
+ Pull upstream mesa_7_6_branch up to commit 7d41b424.
- * Update debian/rules and add 07_sparc64_xform_asm.patch to
- fix sparc64 FTBFS, thanks Aurelien Jarno, closes: #560403.
+ + Includes sparc64 xform asm patch from #560403.
+ * Update debian/rules to fix sparc64 FTBFS, thanks Aurelien Jarno,
+ closes: #560403.
* Build r600 DRI driver.
-- Brice Goglin <bgoglin@debian.org> Fri, 11 Dec 2009 07:51:52 +0100
diff --git a/debian/patches/07_sparc64_xform_asm.patch b/debian/patches/07_sparc64_xform_asm.patch
deleted file mode 100644
index 1c00c02..0000000
--- a/debian/patches/07_sparc64_xform_asm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mesa-7.6.1~rc2.orig/src/mesa/sparc/xform.S
-+++ mesa-7.6.1~rc2/src/mesa/sparc/xform.S
-@@ -17,7 +17,7 @@
-
- #include "sparc_matrix.h"
-
--#if defined(SVR4) || defined(__SVR4) || defined(__svr4__)
-+#if defined(SVR4) || defined(__SVR4) || defined(__svr4__) || defined(__arch64__)
- /* Solaris requires this for 64-bit. */
- .register %g2, #scratch
- .register %g3, #scratch
diff --git a/debian/patches/series b/debian/patches/series
index 9d0bb66..1f29aca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
04_osmesa_version.diff
05_hurd-ftbfs.diff
06_kfreebsd-ftbfs.diff
-07_sparc64_xform_asm.patch
