From 4c6c9dfb49cb200646ac0765fe43d099777d0131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 19 Dec 2014 17:29:06 +0100
Subject: [PATCH] - fix build on s390(x) by moving the with_{nine,vaapi,vdpau}
 options under the with_hardware case

---
 mesa.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index 1775835..93e26a7 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -3,8 +3,6 @@
 %define with_wayland 0
 %else
 %define with_private_llvm 0
-%define with_vdpau 1
-%define with_vaapi 1
 %define with_wayland 1
 %endif
 
@@ -12,7 +10,6 @@
 # llvm (and thus llvmpipe) doesn't actually work on ppc32
 %ifnarch s390 ppc
 %define with_llvm 1
-%define with_nine 1
 %endif
 
 %define min_wayland_version 1.0
@@ -26,6 +23,9 @@
 %endif
 %ifnarch s390 s390x ppc
 %define with_hardware 1
+%define with_vdpau 1
+%define with_vaapi 1
+%define with_nine 1
 %define base_drivers swrast,nouveau,radeon,r200
 %ifarch %{ix86} x86_64
 %define platform_drivers ,i915,i965
@@ -52,7 +52,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 10.4.0
-Release: 3.%{git}%{?dist}
+Release: 4.%{git}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -704,6 +704,9 @@ rm -rf $RPM_BUILD_ROOT
 # Generate changelog using:
 # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
 %changelog
+* Fri Dec 19 2014 Dan Horák <dan[at]danny.cz> 10.4.0-4
+- fix build on s390(x) by moving the with_{nine,vaapi,vdpau} options under the with_hardware case
+
 * Thu Dec 18 2014 Adam Jackson <ajax@redhat.com> 10.4.0-3
 - Restore hardware drivers on ppc64{,le}