[arch-commits] Commit in mesa/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Friday, March 9, 2012 @ 15:42:21
  Author: andyrtr
Revision: 152844

upgpkg: mesa 8.0.1-2

fix osmesa fileconflicts; add xa tracker; add vmware svga GL driver FS#28485

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-09 20:37:25 UTC (rev 152843)
+++ PKGBUILD	2012-03-09 20:42:21 UTC (rev 152844)
@@ -3,7 +3,7 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri')
+pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
 
 #_git=true
 _gitdate=20111031
@@ -15,7 +15,7 @@
   else
     pkgver=8.0.1
 fi
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
@@ -42,7 +42,7 @@
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
     --enable-gallium-llvm \
     --enable-gallium-egl --enable-shared-glapi\
     --enable-glx-tls \
@@ -53,6 +53,7 @@
     --enable-gles2 \
     --enable-egl \
     --enable-texture-float \
+    --enable-xa \
     --enable-shared-dricore
     
     #    --enable-gallium-svga \
@@ -61,7 +62,7 @@
      autoreconf -vfi
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
     --enable-gallium-llvm \
     --enable-gallium-egl --enable-shared-glapi\
     --enable-glx-tls \
@@ -72,6 +73,7 @@
     --enable-gles2 \
     --enable-egl \
     --enable-texture-float \
+    --enable-xa \
     --enable-shared-dricore
 fi
 
@@ -191,7 +193,8 @@
   rm -f "${pkgdir}/usr/lib/libGLESv"*
   rm -f "${pkgdir}/usr/lib/libEGL"*
   rm -rf "${pkgdir}/usr/lib/egl"
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
+  rm -f "${pkgdir}/usr/lib/libOSMesa"*
+  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc}
   rm -rf "${pkgdir}/usr/lib/xorg"
   rm -f "${pkgdir}/usr/include/GL/glew.h"
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
@@ -233,3 +236,10 @@
   # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 }
+
+package_svga-dri() {
+  depends=("mesa=${pkgver}")
+  pkgdesc="Gallium3D VMware guest GL driver"
+
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+}