From b4ef8dc9c0eb89c06bfd33e5c40906b36b3d3797 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Thu, 10 May 2012 16:23:44 +0200
Subject: [PATCH] revert disabling of hardware drivers, disable only llvm on
 PPC* (#819060)

---
 mesa.spec | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index c7554f5..fa51708 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -1,8 +1,16 @@
-# S390/PPC doesn't have video cards, but we need swrast for xserver's GLX
-%ifarch s390 s390x ppc ppc64
+%if 0%{?rhel}
+%define rhel_no_hw_arches ppc ppc64 ppc64p7
+%endif
+
+# S390 doesn't have video cards, but we need swrast for xserver's GLX
+%ifarch s390 s390x  %{?rhel_no_hw_arches}
 %define with_hardware 0
 %define dri_drivers --with-dri-drivers=swrast
 %else
+# llvm has some serious issues on PPC*, disable usage
+%ifnarch ppc ppc64 ppc64p7
+%define with_llvm 1
+%endif
 %define with_hardware 1
 %define base_drivers nouveau,radeon,r200
 %ifarch %{ix86}
@@ -28,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 8.1
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -64,8 +72,10 @@ BuildRequires: libXmu-devel
 BuildRequires: elfutils
 BuildRequires: python
 %if %{with_hardware}
+%if 0%{?with_llvm}
 BuildRequires: llvm-devel >= 3.0
 %endif
+%endif
 BuildRequires: libxml2-python
 BuildRequires: libudev-devel
 BuildRequires: libtalloc-devel
@@ -313,7 +323,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     --enable-gbm \
 %if %{with_hardware}
     --with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
+    %{?with_llvm:--enable-gallium-llvm} \
     %{?with_vmware:--enable-xa} \
 %else
     --disable-gallium-llvm \
@@ -562,6 +572,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu May 10 2012 Karsten Hopp <karsten@redhat.com> 8.1-0.4
+- revert disabling of hardware drivers, disable only llvm on PPC*
+  (#819060)
+
 * Tue May 01 2012 Adam Jackson <ajax@redhat.com> 8.1-0.3
 - More RHEL tweaking: no pre-DX7 drivers, no wayland.