mesa: upgrade

1 files changed, 70 insertions, 69 deletions

diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD
index 0486a8f..07f6c36 100644
--- a/abs/core/mesa/PKGBUILD
+++ b/abs/core/mesa/PKGBUILD
@@ -1,73 +1,72 @@
-# $Id: PKGBUILD 83334 2010-06-21 11:46:47Z jgc $
+# $Id: PKGBUILD 94675 2010-10-09 12:59:04Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
-pkgver=7.8.2
-pkgrel=2
+pkgver=7.9
+pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.11' 'pkgconfig' 'libdrm>=2.4.21' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1' 'libx11>=1.3.3' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2')
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' 
+             'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'talloc' 'libxml2')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-#options=(!makeflags)
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaDemos-${pkgver}.tar.bz2
         ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
-        nouveau_class.h
-        LICENSE
-        python2.patch)
+        LICENSE)
+md5sums=('82c740c49d572baa6da2b1a1eee90bca'
+         '6ae05158e678f4594343f32c2ca50515'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
-  cd "${srcdir}/Mesa-${pkgver}"
-  cp "${srcdir}/nouveau_class.h" "src/gallium/drivers/nouveau/" || return 1
-# patch for python2
-  patch -Np0 < ${srcdir}/python2.patch || return 1
+  # python2 build fixes
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $srcdir -name '*.py')
+  sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" "${srcdir}/Mesa-${pkgver}"/configs/{default,autoconf.in}
+  sed -i -e "s|python|python2|" "${srcdir}/Mesa-${pkgver}"/src/gallium/auxiliary/Makefile
 
+  cd "${srcdir}/Mesa-${pkgver}"
   ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-dri-drivers=swrast,radeon,r200,r300,r600,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx \
     --disable-egl \
-    --disable-gallium-intel \
+    --enable-gallium-radeon \
+    --enable-gallium-nouveau \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
     --with-state-trackers=dri,glx \
-    --enable-gallium-nouveau \
-    --disable-glut || return 1
-  make || return 1
+    --disable-glut
+  make
 
   cd "${srcdir}/gl-manpages-1.0.1"
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.21' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
-  cd "${srcdir}/Mesa-${pkgver}" || return 1
-  install -m755 -d "${pkgdir}/usr/lib" || return 1
+  cd "${srcdir}/Mesa-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/lib"
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
 
-  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" || return 1
+  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
 
   cd src/mesa/drivers/dri
-  make -C swrast DESTDIR="${pkgdir}" install || return 1
-  #install -m755 libdricore.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" || return 1
+  make -C swrast DESTDIR="${pkgdir}" install
+  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" || return 1
+  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.3.3' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.20')
+  depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
-  cd "${srcdir}/Mesa-${pkgver}" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 progs/xdemos/glx{gears,info} "${pkgdir}/usr/bin/" || return 1
+  cd "${srcdir}/Mesa-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/lib/libGL.so"*
   rm -rf "${pkgdir}/usr/lib/xorg"
@@ -75,41 +74,44 @@ package_mesa() {
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
   rm -f "${pkgdir}/usr/include/GL/wglew.h"
 
-  cd "${srcdir}/gl-manpages-1.0.1" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/gl-manpages-1.0.1"
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" || return 1
+  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
 }
 
 package_ati-dri() {
   depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for AMD/ATI Radeon"
+  pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon"
   conflicts=('xf86-video-ati<6.9.0-6')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C radeon DESTDIR="${pkgdir}" install || return 1
-  make -C r200 DESTDIR="${pkgdir}" install || return 1
-  make -C r300 DESTDIR="${pkgdir}" install || return 1
-  make -C r600 DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C radeon DESTDIR="${pkgdir}" install
+  make -C r200 DESTDIR="${pkgdir}" install
+  # classic mesa driver for R300 r300_dri.so
+# make -C r300 DESTDIR="${pkgdir}" install  <------- depricated
+  # gallium3D driver for R300 r300_dri.so
+  make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+  make -C r600 DESTDIR="${pkgdir}" install
 }
 
 package_intel-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C i810 DESTDIR="${pkgdir}" install || return 1
-  make -C i915 DESTDIR="${pkgdir}" install || return 1
-  make -C i965 DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C i810 DESTDIR="${pkgdir}" install
+  make -C i915 DESTDIR="${pkgdir}" install
+  make -C i965 DESTDIR="${pkgdir}" install
 }
 
 package_unichrome-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C unichrome DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C unichrome DESTDIR="${pkgdir}" install
 }
 
 package_mach64-dri() {
@@ -117,8 +119,8 @@ package_mach64-dri() {
   pkgdesc="Mesa DRI drivers for ATI Mach64"
   conflicts=('xf86-video-mach64<6.8.2')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C mach64 DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C mach64 DESTDIR="${pkgdir}" install
 }
 
 package_mga-dri() {
@@ -126,8 +128,8 @@ package_mga-dri() {
   pkgdesc="Mesa DRI drivers for Matrox"
   conflicts=('xf86-video-mga<1.4.11')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C mga DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C mga DESTDIR="${pkgdir}" install
 }
 
 package_r128-dri() {
@@ -135,8 +137,8 @@ package_r128-dri() {
   pkgdesc="Mesa DRI drivers for ATI Rage128"
   conflicts=('xf86-video-r128<6.8.1')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C r128 DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C r128 DESTDIR="${pkgdir}" install
 }
 
 package_savage-dri() {
@@ -144,8 +146,8 @@ package_savage-dri() {
   pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
   conflicts=('xf86-video-savage<2.3.1')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C savage DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C savage DESTDIR="${pkgdir}" install
 }
 
 package_sis-dri() {
@@ -153,8 +155,8 @@ package_sis-dri() {
   pkgdesc="Mesa DRI drivers for SiS"
   conflicts=('xf86-video-sis<0.10.2')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C sis DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C sis DESTDIR="${pkgdir}" install
 }
 
 package_tdfx-dri() {
@@ -162,20 +164,19 @@ package_tdfx-dri() {
   pkgdesc="Mesa DRI drivers for 3dfx"
   conflicts=('xf86-video-tdfx<1.4.3')
 
-  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-  make -C tdfx DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  make -C tdfx DESTDIR="${pkgdir}" install
 }
 
 package_nouveau-dri() {
   depends=("libgl=${pkgver}")
-  pkgdesc="Mesa Gallium3D DRI drivers for Nouveau - highly experimental/unsupported"
+  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
 
-  cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/nouveau/dri"
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
+  make -C nouveau DESTDIR="${pkgdir}" install
+  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
+  make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 }
-md5sums=('6be2d343a0089bfd395ce02aaf8adb57'
-         '757d9e2e06f48b1a52848be9b0307ced'
-         '6ae05158e678f4594343f32c2ca50515'
-         '850546127f5185959407a78b55f898d8'
-         '5c65a0fe315dd347e09b1f2826a1df5a'
-         '95aa06928f2263e4309a845b1c28d8e9')
+
+