debian/changelog | 6 ++++++
debian/control | 4 ++--
debian/rules | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 376c5bb0f90003f7fbe3adf935c127d809f795dc
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Nov 25 13:33:21 2015 +0200
debian/{rules,control}: Duplicate ppc/arm64 Mir disabling for s390x.
diff --git a/debian/changelog b/debian/changelog
index 0163591..9fb702b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.0.5-1ubuntu2) xenial; urgency=medium
+
+ * debian/{rules,control}: Duplicate ppc/arm64 Mir disabling for s390x.
+
+ -- Adam Conrad <adcon...@ubuntu.com> Tue, 24 Nov 2015 00:08:47 -0700
+
mesa (11.0.5-1ubuntu1) xenial; urgency=medium
* Merge from Debian.
diff --git a/debian/control b/debian/control
index e48e8eb..d654442 100644
--- a/debian/control
+++ b/debian/control
@@ -45,8 +45,8 @@ Build-Depends:
libwayland-dev (>= 1.2.0) [linux-any],
# libclang-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
# libclc-dev [amd64 i386 armhf],
- mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el !s390x],
+ libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el !s390x],
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.org/
diff --git a/debian/rules b/debian/rules
index 1d3ac0e..87f82fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ else
EGL_DISPLAYS += wayland
# Mir isn't built on AArch64 and PPC
- ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el))
+ ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el s390x))
EGL_DISPLAYS += mir
endif
