[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 debian/changelog |   12 ++++++++++++
 debian/control   |    4 ++--
 debian/rules     |    4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 7b3c6798125b53d78b951657cfcbacab8ecaae17
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Wed Oct 16 12:22:48 2013 +0300

    import changes from archive

diff --git a/debian/changelog b/debian/changelog
index 253b2b6..7c466c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (9.2.1-1ubuntu3) saucy; urgency=low
+
+  * libegl1-mesa-dev: Don't depend on libmirclient-dev on AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 10 Oct 2013 16:25:10 +0200
+
+mesa (9.2.1-1ubuntu2) saucy; urgency=low
+
+  * Build without Mir backend on AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 09 Oct 2013 23:11:33 +0000
+
 mesa (9.2.1-1ubuntu1) saucy; urgency=low
 
   [ Robert Hooker ]
diff --git a/debian/control b/debian/control
index d8cfb1d..4e23fb8 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Build-Depends:
  llvm-3.3-dev (>= 1:3.3-4) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf powerpc],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.0.2) [linux-any],
- libmirclient-dev [!powerpc],
+ libmirclient-dev [!arm64 !powerpc],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
@@ -185,7 +185,7 @@ Depends:
  libxcb-glx0-dev,
  libxcb-dri2-0-dev,
  libx11-xcb-dev,
- libmirclient-dev [!powerpc],
+ libmirclient-dev [!arm64 !powerpc],
  ${misc:Depends},
 Description: free implementation of the EGL API -- development files
  This package contains the development environment required for compiling
diff --git a/debian/rules b/debian/rules
index 9a8046c..877871b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,8 @@ else
 # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
 	EGL_DISPLAYS += wayland
 
-# Mir isn't built on PPC
-    ifneq ($(DEB_HOST_ARCH), powerpc)
+# Mir isn't built on AArch64 and PPC
+    ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc))
 	EGL_DISPLAYS += mir
     endif
     ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))


Reply to: