main/mesa: upgrade to 7.11

1 files changed, 39 insertions, 20 deletions

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 40cbe65f7e..8bb47f286a 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=7.10.3
+pkgver=7.11
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
@@ -18,21 +18,21 @@ subpackages="$pkgname-dev
 	$pkgname-dri-tdfx:tdfx
 	$pkgname-dri-unichrome:unichrome
 	$pkgname-dri-nouveau:nouveau
-	$pkgname-egl
+	$pkgname-dri-vmwgfx:vmwgfx
+	$pkgname-egl $pkgname-glu $pkgname-gl $pkgname-gles
 	"
 
-makedepends="pkgconfig libdrm-dev libxxf86vm-dev libxdamage-dev expat-dev
-	dri2proto xextproto libx11-dev glproto python libxt-dev makedepend
-	talloc-dev py-libxml2 flex bison"
+depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
+	libxdamage-dev libxfixes-dev libxcb-dev glproto"
+makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend
+	talloc-dev py-libxml2 flex bison llvm-dev"
 source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
 	mesa-7.10-uclibc.patch
 	mesa-7.10-uclibc-glsl.patch
 	mesa-7.10-uclibc-gallium.patch
-	Mesa-7.10.1-nouveau-compile.patch
 	"
+#	Mesa-7.10.1-nouveau-compile.patch
 
-depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
-	libxdamage-dev libxfixes-dev libxcb-dev glproto"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
 
@@ -58,7 +58,7 @@ prepare() {
 
 dev() {
 	default_dev;
-	depends="$depends_dev mesa mesa-egl"
+	depends="$depends_dev mesa mesa-egl mesa-gl mesa-glu mesa-gles"
 }
 
 build() {
@@ -69,12 +69,10 @@ build() {
 		--disable-asm \
 		--disable-glx-tls \
 		--with-driver=dri \
-		--with-state-trackers=dri,glx,egl \
 		--enable-xcb \
 		--enable-egl \
 		--enable-gles2 \
-		--enable-gallium-nouveau \
-		--enable-gallium-swrast \
+		--with-gallium-drivers=i915,i965,nouveau,r300,r600,svga,swrast \
 		--disable-gallium-egl \
 		--disable-glut \
 		--disable-glw || return 1
@@ -93,11 +91,32 @@ package() {
 
 egl() {
 	replaces="mesa"
-	pkgdesc="Mesa OpenGLES support library and modules"
-
+	pkgdesc="Mesa libEGL runtime libraries"
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/egl "$subpkgdir"/usr/lib/egl
+}
+
+gl() {
+	replaces="mesa"
+	pkgdesc="Mesa libGL runtime libraries"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/
+}
+
+glu() {
+	replaces="mesa"
+	pkgdesc="Mesa libGLU runtime libraries"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libGLU.so* "$subpkgdir"/usr/lib/
+}
+
+gles() {
+	replaces="mesa"
+	pkgdesc="Mesa libGLESv2 runtime libraries"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libGLESv2.so* \
+		"$pkgdir"/usr/lib/libglapi.so.* \
+		"$subpkgdir"/usr/lib/
 }
 
 _mv_dri() {
@@ -120,11 +139,11 @@ savage() {	_mv_dri savage_dri; }
 sis() {		_mv_dri sis_dri; }
 tdfx() {	_mv_dri tdfx_dri; }
 unichrome() {	_mv_dri unichrome_dri; }
-nouveau() {	_mv_dri nouveau_dri; }
-swrast() {	_mv_dri swrast_dri; }
+nouveau() {	_mv_dri nouveau_dri nouveau_vieux_dri; }
+swrast() {	_mv_dri swrast_dri swrastg_dri; }
+vmwgfx() {	_mv_dri vmwgfx_dri; }
 
-md5sums="8c38fe8266be8e1ed1d84076ba5a703b  MesaLib-7.10.3.tar.bz2
+md5sums="ff03aca82d0560009a076a87c888cf13  MesaLib-7.11.tar.bz2
 9c8c161f954f0d08895cd9d45e63f498  mesa-7.10-uclibc.patch
 03e9685b0d714e915c35fd0fb5fde810  mesa-7.10-uclibc-glsl.patch
-90a2ea438ff328443a0436a91a74d518  mesa-7.10-uclibc-gallium.patch
-34e3d4bb5f16bae55929958083087c0a  Mesa-7.10.1-nouveau-compile.patch"
+90a2ea438ff328443a0436a91a74d518  mesa-7.10-uclibc-gallium.patch"