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

New commits:
commit cb554196b304ced0fb9e1d285befc6eee69dd553
Author: Timo Aaltonen <tjaal...@debian.org>
Date:   Tue Aug 15 15:11:37 2017 +0300

    rules: Improve readability.

diff --git a/debian/changelog b/debian/changelog
index 0681bcf..b055c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (17.2.0~rc4-2) UNRELEASED; urgency=medium
 
   * rules: Build gallium/svga only on x86.
+  * rules: Improve readability.
 
  -- Timo Aaltonen <tjaal...@debian.org>  Tue, 15 Aug 2017 15:02:04 +0300
 
diff --git a/debian/rules b/debian/rules
index c0c5deb..328772e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,11 +63,12 @@ else
                VULKAN_DRIVERS += intel
        endif
 
-# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
+       # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready 
yet:
        EGL_PLATFORMS += wayland
-    ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
-       DRI_DRIVERS += nouveau
-    endif
+
+       ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
+               DRI_DRIVERS += nouveau
+       endif
   endif
 
        EGL_PLATFORMS += drm
@@ -78,8 +79,8 @@ else
   endif
 
   ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
-    DRI_DRIVERS += r200 radeon
-    GALLIUM_DRIVERS += r600 r300
+       DRI_DRIVERS += r200 radeon
+       GALLIUM_DRIVERS += r600 r300
   endif
 
   # LLVM is required for building r300g, radeonsi and llvmpipe drivers.

commit d1897fbda7f9c99401daf310e97243f465b91075
Author: Timo Aaltonen <tjaal...@debian.org>
Date:   Tue Aug 15 15:02:15 2017 +0300

    rules: Build gallium/svga only on x86.

diff --git a/debian/changelog b/debian/changelog
index 4d9b97b..0681bcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.2.0~rc4-2) UNRELEASED; urgency=medium
+
+  * rules: Build gallium/svga only on x86.
+
+ -- Timo Aaltonen <tjaal...@debian.org>  Tue, 15 Aug 2017 15:02:04 +0300
+
 mesa (17.2.0~rc4-1) experimental; urgency=medium
 
   * Migrate mesa to build against libglvnd:
diff --git a/debian/rules b/debian/rules
index f113970..c0c5deb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ else
   ifeq ($(DEB_HOST_ARCH_OS), linux)
        confflags_DRI3 = --enable-dri3
        # Gallium drivers which require kernel support, not yet ported to 
non-Linux
-       GALLIUM_DRIVERS += nouveau svga virgl
+       GALLIUM_DRIVERS += nouveau virgl
 
        # Freedreno requires arm in addition
        ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
@@ -56,17 +56,18 @@ else
                GALLIUM_DRIVERS += etnaviv imx
        endif
 
-       # svga needs xa state tracker
-       confflags_GALLIUM += --enable-xa
+       ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
+               GALLIUM_DRIVERS += svga
+               # svga needs xa state tracker
+               confflags_GALLIUM += --enable-xa
+               VULKAN_DRIVERS += intel
+       endif
 
 # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
        EGL_PLATFORMS += wayland
     ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
        DRI_DRIVERS += nouveau
     endif
-    ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
-       VULKAN_DRIVERS += intel
-    endif
   endif
 
        EGL_PLATFORMS += drm

Reply via email to