debian/changelog |    7 +++++++
 debian/rules     |   12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 9453ec7de218200923623dcda0ecf9b06088c159
Author: Julien Cristau <jcris...@debian.org>
Date:   Sat Feb 11 11:49:51 2012 +0100

    Only build the radeon, r200, i915 and i965 dri drivers on Linux.
    
    They require KMS.

diff --git a/debian/changelog b/debian/changelog
index 42c3ec0..0845b9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (8.0-2) UNRELEASED; urgency=low
+
+  * Only build the radeon, r200, i915 and i965 dri drivers on Linux.  They
+    require KMS.
+
+ -- Julien Cristau <jcris...@debian.org>  Sat, 11 Feb 2012 11:49:06 +0100
+
 mesa (8.0-1) experimental; urgency=low
 
   [ Cyril Brulebois ]
diff --git a/debian/rules b/debian/rules
index 952d726..f50a43b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,20 +81,20 @@ else
 # Although the KMS egl drivers will probably build on kfreebsd & hurd
 # only linux actually has KMS drivers implemented at this point.
        EGL_DISPLAYS += drm
-# Nouveau requires KMS, so even the classic DRI driver only works on linux
-       DRI_DRIVERS += nouveau
+    ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
+       DRI_DRIVERS += r200 radeon nouveau
+    endif
+    ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
+       DRI_DRIVERS += i915 i965
+    endif
   endif
 
-  ifneq ($(DEB_HOST_ARCH), s390)
-       DRI_DRIVERS += r200 radeon
-  endif
 
 # 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
 
   # LLVM is required for r300g and recommended for swrastg on x86:


-- 
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/e1rwaxx-00039y...@vasks.debian.org

Reply via email to