From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 5 Feb 2013 17:36:41 +0000 (+0100)
Subject: mesa: Update to 9.0.2.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=291f526bfb81f7019fbcdb665bf1193be856d8de;p=ipfire-3.x.git

mesa: Update to 9.0.2.

This is major update to the latest stable version.

Splitt mesa package into several subpackages.
There is no package called mesa anymore.
Keep mesa-devel for compatiblity reasons, which provides libGL-devel and contains
all development stuff of mesa.
---

diff --git a/mesa/mesa.nm b/mesa/mesa.nm
index e8ab26fd6..ab7125902 100644
--- a/mesa/mesa.nm
+++ b/mesa/mesa.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = mesa
-version    = 7.11.2
-release    = 2
+version    = 9.0.2
+release    = 1
 
 groups     = Development/Tools
 url        = http://www.mesa3d.org
@@ -21,6 +21,8 @@ sources    = MesaLib-%{version}.tar.bz2
 
 build
 	requires
+		autoconf
+		automake
 		bison
 		expat-devel
 		flex
@@ -31,9 +33,11 @@ build
 		libXext-devel
 		libXfixes-devel
 		libXxf86vm-devel
-		libdrm-devel
+		libdrm-devel >= 2.4.40
 		libselinux-devel
+		libtool
 		libxcb-devel
+		libxml2-devel
 		makedepend
 		xorg-x11-proto-devel
 	end
@@ -50,13 +54,10 @@ build
 		--enable-pic \
 		--enable-selinux \
 		--enable-pic \
-		--with-driver=dri \
+		--enable-dri \
 		--with-dri-drivers="nouveau,radeon,r200%{platform_drivers}" \
 		--with-gallium-drivers=swrast \
 		--disable-asm \
-		--disable-glw \
-		--disable-glu \
-		--disable-glut \
 		--disable-gallium-llvm \
 		--disable-gallium-egl \
 		--disable-egl \
@@ -66,11 +67,59 @@ build
 	prepare_cmds
 		# Defaults to dri (not xlib) for libGL on all arches.
 		sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac
+
+		# Regenerate build system.
+		autoreconf -vfi
 	end
 end
 
 packages
-	package %{name}
+	package dri-drivers
+		summary = Mesa-based DRI drivers.
+		description
+			This package contains the Mesa-based DRI drivers.
+		end
+
+		obsoletes
+			mesa <= 7.11.2-2
+		end
+
+		files
+			%{sysconfdir}/drirc
+			%{libdir}/libdri*.so.*
+			%{libdir}/dri/*
+		end
+	end
+
+	package libGL
+		summary = Mesa libGL runtime library.
+		description
+			This package contains the Mesa libGL runtime libraries.
+		end
+
+		obsoletes
+			mesa <= 7.11.2-2
+		end
+
+		files
+			%{libdir}/libGL.so.*
+		end
+	end
+
+	package libglapi
+		summary = Mesa shared glapi.
+		description
+			This package contains the shared glapi of Mesa.
+		end
+
+		obsoletes
+			mesa <= 7.11.2-2
+		end
+
+		files
+			%{libdir}/libglapi.so.*
+		end
+	end
 
 	package %{name}-devel
 		template DEVEL
diff --git a/mesa/patches/mesa-7.11-generic-wmb.patch b/mesa/patches/mesa-7.11-generic-wmb.patch
deleted file mode 100644
index 618d83632..000000000
--- a/mesa/patches/mesa-7.11-generic-wmb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h
---- Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx	2010-12-14 16:43:15.000000000 -0500
-+++ Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h	2011-09-09 11:47:56.454465358 -0400
-@@ -405,7 +405,7 @@ struct sis_context
- #elif defined(__ia64__)
- #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
- #else
--#error platform needs WMB
-+#define MMIO_WMB()	__sync_synchronize()
- #endif
- 
- #define mEndPrimitive()  \