[mesa] Rebuild with new git snapshot

[Richard Hughes]

commit 43e76b84efc9c56618675b1141127ac5263c5740
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Apr 24 17:47:33 2012 +0100

    Rebuild with new git snapshot
    
    - Remove upstreamed patches

 .gitignore                                         |    1 +
 ...ix-null-dereference-processing-HiZ-buffer.patch |   52 ----
 mesa-7.10-llvmcore.patch                           |   12 -
 mesa-8.0.1-fix-16bpp.patch                         |   14 -
 mesa-8.0.1-git.patch                               |  265 --------------------
 mesa.spec                                          |   31 ++-
 sources                                            |    3 +-
 7 files changed, 21 insertions(+), 357 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d5484f..bd97dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ mesa-20100720.tar.bz2
 /MesaLib-8.0.tar.bz2
 /MesaLib-8.0.1.tar.bz2
 /MesaLib-8.0.2.tar.bz2
+/mesa-20120424.tar.xz
diff --git a/mesa-8.0.1-fix-16bpp.patch b/mesa-8.0.1-fix-16bpp.patch
index 4e3977b..0b8e68a 100644
--- a/mesa-8.0.1-fix-16bpp.patch
+++ b/mesa-8.0.1-fix-16bpp.patch
@@ -1,17 +1,3 @@
-diff -up Mesa-8.0.1/src/glx/drisw_glx.c.jx Mesa-8.0.1/src/glx/drisw_glx.c
---- Mesa-8.0.1/src/glx/drisw_glx.c.jx	2012-04-02 10:34:23.000000000 -0400
-+++ Mesa-8.0.1/src/glx/drisw_glx.c	2012-04-02 11:44:19.296407735 -0400
-@@ -274,7 +274,9 @@ swrastShmGetImage(__DRIdrawable *read, c
-     do {
- 	int i;
- 	char *src = ximage->data;
--	int dst_width = align(ximage->width * ximage->bits_per_pixel / 8, 256);
-+	int bytes_per_pixel = ((ximage->bits_per_pixel + 7) / 8);
-+	int dst_width = align(ximage->width * bytes_per_pixel,
-+			      64 * bytes_per_pixel);
- 
- 	for (i = 0; i < ximage->height; i++) {
- 	    memcpy(data, src, ximage->bytes_per_line);
 diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c
 --- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx	2012-02-14 18:44:00.000000000 -0500
 +++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c	2012-04-02 12:02:14.613964417 -0400
diff --git a/mesa.spec b/mesa.spec
index 5ba6bb3..6f41f68 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -20,28 +20,26 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
-#% define gitdate 20120126
+%define gitdate 20120424
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 8.0.2
-Release: 4%{?dist}
+Version: 8.1
+Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 
 #Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
-Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
-#Source0: %{name}-%{gitdate}.tar.xz
+#Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.xz
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
 #Patch7: mesa-7.1-link-shared.patch
-Patch8: mesa-7.10-llvmcore.patch
 Patch9: mesa-8.0-llvmpipe-shmget.patch
-Patch10: 0001-intel-fix-null-dereference-processing-HiZ-buffer.patch
 Patch11: mesa-8.0-nouveau-tfp-blacklist.patch
 Patch12: mesa-8.0.1-fix-16bpp.patch
 
@@ -271,12 +269,10 @@ Requires(postun): /sbin/ldconfig
 Mesa shared glapi
 
 %prep
-%setup -q -n Mesa-%{version}%{?snapshot} -b2
-#setup -q -n mesa-%{gitdate} -b2
+#% setup -q -n Mesa-%{version}%{?snapshot} -b2
+%setup -q -n mesa-%{gitdate} -b2
 #patch7 -p1 -b .dricore
-%patch8 -p1 -b .llvmcore
-%patch9 -p1 -b .shmget
-%patch10 -p1 -b .intel-hiz-fix
+#%patch9 -p1 -b .shmget
 %patch11 -p1 -b .nouveau
 %patch12 -p1 -b .16bpp
 
@@ -354,6 +350,10 @@ pushd $RPM_BUILD_ROOT%{_includedir}/GL
 rm -f [vw]*.h
 popd
 
+# remove .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/dri/*.la
+
 # man pages
 pushd ../%{manpages}
 make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
@@ -417,11 +417,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dri-drivers
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/drirc
 %if %{with_hardware}
 %{_libdir}/dri/radeon_dri.so
 %{_libdir}/dri/r200_dri.so
 %{_libdir}/dri/r300_dri.so
 %{_libdir}/dri/r600_dri.so
+%{_libdir}/dri/libdricore.so
+%{_libdir}/dri/libglsl.so
 %ifarch %{ix86} x86_64 ia64
 %{_libdir}/dri/i915_dri.so
 %ifnarch ia64
@@ -550,6 +553,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Apr 24 2012 Richard Hughes <rhughes at redhat.com> 8.0.3-0.1
+- Rebuild with new git snapshot
+- Remove upstreamed patches
+
 * Tue Apr 24 2012 Karsten Hopp <karsten at redhat.com> 8.0.2-4
 - disable llvm on PPC(64) in Fedora as recommended in bugzilla 769803
 
diff --git a/sources b/sources
index 8464215..6e7fe9c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-a368104e5700707048dc3e8691a9a7a1  MesaLib-8.0.2.tar.bz2
+a8e677338c53a4fcb0fc5fcf52ed5d40  mesa-20120424.tar.xz