debian/changelog | 2 ++ debian/rules | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-)
New commits: commit 430ecac2aa9e7d81791040ba1849f706826839bb Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Thu Feb 2 10:35:36 2012 +0200 Build llvmpipe swrast only on non-hurd x86, traditional for the rest. diff --git a/debian/changelog b/debian/changelog index b84924f..fe6e144 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low * libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols. * rules: Drop obsolete configure options. * Enable vmwgfx gallium driver & xatracker. (Closes: #652501). + * Build llvmpipe swrast only on non-hurd x86, traditional for the + rest. [ Robert Hooker ] * Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and diff --git a/debian/rules b/debian/rules index c097b9c..2df88ec 100755 --- a/debian/rules +++ b/debian/rules @@ -63,16 +63,17 @@ confflags-common = \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" -DRI_DRIVERS = swrast +DRI_DRIVERS = +GALLIUM_DRIVERS = # hurd doesn't do direct rendering ifeq ($(DEB_HOST_ARCH_OS), hurd) confflags_DIRECT_RENDERING = --disable-driglx-direct confflags_EGL = --disable-egl confflags_GALLIUM = --with-gallium-drivers= + DRI_DRIVERS += swrast else EGL_DISPLAYS = x11 - GALLIUM_DRIVERS = swrast ifeq ($(DEB_HOST_ARCH_OS), linux) # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux @@ -87,9 +88,12 @@ else ifneq ($(DEB_HOST_ARCH), s390) DRI_DRIVERS += r200 radeon endif - ifeq ($(DEB_HOST_ARCH_CPU), i386) - DRI_DRIVERS += i915 i965 - else ifeq ($(DEB_HOST_ARCH_CPU), amd64) + +# Build the llvmpipe driver only on amd64, i386 until it's tested elsewhere + ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386)) + DRI_DRIVERS += swrast + else + GALLIUM_DRIVERS += swrast DRI_DRIVERS += i915 i965 endif @@ -297,6 +301,11 @@ endif ifneq (,$(filter r300,$(GALLIUM_DRIVERS))) dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri endif +# If the llvmpipe driver was built, copy it to the package dir +ifneq (,$(filter swrast,$(GALLIUM_DRIVERS))) + dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so \ + usr/lib/${DEB_HOST_MULTIARCH}/dri +endif dh_installman -s dh_lintian -s dh_link -s -- 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/e1rssfn-0000lh...@vasks.debian.org