From fd56f9108c267ccaec00363ae358181d8d01c983c94e07adc47fd26e71f6eef7 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 5 Apr 2017 12:32:09 +0000
Subject: [PATCH] Accepting request 485802 from
 home:a_faerber:branches:X11:XOrg

Enable Clover for s390x

OBS-URL: https://build.opensuse.org/request/show/485802
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=590
---
 Mesa.changes |  8 ++++++++
 Mesa.spec    | 12 ++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index cc681ac..321a7e7 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr  5 11:32:26 UTC 2017 - afaerber@suse.de
+
+- Prepare building OpenCL for non-x86 architectures, too
+* s390x can build it right away (swrast)
+* %arm aarch64 ppc64 ppc64le depend on LLVM amdgpu target for r600
+- Fix typo in specfile comment
+
 -------------------------------------------------------------------
 Sat Apr  1 15:59:08 UTC 2017 - mimi.vx@gmail.com
 
diff --git a/Mesa.spec b/Mesa.spec
index a545049..3344262 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -29,7 +29,7 @@
 %define _version 17.0.3
 %define with_opencl 0
 %define with_vulkan 0
-%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
+%ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
 %define gallium_loader 1
 %else
 %define gallium_loader 0
@@ -45,9 +45,13 @@
 %endif
 %ifarch %ix86 x86_64
 %define with_nine 1
+%endif
 %if 0%{gallium_loader} && 0%{?suse_version} >= 1330
 # llvm >= 3.9 not provided for <= 1330 
+%ifarch %ix86 x86_64 s390x
 %define with_opencl 1
+%endif
+%ifarch %ix86 x86_64
 %define with_vulkan 1
 %endif
 %endif
@@ -153,8 +157,12 @@ BuildRequires:  pkgconfig(libdrm_freedreno) >= 2.4.74
 %ifarch x86_64 %ix86
 BuildRequires:  libelf-devel
 BuildRequires:  pkgconfig(libdrm_intel) >= 2.4.61
+%else
+%if 0%{with_opencl}
+BuildRequires:  libelf-devel
 %endif
-# Requirments for wayland bumped up from 17.0
+%endif
+# Requirements for wayland bumped up from 17.0
 %if 0%{?suse_version} > 1320
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-server)