From 2cfd8f52ffa1220ef5ff40423ba132618b262524 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 24 Aug 2010 18:44:36 +1000
Subject: [PATCH] - latest git snapshot - enable talloc/llvm links

---
 .gitignore |  1 +
 mesa.spec  | 13 +++++++++++--
 sources    |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2cb3cdc..ee3a54e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ mesa-20100529.tar.bz2
 mesa-20100612.tar.bz2
 mesa-20100709.tar.bz2
 mesa-20100720.tar.bz2
+/mesa-20100824.tar.bz2
diff --git a/mesa.spec b/mesa.spec
index 6323e55..65393ca 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,7 +13,7 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.3
-%define gitdate 20100720
+%define gitdate 20100824
 %define demosgitdate 20100529
 #% define snapshot 
 
@@ -23,7 +23,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.9
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -71,7 +71,9 @@ BuildRequires: libXmu-devel
 BuildRequires: glew-devel
 BuildRequires: elfutils
 BuildRequires: python
+BuildRequires: llvm-devel
 BuildRequires: libxml2-python
+BuildRequires: libtalloc-devel
 
 %description
 Mesa
@@ -84,6 +86,7 @@ Requires(postun): /sbin/ldconfig
 Provides: libGL
 Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
 Requires: libdrm >= 2.4.21-1
+Requires: libtalloc
 %if %{with_hardware}
 Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 %endif
@@ -95,6 +98,7 @@ Mesa libGL runtime library.
 %package dri-drivers
 Summary: Mesa-based DRI drivers
 Group: User Interface/X Hardware Support
+Requires: llvm
 %description dri-drivers
 Mesa-based DRI drivers.
 
@@ -150,6 +154,7 @@ Requires(postun): /sbin/ldconfig
 Provides: libOSMesa
 
 %description libOSMesa
+Requires: libtalloc
 Mesa offscreen rendering libraries
 
 
@@ -252,6 +257,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
     --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
     --with-state-trackers=dri,glx \
+    --enable-gallium-llvm \
 %if %{with_hardware}
     --disable-gallium-intel \
     --disable-gallium-svga \
@@ -429,6 +435,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Tue Aug 24 2010 Dave Airlie <airlied@redhat.com> 7.9-0.7
+- latest git snapshot - enable talloc/llvm links
+
 * Tue Jul 20 2010 Dave Airlie <airlied@redhat.com> 7.9-0.6
 - snapshot latest git
 
diff --git a/sources b/sources
index 706de97..d0941c6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 cb304d1ce562ac48b68eedeba38c662f  xdriinfo-1.0.3.tar.bz2
 b4d32564ccc411bbfcfe657f42d3632d  mesa-demos-20100529.tar.bz2
-339f8241ef63673469fcbb05de10ed84  mesa-20100720.tar.bz2
+e702218307263d51ae151ef2391bb91b  mesa-20100824.tar.bz2