Wed Mar 14 00:01:29 UTC 2012

1 files changed, 13 insertions, 81 deletions

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index 81395d897..a1169ae23 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,12 +1,9 @@
-# $Id: PKGBUILD 64038 2012-02-08 20:14:24Z lcarlier $
+# $Id: PKGBUILD 67496 2012-03-12 21:07:25Z 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')
-# prepare 7.12/8.0
-# pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
+pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
 
 #_git=true
 _gitdate=20111031
@@ -16,12 +13,12 @@ if [ "${_git}" = "true" ]; then
     #pkgver=7.10.99.git20110709
     pkgver=7.11
   else
-    pkgver=7.11.2
+    pkgver=8.0.1
 fi
 
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
-makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3'
+makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1'
   'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
@@ -31,9 +28,9 @@ if [ "${_git}" = "true" ]; then
   source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
   md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd')
 else
-  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" fix-build-with-llvm-3.0.patch)
+  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=('0837c52698fe3252369c3fdb5195afcc' '73501728793dc895bfc80dfb3253d39e')
+  md5sums=('24eeebf66971809d8f40775a379b36c9')
 fi
 
 build() {
@@ -41,15 +38,10 @@ build() {
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
   # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/lib32/llvm/llvm-config
+  export LLVM_CONFIG=/usr/bin/llvm-config32
 
   cd ${srcdir}/?esa-*
 
-  if [ "${_git}" = "false" ]; then
-    # fix building of mesa-7.11.2 with llvm-3.0
-    patch -Np1 -i ../fix-build-with-llvm-3.0.patch
-  fi
-
   autoreconf -vfi
 
   if [ "${_git}" = "true" ]; then
@@ -60,9 +52,7 @@ build() {
     --disable-gallium-egl --enable-shared-glapi \
     --enable-shared-glapi \
     --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glut \
+    --enable-dri \
     --enable-gles1 \
     --enable-gles2 \
     --disable-egl \
@@ -79,8 +69,6 @@ build() {
     --disable-gallium-egl --enable-shared-glapi \
     --enable-glx-tls \
     --with-driver=dri \
-    --enable-xcb \
-    --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
     --disable-egl \
@@ -94,8 +82,9 @@ build() {
 }
 
 package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
+  depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
+  replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
 
   cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib32"
@@ -106,8 +95,7 @@ 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/lib32/xorg/modules/dri/swrast_dri.so"
-  # ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
+  ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
@@ -160,7 +148,7 @@ package_lib32-libgles() {
 #}
 
 package_lib32-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
+  depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
   pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
 
   cd ${srcdir}/?esa-*
@@ -196,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 7.12
   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)"