mesa: Changes to 'ubuntu'
debian/changelog | 10 ++++++++--
debian/control | 2 +-
debian/rules | 6 +++---
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit ea4dba6874a46727479a9e8778424b9c0695a875
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Dec 9 11:11:51 2013 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index c26639b..66e6981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (10.0.0-0ubuntu1) UNRELEASED; urgency=low
+mesa (10.0.0-0ubuntu1) trusty; urgency=low
* Merge from unreleased debian-experimental.
* Drop upstreamed aarch64 patch.
* Refresh patches.
* Disable 118-dricore-gallium.patch for now, requires porting.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 25 Nov 2013 15:40:34 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 11:11:41 +0100
mesa (10.0.0-1) UNRELEASED; urgency=low
commit ab124e72500c14baa93406cbd1db5d1cba815fcb
Author: Matthias Klose <doko@ubuntu.com>
Date: Sat Dec 7 14:42:44 2013 +0100
Build without Mir backend on ppc64.
diff --git a/debian/changelog b/debian/changelog
index 1d1fdca..c26639b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,12 @@ mesa (10.0.0-1) UNRELEASED; urgency=low
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 27 Oct 2013 20:49:30 +0100
+mesa (9.2.2-1ubuntu2) trusty; urgency=medium
+
+ * Build without Mir backend on ppc64.
+
+ -- Matthias Klose <doko@ubuntu.com> Sat, 07 Dec 2013 14:42:44 +0100
+
mesa (9.2.2-1ubuntu1) trusty; urgency=low
* Merge from released debian-unstable.
diff --git a/debian/control b/debian/control
index 9ebfb75..64dab19 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 [!arm64 !powerpc],
+ libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
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/
diff --git a/debian/rules b/debian/rules
index 71b966d..54e9332 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ else
EGL_DISPLAYS += wayland
# Mir isn't built on AArch64 and PPC
- ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc))
+ ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el))
EGL_DISPLAYS += mir
endif
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
@@ -105,7 +105,7 @@ else
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GLES = --enable-gles1 --enable-gles2
- ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
+ ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64 ppc64el))
confflags_GALLIUM += --disable-shared-gallium --with-gallium-drivers=""
confflags_OPENVG = --disable-openvg --disable-gallium-egl
EXTRA_SED += -e 's/^@nogbm@/\#/' -e 's/^@noegl@/\#/'
@@ -274,7 +274,7 @@ binary-arch: install
# Resolve EGL/GLES/OpenVG symbols in the private library path.
# Because there's no packaging problem so onerous that accomodating
# proprietary alternatives can't make more difficult…
-ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64 ppc64el))
set -e ; for PACKAGE in \
libegl1-mesa libgles1-mesa libgles2-mesa ; do \
dh_makeshlibs -p$$PACKAGE -- -c4 \
Reply to: