debian/changelog | 2
debian/patches/01_gallium-util-add-missing-u_debug-include.patch | 39
----------
debian/patches/series | 1
3 files changed, 2 insertions(+), 40 deletions(-)
New commits:
commit 1839b39a8465b7d8a9c00957293084e067eac00d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 22 11:42:48 2014 +0200
Remove upstreamed patch.
01_gallium-util-add-missing-u_debug-include.patch
diff --git a/debian/changelog b/debian/changelog
index 459ad3b..ca47574 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
mesa (10.3.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove upstreamed patch.
+ - 01_gallium-util-add-missing-u_debug-include.patch
-- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 22 Sep 2014
11:31:45 +0200
diff --git a/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
b/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
deleted file mode 100644
index 12ed857..0000000
--- a/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 05bd91b0202e06cab998112a3a833c1fa3b47d31 Mon Sep 17 00:00:00 2001
-From: Andreas Boll <andreas.boll....@gmail.com>
-Date: Fri, 12 Sep 2014 10:11:24 +0200
-Subject: [PATCH] gallium/util: add missing u_debug include
-
-Needed for assert.
-Fixes build on BE archs with -Werror=implicit-function-declaration.
-
-In file included from
-../../../../../src/gallium/auxiliary/draw/draw_fs.c:30:0:
-../../../../../src/gallium/auxiliary/util/u_math.h: In function
-'util_memcpy_cpu_to_le32':
-../../../../../src/gallium/auxiliary/util/u_math.h:810:4: error:
-implicit declaration of function 'assert'
-[-Werror=implicit-function-declaration]
- assert(n % 4 == 0);
- ^
-
-Cc: "10.3" <mesa-sta...@lists.freedesktop.org>
-Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
----
- src/gallium/auxiliary/util/u_math.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/auxiliary/util/u_math.h
b/src/gallium/auxiliary/util/u_math.h
-index 25bcfb5..39bd40f 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 "util/u_debug.h"
-
-
- #ifdef __cplusplus
---
-2.1.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 2274a62..9f0749f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_gallium-util-add-missing-u_debug-include.patch
07_gallium-fix-build-failure-on-powerpcspe.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xw0iz-00045f...@moszumanska.debian.org
