[mesa] Today's git snapshot Disable hardware drivers on ppc* in RHEL
Adam Jackson
ajax at fedoraproject.org
Wed Dec 14 18:14:28 UTC 2011
commit 45f1c9cd923209fc1c8798f2bae1c6822f3be24f
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Dec 14 13:14:28 2011 -0500
Today's git snapshot
Disable hardware drivers on ppc* in RHEL
.gitignore | 1 +
mesa.spec | 16 +++++++++++++---
sources | 3 +--
3 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff681bc..1d1ef98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ mesa-20100720.tar.bz2
/mesa-20111103.tar.xz
/mesa-20111114.tar.xz
/mesa-20111129.tar.xz
+/mesa-20111214.tar.xz
diff --git a/mesa.spec b/mesa.spec
index 1f4d9cd..c65462a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -1,5 +1,9 @@
+%if 0%{?rhel}
+%define rhel_no_hw_arches ppc ppc64
+%endif
+
# S390 doesn't have video cards, but we need swrast for xserver's GLX
-%ifarch s390 s390x
+%ifarch s390 s390x %{?rhel_no_hw_arches}
%define with_hardware 0
%define dri_drivers --with-dri-drivers=swrast
%else
@@ -20,13 +24,13 @@
%define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1
-%define gitdate 20111129
+%define gitdate 20111214
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
Version: 7.12
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -59,7 +63,9 @@ BuildRequires: libXi-devel
BuildRequires: libXmu-devel
BuildRequires: elfutils
BuildRequires: python
+%if %{with_hardware}
BuildRequires: llvm-devel >= 3.0
+%endif
BuildRequires: libxml2-python
BuildRequires: libudev-devel
BuildRequires: libtalloc-devel
@@ -414,6 +420,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc
%changelog
+* Wed Dec 14 2011 Adam Jackson <ajax at redhat.com> 7.12-0.6
+- Today's git snapshot
+- Disable hardware drivers on ppc* in RHEL
+
* Fri Dec 02 2011 Dan HorĂ¡k <dan[at]danny.cz> 7.12-0.5
- fix build on s390(x)
diff --git a/sources b/sources
index c4c8c21..64a05ec 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-fdf17b0823514116454371e4967d62ab mesa-20111114.tar.xz
-b57f38f88ba615abf9a2049ce5b20e6e mesa-20111129.tar.xz
+7dd221f4edf3c1836d135b8c14ed4995 mesa-20111214.tar.xz
More information about the scm-commits
mailing list