Wed May 23 00:02:37 UTC 2012

1 files changed, 28 insertions, 6 deletions

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index 10e72fcc5..5a5c9fc2c 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68333 2012-03-21 21:30:50Z lcarlier $
+# $Id: PKGBUILD 71024 2012-05-21 22:26:05Z 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-nouveau-dri')
+pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-libgbm')
 
 #_git=true
 _gitdate=20111031
@@ -13,10 +13,10 @@ if [ "${_git}" = "true" ]; then
     #pkgver=7.10.99.git20110709
     pkgver=7.11
   else
-    pkgver=8.0.2
+    pkgver=8.0.3
 fi
 
-pkgrel=1
+pkgrel=3
 arch=('x86_64')
 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')
@@ -30,8 +30,9 @@ 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=('a368104e5700707048dc3e8691a9a7a1')
+  md5sums=('cc5ee15e306b8c15da6a478923797171')
 fi
+options=('!buildflags')
 
 build() {
   export CC="gcc -m32"
@@ -40,6 +41,10 @@ build() {
   # for our llvm-config for 32 bit
   export LLVM_CONFIG=/usr/bin/llvm-config32
 
+  # fix segfault with gfx cards > Ati R700
+  export CFLAGS="${CFLAGS} -O1"
+  export CXXFLAGS="${CXXFLAGS} -O1"
+
   cd ${srcdir}/?esa-*
 
   autoreconf -vfi
@@ -58,6 +63,7 @@ build() {
     --disable-egl \
     --enable-texture-float \
     --enable-shared-dricore \
+    --enable-gbm \
     --enable-32-bit \
     --libdir=/usr/lib32
     #  --enable-gallium-svga \
@@ -72,6 +78,7 @@ build() {
     --enable-gles1 \
     --enable-gles2 \
     --disable-egl \
+    --enable-gbm \
     --enable-texture-float \
     --enable-shared-dricore \
     --enable-32-bit \
@@ -114,6 +121,20 @@ package_lib32-libglapi() {
   ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
 }
 
+package_lib32-libgbm() {
+  depends=('lib32-glibc')
+  pkgdesc="Mesa gbm library (32-bit)"
+
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/lib32"
+  bin/minstall lib32/libgbm.so* "${pkgdir}/usr/lib32/"
+  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
+  bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib32/pkgconfig/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
+  ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
+}
+
 package_lib32-libgles() {
   depends=('lib32-libglapi' 'libgles')
   pkgdesc="Mesa GLES libraries (32-bit)"
@@ -156,10 +177,11 @@ package_lib32-mesa() {
 
   rm -f "${pkgdir}/usr/lib32/libGL.so"*
   rm -f "${pkgdir}/usr/lib32/libglapi.so"*
+  rm -f "${pkgdir}/usr/lib32/libgbm.so"*
   rm -f "${pkgdir}/usr/lib32/libGLESv"*
   rm -f "${pkgdir}/usr/lib32/libEGL"*
   rm -rf "${pkgdir}/usr/lib32/egl"
-  rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
+  rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,gbm.pc}
   rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"