mesa: Changes to 'debian-unstable'
debian/changelog | 8 ++++++--
debian/patches/series | 1 +
debian/patches/x32-updates.diff | 12 ++++++++++++
debian/rules | 4 ++--
4 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit cb0b88cc7b3764d8cc9b9d5c2a5ab3a8d52d50a6
Author: Maarten Lankhorst <dev@mblankhorst.nl>
Date: Mon Aug 11 13:35:12 2014 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 776c6b5..3e392a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.2.5-1) UNRELEASED; urgency=medium
+mesa (10.2.5-1) unstable; urgency=medium
[ Andreas Boll ]
* New upstream release.
@@ -13,7 +13,7 @@ mesa (10.2.5-1) UNRELEASED; urgency=medium
[ Maarten Lankhorst ]
* Enable support for freedreno.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 04 Aug 2014 10:30:18 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 11 Aug 2014 13:34:58 +0200
mesa (10.2.4-1) unstable; urgency=medium
commit b540f7f490cf19ec75bbef0bfd4b589cde2e1891
Author: Maarten Lankhorst <dev@mblankhorst.nl>
Date: Mon Aug 11 13:33:30 2014 +0200
Add patch to fix FTBFS on x32. (Closes: #757703)
x32-updates.patch
diff --git a/debian/changelog b/debian/changelog
index 167c60c..776c6b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ mesa (10.2.5-1) UNRELEASED; urgency=medium
assumptions (Closes: #728053).
- i915: Fix up intelInitScreen2 for DRI3 (Closes: #754297).
+ [ Matthias Klose ]
+ * Add patch to fix FTBFS on x32. (Closes: #757703)
+ - x32-updates.patch
+
[ Maarten Lankhorst ]
* Enable support for freedreno.
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..645aa8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
07_gallium-fix-build-failure-on-powerpcspe.diff
+x32-updates.diff
diff --git a/debian/patches/x32-updates.diff b/debian/patches/x32-updates.diff
new file mode 100644
index 0000000..29ce782
--- /dev/null
+++ b/debian/patches/x32-updates.diff
@@ -0,0 +1,12 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1757,6 +1757,7 @@ gallium_check_st() {
+
+ gallium_require_llvm() {
+ if test "x$MESA_LLVM" = x0; then
++ case "$host" in *gnux32) return;; esac
+ case "$host_cpu" in
+ i*86|x86_64|amd64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);;
+ esac
diff --git a/debian/rules b/debian/rules
index 7acf0e0..248b9bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,6 +117,7 @@ else
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
+ confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.4
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
@@ -205,8 +206,7 @@ $(STAMP)-build-%: configure
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--localstatedir=/var --disable-silent-rules \
- $(confflags) $(confflags-$*) \
- ac_cv_path_LLVM_CONFIG=llvm-config-3.4
+ $(confflags) $(confflags-$*)
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
>$@
Reply to: