Tue Aug 21 00:02:33 UTC 2012

1 files changed, 28 insertions, 12 deletions

diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index f20ccf9de..ccdcd1efe 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161835 2012-06-15 13:56:53Z ibiru $
+# $Id: PKGBUILD 165434 2012-08-19 10:10:41Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -13,12 +13,12 @@ if [ "${_git}" = "true" ]; then
     pkgver=7.10.99.git20110709
     #pkgver=7.11
   else
-    pkgver=8.0.3
+    pkgver=8.0.4
 fi
 pkgrel=3
 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>=183')
+             'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'systemd-tools')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE
@@ -35,7 +35,7 @@ if [ "${_git}" = "true" ]; then
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          'c452ed3392468170726c004c2f4e02ca'
-         'cc5ee15e306b8c15da6a478923797171')
+         'd546f988adfdf986cff45b1efa2d8a46')
 
 build() {
     cd ${srcdir}/?esa-*
@@ -48,7 +48,9 @@ if [ "${_git}" = "true" ]; then
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
     --enable-gallium-llvm \
-   --enable-gallium-egl \
+    --enable-egl \    
+    --enable-gallium-egl \
+    --with-egl-platforms=x11,drm \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
@@ -57,7 +59,6 @@ if [ "${_git}" = "true" ]; then
     --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
     --enable-texture-float \
     --enable-xa \
     --enable-shared-dricore
@@ -71,7 +72,9 @@ if [ "${_git}" = "true" ]; then
     --with-gallium-drivers=r300,r600,svga,swrast \
     --with-dri-drivers=i915,i965,r200,radeon,swrast \
     --enable-gallium-llvm \
+    --enable-egl \
     --enable-gallium-egl \
+    --with-egl-platforms=x11,drm \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
@@ -80,7 +83,6 @@ if [ "${_git}" = "true" ]; then
     --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
     --enable-texture-float \
     --enable-xa \
     --enable-shared-dricore
@@ -132,12 +134,15 @@ package_libglapi() {
 }
 
 package_libgbm() {
-  depends=('glibc')
+  depends=('systemd-tools')
   pkgdesc="Mesa gbm library"
 
   cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
+  install -m755 -d ${pkgdir}/usr/{include,lib/gbm}
   bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
+  bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/"
+  bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
+  bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
 
@@ -167,7 +172,7 @@ package_libgles() {
 }
 
 package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
+  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
 
   cd ${srcdir}/?esa-*   
@@ -218,12 +223,14 @@ package_mesa() {
   rm -f "${pkgdir}/usr/lib/libEGL"*
   rm -rf "${pkgdir}/usr/lib/egl"
   rm -f "${pkgdir}/usr/lib/libOSMesa"*
+  rm -rf "${pkgdir}/usr/lib/gbm"
   rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
   rm -rf "${pkgdir}/usr/lib/xorg"
   rm -f "${pkgdir}/usr/include/GL/glew.h"
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
   rm -f "${pkgdir}/usr/include/GL/wglew.h"
   rm -f "${pkgdir}/usr/include/GL/glut.h"
+  rm -f "${pkgdir}/usr/include/gbm.h"
   rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
@@ -231,7 +238,7 @@ package_mesa() {
 }
 
 package_ati-dri() {
-  depends=("libgl=${pkgver}")
+  depends=("libgl=${pkgver}" 'libffi')
   pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
   conflicts=('xf86-video-ati<6.9.0-6')
 
@@ -241,6 +248,11 @@ package_ati-dri() {
   # gallium3D driver for r300,r600
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+  # gallium egl drivers
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/lib/gbm"
+  bin/minstall lib/gbm/pipe_r{300,600}.so* "${pkgdir}/usr/lib/gbm/"
+
 }
 
 package_intel-dri() {
@@ -262,8 +274,12 @@ package_nouveau-dri() {
 }
 
 package_svga-dri() {
-  depends=("mesa=${pkgver}")
+  depends=("mesa=${pkgver}" 'libffi')
   pkgdesc="Gallium3D VMware guest GL driver"
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+  # gallium egl driver
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/lib/gbm"
+  bin/minstall lib/gbm/pipe_vmwgfx.so* "${pkgdir}/usr/lib/gbm/"
 }