From 9f5b38cbd42063eda24d6f3c04b8aee705fa5621768433eab416bf3fb4e8c337 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 2 Sep 2013 08:52:42 +0000
Subject: [PATCH] Accepting request 196973 from home:namtrac:bugfix

- Enable llvmpipe and xa on s390x

OBS-URL: https://build.opensuse.org/request/show/196973
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=314
---
 Mesa.changes |  5 +++++
 Mesa.spec    | 30 +++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index 6e0febd..734d8c8 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 30 09:10:22 UTC 2013 - idonmez@suse.com
+
+- Enable llvmpipe and xa on s390x 
+
 -------------------------------------------------------------------
 Tue Aug 27 23:56:19 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/Mesa.spec b/Mesa.spec
index feceb7a..eaa65af 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -72,7 +72,7 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(zlib)
-%ifarch %arm %ix86 x86_64
+%ifarch %arm s390x %ix86 x86_64
 BuildRequires:  llvm-devel
 %endif
 BuildRequires:  libXvMC-devel
@@ -594,9 +594,15 @@ autoreconf -fi
            --with-dri-drivers=nouveau,r200,radeon \
            --with-gallium-drivers=r300,r600,nouveau,swrast \
 %endif
-%ifarch s390 s390x aarch64
+%ifarch s390 aarch64
            --with-dri-drivers=swrast \
            --with-gallium-drivers="" \
+%endif
+%ifarch s390x
+        --enable-xa \
+        --enable-gallium-llvm \
+        --with-dri-drivers=swrast \
+        --with-gallium-drivers=swrast,svga \
 %endif
            CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 make %{?_smp_mflags}
@@ -678,7 +684,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
 
 %postun -n libgbm1 -p /sbin/ldconfig
 
-%ifnarch s390 s390x aarch64
+%ifnarch s390 aarch64
 
 %post   -n libxatracker1 -p /sbin/ldconfig
 
@@ -832,7 +838,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
 %_libdir/libgbm.so
 %_libdir/pkgconfig/gbm.pc
 
-%ifnarch s390 s390x ppc ppc64 aarch64
+%ifnarch s390 ppc ppc64 aarch64
 
 %files -n libxatracker1
 %defattr(-,root,root)
@@ -878,24 +884,26 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
 %_libdir/vdpau/libvdpau_r600.so.1
 %_libdir/vdpau/libvdpau_r600.so.1.0.0
 
-%files -n libXvMC_softpipe
-%defattr(-,root,root)
-%_libdir/libXvMCsoftpipe.so
-%_libdir/libXvMCsoftpipe.so.1
-%_libdir/libXvMCsoftpipe.so.1.0.0
-
 %files -n libvdpau_nouveau
 %defattr(-,root,root)
 %_libdir/vdpau/libvdpau_nouveau.so
 %_libdir/vdpau/libvdpau_nouveau.so.1
 %_libdir/vdpau/libvdpau_nouveau.so.1.0.0
 
+%endif
+
+%ifnarch s390 aarch64
+%files -n libXvMC_softpipe
+%defattr(-,root,root)
+%_libdir/libXvMCsoftpipe.so
+%_libdir/libXvMCsoftpipe.so.1
+%_libdir/libXvMCsoftpipe.so.1.0.0
+
 %files -n libvdpau_softpipe
 %defattr(-,root,root)
 %_libdir/vdpau/libvdpau_softpipe.so
 %_libdir/vdpau/libvdpau_softpipe.so.1
 %_libdir/vdpau/libvdpau_softpipe.so.1.0.0
-
 %endif
 
 %if %llvm_r600