From 2a76c69a392461ba7220d545ed92b438fc844548ebd87e44e607b367d2c66694 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 12 May 2014 13:08:48 +0000
Subject: [PATCH] Accepting request 233580 from home:Andreas_Schwab:Factory

- no shared llvm libs on ppc64
- vdpau no longer enabled by default
- xa or gallium-gbm implies gallium-loader

OBS-URL: https://build.opensuse.org/request/show/233580
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=374
---
 Mesa.changes |  7 +++++++
 Mesa.spec    | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index 6c0a37f..27bc0bf 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 12 09:32:19 UTC 2014 - schwab@suse.de
+
+- no shared llvm libs on ppc64
+- vdpau no longer enabled by default
+- xa or gallium-gbm implies gallium-loader
+
 -------------------------------------------------------------------
 Sat May 10 14:00:50 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/Mesa.spec b/Mesa.spec
index aed1e85..806a716 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -18,12 +18,20 @@
 
 %define glamor 1
 # --enable-gallium-egl requires non-empty --with-gallium-drivers (default
-# is r300,r600,svga,swrast, which also enables VDPAU support for r600)
+# is r300,r600,svga,swrast)
 %ifnarch s390 s390x aarch64 m68k
 %define egl_gallium 1
-%define vdpau_r600 1
 %else
 %define egl_gallium 0
+%endif
+%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
+%define gallium_loader 1
+%else
+%define gallium_loader 0
+%endif
+%ifarch %ix86 x86_64 %arm ppc64
+%define vdpau_r600 1
+%else
 %define vdpau_r600 0
 %endif
 %ifarch %ix86 x86_64
@@ -36,7 +44,7 @@
 %else
 %define xvmc_support 0
 %endif
-%ifarch %ix86 x86_64 %arm ppc64 ia64 ppc %sparc hppa
+%ifarch %ix86 x86_64 %arm ppc64
 %define vdpau_nouveau 1
 %else
 %define vdpau_nouveau 0
@@ -553,6 +561,9 @@ autoreconf -fi
 %ifarch %arm ppc64
            --enable-xa \
            --enable-gallium-llvm \
+%ifarch ppc64
+           --disable-llvm-shared-libs \
+%endif
            --with-dri-drivers=nouveau \
 %ifarch %arm
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga,freedreno \
@@ -665,6 +676,8 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %if %egl_gallium
 %dir %_libdir/egl/
 %_libdir/egl/egl_gallium.so
+%endif
+%if %gallium_loader
 %dir %_libdir/gallium-pipe/
 %_libdir/gallium-pipe/pipe_*.so
 %endif