From 123a9643667bcb1fc7fb5a3873f6ee24dbd1c07ec7c5f60f047575cb87ebc75a Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 1 Jan 2017 20:21:51 +0000
Subject: [PATCH] Accepting request 446378 from
 home:dirkmueller:branches:X11:XOrg

- clean up configuration settings to be uniform accross all
  architectures except for list of dri and gallium drivers

OBS-URL: https://build.opensuse.org/request/show/446378
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=559
---
 Mesa.changes |  6 ++++++
 Mesa.spec    | 46 ++++++++++++++++------------------------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index abc32d6..bdf01f3 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 15 07:39:30 UTC 2016 - dmueller@suse.com
+
+- clean up configuration settings to be uniform accross all
+  architectures except for list of dri and gallium drivers
+
 -------------------------------------------------------------------
 Mon Dec 12 14:22:12 UTC 2016 - mstaudt@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 7d17032..c01ddf0 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -454,8 +454,8 @@ implementation of Mesa.
 %if 0%{?with_nine}
 %package libd3d
 Summary:        Mesa Direct3D9 state tracker
-Group:          System/Libraries
 # Manually provide d3d library (bnc#918294)
+Group:          System/Libraries
 %ifarch x86_64 s390x ppc64le aarch64
 Provides:       d3dadapter9.so.1()(64bit)
 %else
@@ -637,53 +637,39 @@ autoreconf -fvi
            --enable-gbm \
            --enable-glx-tls \
 %endif
+%if 0%{with_opencl}
+           --enable-opencl \
+           --enable-opencl-icd \
+%endif
 %if 0%{?suse_version} < 1315
            --with-dri-searchpath=%{_libdir}/dri/updates:%{_libdir}/dri \
 %else
            --with-dri-searchpath=%{_libdir}/dri \
 %endif
-%ifarch %ix86 x86_64
            --enable-xa \
            --enable-gallium-llvm \
-           --with-dri-drivers=i915,i965,nouveau,r200,radeon \
-%if 0%{with_vulkan}
-           --with-vulkan-drivers=intel \
-%endif
-%if 0%{with_opencl}
-           --enable-opencl \
-           --enable-opencl-icd \
-%endif
            --enable-llvm-shared-libs \
-           --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
            --enable-vdpau \
            --enable-va \
            --enable-xvmc \
+%if 0%{with_vulkan}
+           --with-vulkan-drivers=intel \
+%endif
+%ifarch %ix86 x86_64
+           --with-dri-drivers=i915,i965,nouveau,r200,radeon \
+           --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
 %endif
-%ifarch aarch64 %arm ppc64 ppc64le
-           --enable-xa \
-           --enable-gallium-llvm \
-           --with-dri-drivers=nouveau \
 %ifarch %arm aarch64
+           --with-dri-drivers=nouveau \
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga,freedreno,vc4 \
-%else
+%endif
+%ifarch ppc64 ppc64le
+           --with-dri-drivers=nouveau \
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga \
 %endif
-           --enable-vdpau \
-           --enable-xvmc \
-%endif
-%ifarch ia64 ppc hppa
-           --with-dri-drivers=nouveau,r200,radeon \
-           --with-gallium-drivers=r300,r600,nouveau,swrast \
-%endif
-%ifarch s390
+%ifarch ia64 ppc hppa s390 s390x
            --with-dri-drivers=swrast \
            --with-gallium-drivers=swrast \
-%endif
-%ifarch s390x
-        --enable-xa \
-        --enable-gallium-llvm \
-        --with-dri-drivers=swrast \
-        --with-gallium-drivers=swrast,svga \
 %endif
         CFLAGS="%{optflags} -DNDEBUG"
 make %{?_smp_mflags}