Sat Feb 18 23:15:35 UTC 2012

1 files changed, 4 insertions, 63 deletions

diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
index d293fa0c6..930f61f9a 100644
--- a/multilib-testing/lib32-mesa/PKGBUILD
+++ b/multilib-testing/lib32-mesa/PKGBUILD
@@ -1,10 +1,8 @@
-# $Id: PKGBUILD 64519 2012-02-15 18:00:15Z lcarlier $
+# $Id: PKGBUILD 64673 2012-02-17 17:53:28Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=lib32-mesa
-#pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri'
-#  'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri')
 pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
 
 #_git=true
@@ -15,7 +13,7 @@ if [ "${_git}" = "true" ]; then
     #pkgver=7.10.99.git20110709
     pkgver=7.11
   else
-    pkgver=8.0
+    pkgver=8.0.1
 fi
 
 pkgrel=1
@@ -32,7 +30,7 @@ if [ "${_git}" = "true" ]; then
 else
   source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
   #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2")
-  md5sums=('1a5668fe72651a670611164cefc703b2')
+  md5sums=('24eeebf66971809d8f40775a379b36c9')
 fi
 
 build() {
@@ -54,7 +52,7 @@ build() {
     --disable-gallium-egl --enable-shared-glapi \
     --enable-shared-glapi \
     --enable-glx-tls \
-    --with-driver=dri \
+    --enable-dri \
     --enable-gles1 \
     --enable-gles2 \
     --disable-egl \
@@ -97,7 +95,6 @@ package_lib32-libgl() {
   bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-# ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" # gallium is now default so this is obsolete in 8.0
   ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}
@@ -187,66 +184,10 @@ package_lib32-intel-dri() {
   depends=("lib32-libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel (32-bit)"
 
-#  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 8.0
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
 }
 
-package_lib32-unichrome-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
-}
-
-package_lib32-mach64-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
-  conflicts=('xf86-video-mach64<6.8.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-mga-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
-  conflicts=('xf86-video-mga<1.4.11')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
-}
-
-package_lib32-r128-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
-  conflicts=('xf86-video-r128<6.8.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-savage-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
-  conflicts=('xf86-video-savage<2.3.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
-}
-
-package_lib32-sis-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for SiS (32-bit)"
-  conflicts=('xf86-video-sis<0.10.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
-}
-
-package_lib32-tdfx-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
-  conflicts=('xf86-video-tdfx<1.4.3')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
-}
-
 package_lib32-nouveau-dri() {
   depends=("lib32-libgl=${pkgver}")
   pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"