Wed Aug 3 23:14:34 UTC 2011

1 files changed, 71 insertions, 167 deletions

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index b787a2a8b..d381a3346 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,68 +1,59 @@
-# $Id: PKGBUILD 49474 2011-06-17 12:06:33Z lcarlier $
+# $Id: PKGBUILD 53216 2011-08-01 12:58:34Z ibiru $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=lib32-mesa
-pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' '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-libegl' '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')
 
 #_git=true
 _git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110616
+    #pkgver=7.10.99.git20110709
+    pkgver=7.11
   else
-    pkgver=7.10.3
+    pkgver=7.11
 fi
 
 pkgrel=1
 arch=(x86_64)
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 
-'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') #  'lib32-llvm'
+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' 'lib32-libxt>=1.1.1' 
+'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 if [ "${_git}" = "true" ]; then
-  # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe
-  source=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2')
-  md5sums=('f9cf11f9fd8f5d2092536fc48fad922f')
+  # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
+  #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
+  source=("MesaLib-${pkgver}.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}.zip" nouveau-fix-header.patch)
-  md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4')
+  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
+  md5sums=('ff03aca82d0560009a076a87c888cf13')
 fi
 
 build() {
   export CC="gcc -m32"
   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
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-    # for our llvm-config for 32 bit :(
-    export PATH="/usr/lib32/llvm:$PATH"
-    # fix linking with llvmpipe driver
-    sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile
-    autoreconf -vfi
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-  fi
+  # fix link errors: https://bugs.archlinux.org/task/25093
+  export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
 
-  if [ "${_git}" != "true" ]; then
-    patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
-  fi
+  cd ${srcdir}/?esa-*   
+  autoreconf -vfi
 
   if [ "${_git}" = "true" ]; then
-    ./autogen.sh --prefix=/usr \
+     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --enable-gallium-r300 \
-    --enable-gallium-r600 \
-    --enable-gallium-nouveau \
+    --with-gallium-drivers=r300,r600,nouveau,swrast \
     --enable-gallium-llvm \
-    --enable-gallium-egl \
-    --enable-gallium-swrast \
+    --enable-gallium-egl --enable-shared-glapi \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
-    --with-state-trackers=dri,glx,egl \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
@@ -72,24 +63,21 @@ build() {
     --enable-32-bit \
     --libdir=/usr/lib32
     #  --enable-gallium-svga \
-    #  --enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled]  http://bugs.gentoo.org/show_bug.cgi?id=357177
-    #  --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no]
   else
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --enable-gallium-radeon \
-    --enable-gallium-r600 \
-    --enable-gallium-nouveau \
-    --enable-gallium-swrast \
+    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --enable-gallium-llvm \
+    --enable-gallium-egl --enable-shared-glapi \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
-    --with-state-trackers=dri,glx \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
     --enable-egl \
-    --disable-gallium-egl \
+    --enable-texture-float \
+    --enable-shared-dricore \
     --enable-32-bit \
     --libdir=/usr/lib32
   fi
@@ -98,29 +86,18 @@ build() {
 }
 
 package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' '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')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-  fi
-
+  cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib32"
   install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
 
   bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
-  if [ "${_git}" = "true" ]; then
-    bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
-    bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
-  fi
+  bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
+  bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
 
-  if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  fi
+  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"
 
@@ -129,16 +106,23 @@ package_lib32-libgl() {
   ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
 }
 
+package_lib32-libglapi() {
+  depends=('lib32-glibc' 'libglapi')
+  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
+
+  cd ${srcdir}/?esa-*   
+  install -m755 -d "${pkgdir}/usr/lib32"
+  bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
+  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
+}
+
 package_lib32-libgles() {
-  depends=('libgles')
+  depends=('lib32-libglapi' 'libgles')
   pkgdesc="Mesa GLES libraries (32-bit)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-  fi
-
+  cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib32"
   install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
   bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
@@ -150,23 +134,17 @@ package_lib32-libgles() {
 }
 
 package_lib32-libegl() {
-  depends=('lib32-udev' 'libegl')
+  depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
   pkgdesc="Mesa libEGL libraries (32-bit)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-    make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-  fi
+  cd ${srcdir}/?esa-*
+  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/lib32"
   install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
+  install -m755 -d "${pkgdir}/usr/lib32/egl"
   bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
-  if [ "${_git}" != "true" ]; then
-    install -m755 -d "${pkgdir}/usr/lib32/egl"
-    bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
-  fi
+  bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
   bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
@@ -174,19 +152,14 @@ package_lib32-libegl() {
 }
 
 package_lib32-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa')
+  depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
   pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
-  else
-    cd "${srcdir}/Mesa-${pkgver}" 
-  fi
-
+  cd ${srcdir}/?esa-*
   make DESTDIR="${pkgdir}" install
 
-
   rm -f "${pkgdir}/usr/lib32/libGL.so"*
+  rm -f "${pkgdir}/usr/lib32/libglapi.so"*
   rm -f "${pkgdir}/usr/lib32/libGLESv"*
   rm -f "${pkgdir}/usr/lib32/libEGL"*
   rm -rf "${pkgdir}/usr/lib32/egl"
@@ -202,52 +175,29 @@ package_lib32-ati-dri() {
   pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
   conflicts=('xf86-video-ati<6.9.0-6')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
+  cd ${srcdir}/?esa-*/src/mesa/drivers/dri
+  # classic mesa drivers for radeon,r200
   make -C radeon DESTDIR="${pkgdir}" install
   make -C r200 DESTDIR="${pkgdir}" install
-
-  # DRI drivers for r300 and r600 are removed
   # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
-  if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  fi
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
 }
 
 package_lib32-intel-dri() {
   depends=("lib32-libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel (32-bit)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C i810 DESTDIR="${pkgdir}" install
-  make -C i915 DESTDIR="${pkgdir}" install
-  make -C i965 DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install
+  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)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C unichrome DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
 }
 
 package_lib32-mach64-dri() {
@@ -255,13 +205,7 @@ package_lib32-mach64-dri() {
   pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
   conflicts=('xf86-video-mach64<6.8.2')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C mach64 DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
 }
 
 package_lib32-mga-dri() {
@@ -269,13 +213,7 @@ package_lib32-mga-dri() {
   pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
   conflicts=('xf86-video-mga<1.4.11')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C mga DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
 }
 
 package_lib32-r128-dri() {
@@ -283,13 +221,7 @@ package_lib32-r128-dri() {
   pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
   conflicts=('xf86-video-r128<6.8.1')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C r128 DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
 }
 
 package_lib32-savage-dri() {
@@ -297,13 +229,7 @@ package_lib32-savage-dri() {
   pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
   conflicts=('xf86-video-savage<2.3.1')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C savage DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
 }
 
 package_lib32-sis-dri() {
@@ -311,13 +237,7 @@ package_lib32-sis-dri() {
   pkgdesc="Mesa DRI drivers for SiS (32-bit)"
   conflicts=('xf86-video-sis<0.10.2')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C sis DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
 }
 
 package_lib32-tdfx-dri() {
@@ -325,32 +245,16 @@ package_lib32-tdfx-dri() {
   pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
   conflicts=('xf86-video-tdfx<1.4.3')
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
-  make -C tdfx DESTDIR="${pkgdir}" install
+  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)"
 
-  if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*/src/mesa/drivers/dri
-  else
-    cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-  fi
-
   # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C nouveau DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
   # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  if [ "${_git}" = "true" ]; then
-    make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  else
-    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  fi
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 }