debian/changelog | 19 +++++++++++++++++++ debian/control | 4 ++-- debian/libegl1-mesa.symbols | 2 +- debian/rules | 4 ++++ 4 files changed, 26 insertions(+), 3 deletions(-)
New commits: commit 3afc5a25ea0c28462c1e7258159deafcc9cd1e3b Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Tue Aug 13 16:24:41 2013 +0200 Import missing powerpc build fixes. Hide the now missing Mir symbol on powerpc. rules,control: Don't build Mir support on powerpc as it's not available there. diff --git a/debian/changelog b/debian/changelog index 8461471..65bf96f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (9.1.6-2ubuntu2) saucy; urgency=low + + * Import missing powerpc build fixes. + + -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 13 Aug 2013 16:23:32 +0200 + mesa (9.1.6-2ubuntu1) saucy; urgency=low * New upstream release. @@ -28,6 +34,19 @@ mesa (9.1.6-1) unstable; urgency=low -- Julien Cristau <jcris...@debian.org> Sun, 11 Aug 2013 18:15:58 +0200 +mesa (9.1.4-0ubuntu8) saucy; urgency=low + + * hide the now missing Mir symbol on powerpc. + + -- Didier Roche <didro...@ubuntu.com> Mon, 05 Aug 2013 13:43:52 +0200 + +mesa (9.1.4-0ubuntu7) saucy; urgency=low + + * rules,control: Don't build Mir support on powerpc as it's not available + there. + + -- Didier Roche <didro...@ubuntu.com> Mon, 05 Aug 2013 12:59:59 +0200 + mesa (9.1.4-0ubuntu6) saucy; urgency=low * Add Mir EGL platform diff --git a/debian/control b/debian/control index d514a15..58548c7 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Build-Depends: bison, llvm-3.2-dev (>= 1:3.2repack-7~) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf powerpc], libwayland-dev (>= 1.0.2) [linux-any], - libmirclient-dev [linux-any], + libmirclient-dev [!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/ @@ -184,7 +184,7 @@ Depends: libxcb-glx0-dev, libxcb-dri2-0-dev, libx11-xcb-dev, - libmirclient-dev [linux-any], + libmirclient-dev [!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/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols index 3af6509..6bcb9f1 100644 --- a/debian/libegl1-mesa.symbols +++ b/debian/libegl1-mesa.symbols @@ -9,7 +9,7 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11 (arch=linux-any)dri2_get_device_name_for_fd@Base 8.1~0 (arch=linux-any)dri2_get_driver_for_fd@Base 8.1~0 (arch=linux-any)dri2_initialize_drm@Base 8.1~0 - (arch=linux-any)dri2_initialize_mir@Base 9.1.4-0ubuntu6~ + (arch=!powerpc)dri2_initialize_mir@Base 9.1.4-0ubuntu6~ (arch=linux-any)dri2_initialize_wayland@Base 8.1~0 dri2_initialize_x11@Base 8.1~0 dri2_load_driver@Base 8.1~0 diff --git a/debian/rules b/debian/rules index c1bc7fc..1ba8ee1 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,11 @@ else EGL_DISPLAYS += drm # 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) EGL_DISPLAYS += mir + endif ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x)) DRI_DRIVERS += r200 radeon nouveau endif -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1v9fxf-00016u...@vasks.debian.org