main/mesa: upgrade to 9.0

1 files changed, 26 insertions, 38 deletions

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 7485da2b36..4e4352c326 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=8.0.4
-pkgrel=2
+pkgver=9.0
+pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="all"
@@ -10,26 +10,23 @@ depends=
 subpackages="$pkgname-dev 
 	$pkgname-dri-ati:ati
 	$pkgname-dri-intel:intel
+	$pkgname-dri-nouveau:nouveau
 	$pkgname-dri-swrast:swrast
 	$pkgname-dri-vmwgfx:vmwgfx
-	$pkgname-glapi $pkgname-egl $pkgname-glu $pkgname-gl $pkgname-gles
+	$pkgname-dricore $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
 	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
 	"
-#	$pkgname-dri-nouveau:nouveau
 
 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 udev-dev
-	autoconf automake"
+	talloc-dev py-libxml2 flex bison llvm-dev udev-dev libvdpau-dev
+	libxvmc-dev
+	autoconf automake libtool"
 source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-	mesa-8.0.3-uclibc-strtod.patch
-	mesa-8.0.3-llvm-3.1-fixes.patch
-	mesa-7.10-uclibc-gallium.patch
-	imports-uclibc.patch
 	glx_ro_text_segm.patch
 	ccache.patch
-	parallel.patch
+	uclibc-debug.patch
 	"
 
 
@@ -53,19 +50,23 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	aclocal && automake --add-missing && autoreconf || return 1
+	libtoolize --force \
+		&& aclocal \
+		&& automake --add-missing \
+		&& autoreconf || return 1
 }
 
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure --prefix=/usr \
+		--sysconfdir=/etc \
 		--with-dri-driverdir=$_dri_driverdir \
 		--disable-asm \
 		--enable-pic \
 		--enable-glx-rts \
-		--with-gallium-drivers=r300,r600,svga,swrast \
-		--with-dri-drivers=i915,i965,r200,radeon,swrast \
+		--with-gallium-drivers=r300,r600,svga,swrast,nouveau \
+		--with-dri-drivers=i915,i965,r200,radeon,swrast,nouveau \
 		--enable-gallium-llvm \
 		--enable-gallium-egl \
 		--enable-shared-glapi \
@@ -79,17 +80,8 @@ build() {
 		--enable-egl \
 		--enable-texture-float \
 		--enable-xa \
-		--enable-shared-dricore \
 		|| return 1
 
-#		--with-driver=dri \
-#		--enable-egl \
-#		--enable-gles2 \
-#		--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast \
-#		--enable-gallium-llvm \
-#		--enable-gallium-egl \
-#		--enable-glx-rts \
-	make -C src/mesa depend || return 1
 	make || return 1
 	
 	# check so we dont have any bind NOW
@@ -100,6 +92,15 @@ build() {
 package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name '*.la' -delete
+}
+
+dricore() {
+	pkgdesc="Mesa dricore runtime libraries"
+	install -d "$subpkgdir"/usr/lib "$subpkgdir"/etc
+	mv "$pkgdir"/usr/lib/libdricore*.so.* \
+		"$subpkgdir"/usr/lib/
+	mv "$pkgdir"/etc/drirc "$subpkgdir"/etc/drirc
 }
 
 egl() {
@@ -116,18 +117,9 @@ gl() {
 	pkgdesc="Mesa libGL runtime libraries"
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libGL.so* \
-		"$pkgdir"/$_dri_driverdir/libglsl.so \
-		"$pkgdir"/$_dri_driverdir/libdricore.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/
-}
-
 glapi() {
 	replaces="$pkgname-gles"
 	pkgdesc="Mesa shared glapi"
@@ -182,11 +174,7 @@ nouveau() {	_mv_dri nouveau_dri nouveau_vieux_dri; }
 swrast() {	_mv_dri swrast_dri; }
 vmwgfx() {	_mv_dri vmwgfx_dri; }
 
-md5sums="d546f988adfdf986cff45b1efa2d8a46  MesaLib-8.0.4.tar.bz2
-13cc91257dac1311013f681705bcf3aa  mesa-8.0.3-uclibc-strtod.patch
-c452ed3392468170726c004c2f4e02ca  mesa-8.0.3-llvm-3.1-fixes.patch
-90a2ea438ff328443a0436a91a74d518  mesa-7.10-uclibc-gallium.patch
-bc2d3e144f7577be016b44b514d0b923  imports-uclibc.patch
+md5sums="60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
 a1a766b4c6a96d67cad9bd7ad5c578e8  glx_ro_text_segm.patch
 1f30bf8340114b455f005cc9b134c414  ccache.patch
-d6319aa729775249541550154ebf7d8f  parallel.patch"
+cff511b3d459189751c841b8f99e7112  uclibc-debug.patch"