mesa: Changes to 'ubuntu+1'
debian/changelog | 3 +++
debian/patches/fixup-ppc-ftbfs.patch | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 25 insertions(+)
New commits:
commit e9fc612d087b0988b64b1d4d6742103c25983b09
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Sep 4 13:45:39 2014 +0200
Add patch to fix ftbfs.
diff --git a/debian/changelog b/debian/changelog
index 6fb5544..c9d69cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
mesa (10.3~rc2-0ubuntu1) UNRELEASED; urgency=low
* Merge from unreleased debian-experimental.
+ * Add patch to fix ftbfs.
+ - Revert build failure causer.
+ - Add fixup-ppc-ftbfs.patch
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 12 Aug 2014 09:38:49 +0200
diff --git a/debian/patches/fixup-ppc-ftbfs.patch b/debian/patches/fixup-ppc-ftbfs.patch
new file mode 100644
index 0000000..49c2d91
--- /dev/null
+++ b/debian/patches/fixup-ppc-ftbfs.patch
@@ -0,0 +1,21 @@
+diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
+index 25bcfb5..d703bf0 100644
+--- a/src/gallium/auxiliary/util/u_math.h
++++ b/src/gallium/auxiliary/util/u_math.h
+@@ -40,6 +40,7 @@
+
+
+ #include "pipe/p_compiler.h"
++#include "u_debug.h"
+
+
+ #ifdef __cplusplus
+@@ -807,7 +808,7 @@ util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t
+ {
+ #ifdef PIPE_ARCH_BIG_ENDIAN
+ size_t i, e;
+- assert(n % 4 == 0);
++ debug_assert(n % 4 == 0);
+
+ for (i = 0, e = n / 4; i < e; i++) {
+ uint32_t * restrict d = (uint32_t* restrict)dest;
diff --git a/debian/patches/series b/debian/patches/series
index af4c631..54f71e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
# Ubuntu patches.
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
+fixup-ppc-ftbfs.patch
Reply to: