Sun Oct 14 00:45:38 PDT 2012

8 files changed, 331 insertions, 169 deletions

diff --git a/multilib/lib32-catalyst-utils/PKGBUILD b/multilib/lib32-catalyst-utils/PKGBUILD
index 1f57c82b6..e94f84b62 100644
--- a/multilib/lib32-catalyst-utils/PKGBUILD
+++ b/multilib/lib32-catalyst-utils/PKGBUILD
@@ -1,46 +1,48 @@
-# $Id: PKGBUILD 77082 2012-10-04 12:27:22Z lcarlier $
+# $Id: PKGBUILD 77685 2012-10-13 13:39:25Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
 # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
 
 pkgname=lib32-catalyst-utils
-pkgver=12.8
-pkgrel=1
+pkgver=12.9
+pkgrel=0.1
 pkgdesc="AMD Catalyst drivers libraries (32 bits)"
 arch=('x86_64')
 url="http://www.amd.com"
 license=('custom')
-source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip")
-md5sums=('41c5478322b13be6909eeb46412a3aa0')
+source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip"
+        https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz)
+md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b')
 provides=('lib32-libgl')
 conflicts=('lib32-libgl' 'lib32-nvidia-utils')
-depends=("catalyst-utils=${pkgver}")
 
-build() {
-  cd ${srcdir}
-  
-  sh ./amd-driver-installer*.run --extract fglrx-install
-}
+#build() {
+#  cd ${srcdir}
+#  
+#  sh ./amd-driver-installer*.run --extract fglrx-install
+#}
 
 package() {
+  depends=("catalyst-utils=${pkgver}")
+
   install -dm755 "${pkgdir}"/usr/bin
   install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}}
   
   # binaries
-  cd ${srcdir}/fglrx-install
+  cd ${srcdir}
   install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32"
   install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32"
   
   # dri/gl/... drivers
-  cd ${srcdir}/fglrx-install/xpic/usr/X11R6/lib/modules
+  cd ${srcdir}/xpic/usr/X11R6/lib/modules
   install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/"
-  cd ${srcdir}/fglrx-install/arch/x86/usr/X11R6/lib
+  cd ${srcdir}/arch/x86/usr/X11R6/lib
   install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/"
   ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/"
   install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/"
   install -m755 *.so* "${pkgdir}/usr/lib32/"
   install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/"
-  cd ${srcdir}/fglrx-install/arch/x86/usr/lib
+  cd ${srcdir}/arch/x86/usr/lib
   install -m755 *.so* "${pkgdir}/usr/lib32/"
   # needed symlinks
   ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1"
@@ -54,5 +56,5 @@ package() {
   rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* 
 
   # licenses
-  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+  install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
 }
diff --git a/multilib/lib32-glew/PKGBUILD b/multilib/lib32-glew/PKGBUILD
index cc1f6f06f..f93d91895 100644
--- a/multilib/lib32-glew/PKGBUILD
+++ b/multilib/lib32-glew/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 74807 2012-08-05 18:43:15Z bluewind $
+# $Id: PKGBUILD 77618 2012-10-13 11:32:25Z allan $
 # Maintainer: Florian Pritz <flo@xinu.at>
 
 _pkgbasename=glew
 pkgname=lib32-$_pkgbasename
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform C/C++ extension loading library (32 bit)"
 arch=('x86_64')
 url="http://glew.sourceforge.net"
 license=('BSD' 'MIT' 'GPL')
-depends=('lib32-libxmu' 'lib32-libxi' 'lib32-mesa' "$_pkgbasename>=$pkgver")
+depends=('lib32-libxmu' 'lib32-libxi' 'lib32-glu' "$_pkgbasename>=$pkgver")
 makedepends=('gcc-multilib')
 source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz)
 sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
diff --git a/multilib/lib32-glu/PKGBUILD b/multilib/lib32-glu/PKGBUILD
new file mode 100644
index 000000000..dcf535b67
--- /dev/null
+++ b/multilib/lib32-glu/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 77675 2012-10-13 12:37:35Z bluewind $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=lib32-glu
+pkgver=9.0.0
+pkgrel=1
+pkgdesc="Mesa OpenGL utility library (32 bits)"
+arch=('x86_64')
+url="http://mesa.freedesktop.org/"
+license=('LGPL')
+depends=('lib32-libgl')
+makedepends=('gcc-multilib' 'lib32-mesa')
+options=('!libtool')
+source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2)
+sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
+
+build() {
+  cd ${srcdir}/glu-$pkgver
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./configure --prefix=/usr --disable-static \
+    --libdir=/usr/lib32 
+  make
+}
+
+check() {
+  cd "$srcdir/glu-$pkgver"
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  make -k check
+}
+
+package() {
+  cd ${srcdir}/glu-$pkgver
+
+  make DESTDIR=${pkgdir} install
+  
+  rm -rf ${pkgdir}/usr/include
+}
diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD
index b5b1feb33..dde7c6c56 100644
--- a/multilib/lib32-gnutls/PKGBUILD
+++ b/multilib/lib32-gnutls/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77416 2012-10-09 17:45:23Z bluewind $
+# $Id: PKGBUILD 77613 2012-10-13 10:53:28Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Christoph Vigano <mail at cvigano dot de>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
@@ -6,7 +6,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
 _pkgbasename=gnutls
 pkgname=lib32-$_pkgbasename
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)"
 arch=('x86_64')
@@ -16,8 +16,8 @@ options=('!libtool')
 depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.12' 'lib32-libtasn1' $_pkgbasename)
 makedepends=('gcc-multilib' 'lib32-libidn')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz{,.sig})
-md5sums=('5d722e5850d79269ba413b0e69b9e14f'
-         '2764135bac008654a0b2fdd9fc6e62d1')
+md5sums=('8a7b47456f65ffa8c01c58461fed1388'
+         'ecd7bfe70612f88afd117124e18444df')
 
 build() {
   export CC="gcc -m32"
diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index 591a51d11..284026eef 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 74678 2012-08-01 20:07:21Z lcarlier $
+# $Id: PKGBUILD 77676 2012-10-13 12:39:51Z bluewind $
 # 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-osmesa' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-libgbm') # 'lib32-nouveau-dri'
-
+pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri'
+         'lib32-nouveau-dri') # lib32-libgbm needs udev
 #_git=true
-_gitdate=20111031
+#_gitdate=20121005
 _git=false
 
 if [ "${_git}" = "true" ]; then
-    #pkgver=7.10.99.git20110709
-    pkgver=7.11
+    pkgver=8.99.git_$_gitdate
   else
-    pkgver=8.0.4
+    pkgver=9.0
 fi
 
-pkgrel=4
+pkgrel=1
 arch=('x86_64')
-makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.33' '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.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
+makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0'
+             'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2'
+             'gcc-multilib' 'imake' 'lib32-llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=('mesa-8.0.3-llvm-3.1-fixes.patch')
+options=('!libtool')
+source=(git_fixes.diff)
 if [ "${_git}" = "true" ]; then
-  # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
-  source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
-  md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd')
+  # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
+  #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
+  source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
 else
   source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-  md5sums=('0082f4d17674155aa13bc611a5687788'
-           'd546f988adfdf986cff45b1efa2d8a46')
 fi
-#options=('!buildflags')
+md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee'
+         '60e557ce407be3732711da484ab3db6c')
 
 build() {
   export CC="gcc -m32"
@@ -47,14 +47,14 @@ build() {
 
   cd ${srcdir}/?esa-*
 
-  patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-  autoreconf -vfi
+  # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
+  patch -Np1 -i ${srcdir}/git_fixes.diff
 
-  if [ "${_git}" = "true" ]; then
-     ./autogen.sh --prefix=/usr \
+  COMMONOPTS="--prefix=/usr \
+    --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
+    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --enable-gallium-llvm \
     --disable-gallium-egl --enable-shared-glapi \
     --enable-shared-glapi \
@@ -64,173 +64,194 @@ build() {
     --enable-gles2 \
     --disable-egl \
     --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-gbm \
     --enable-osmesa \
     --enable-32-bit \
-    --libdir=/usr/lib32
-    #  --enable-gallium-svga \
+    --libdir=/usr/lib32 "
+    # --enable-gbm disabled because it needs udev
+
+  if [ "${_git}" = "true" ]; then
+    ./autogen.sh \
+      $COMMONOPTS
   else
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,svga,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-glx-tls \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-gbm \
-    --enable-osmesa \
-    --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-32-bit \
-    --libdir=/usr/lib32
-#   --with-gallium-drivers=r300,r600,nouveau,swrast \ # also without --with-dri-driver
+    autoreconf -vfi
+    ./configure \
+      $COMMONOPTS
   fi
 
   make
 }
 
+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-*   
+
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
+  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
+}
+
 package_lib32-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')
+  depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' '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')
+  # currently disabled so force the remove
+  conflicts=('lib32-libgbm')
+  replace=('lib32-libgbm')
 
   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/"
-  bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
+  # fix linking because of splitted package
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
+  # libGL & libdricore
+  make -C src/glx DESTDIR="${pkgdir}" install
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+  
+  # --with-gallium-drivers=swrast
+  make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
 
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
+  ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl"
 }
 
-package_lib32-osmesa() {
-  depends=('lib32-mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
-
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
-}
+package_lib32-mesa() {
+  # check also gl.pc
+  depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxext>=1.3.1' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxcb'
+           'lib32-libxxf86vm' 'mesa')
+  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
 
-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-*
 
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib32"
-  bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
+  # .pc files
+  make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
+  make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
 }
 
-package_lib32-libgbm() {
-  depends=('lib32-glibc')
-  pkgdesc="Mesa gbm library (32-bit)"
+package_lib32-osmesa() {
+  depends=('lib32-libglapi' 'lib32-gcc-libs' 'osmesa')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
 
-  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/"
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
 }
 
+# package_lib32-libgbm() {
+#   depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm')
+#   pkgdesc="Mesa gbm library (32-bit)"
+# 
+#   cd ${srcdir}/?esa-*
+# 
+#   # fix linking because of splitted package
+#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+# 
+#   make -C src/gbm DESTDIR="${pkgdir}" install
+# 
+#   # fix linking because of splitted package - cleanup
+#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+# 
+#   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')
+  depends=('lib32-libglapi' 'lib32-libdrm' 'libgles')
   pkgdesc="Mesa GLES libraries (32-bit)"
 
   cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-#package_lib32-libegl() {
-#  depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
-#  pkgdesc="Mesa libEGL libraries (32-bit)"
-#
-#  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/"
-#  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"
-#  ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
-#}
 
-package_lib32-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)"
+  # fix linking because of splitted package
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
-  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/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/libOSMesa"*
-  rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
-  rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
+  # --enable-gles1 --enable-gles2
+  make -C src/mapi/es1api DESTDIR="${pkgdir}" install
+  make -C src/mapi/es2api DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
+  # fix linking because of splitted package - cleanup
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+  
+  rm -r "${pkgdir}"/usr/include
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
+  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
 }
 
 package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}")
+  depends=("lib32-libgl=${pkgver}" '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')
 
-  cd ${srcdir}/?esa-*/src/mesa/drivers/dri
+  cd ${srcdir}/?esa-*
+  
+  # fix linking because of splitted package
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+
   # classic mesa drivers for radeon,r200
-  make -C radeon DESTDIR="${pkgdir}" install
-  make -C r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
+  # gallium3D driver for r300,r600
+  make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+  make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+  make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
+  ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri"
 }
 
 package_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}")
+  depends=("lib32-libgl=${pkgver}" 'intel-dri')
   pkgdesc="Mesa DRI drivers for Intel (32-bit)"
 
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
+  cd ${srcdir}/?esa-*
+  
+  # fix linking because of splitted package
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+  make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
+  ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri"
 }
 
 package_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}")
+  depends=("lib32-libgl=${pkgver}" 'nouveau-dri')
   pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
 
+  cd ${srcdir}/?esa-*
+  
+  # fix linking because of splitted package
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+
   # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
   # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+  make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
+  ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri"
 }
 
diff --git a/multilib/lib32-mesa/git_fixes.diff b/multilib/lib32-mesa/git_fixes.diff
new file mode 100644
index 000000000..8132d1d10
--- /dev/null
+++ b/multilib/lib32-mesa/git_fixes.diff
@@ -0,0 +1,93 @@
+From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 08 Oct 2012 22:07:10 +0000
+Subject: docs: Add 9.0 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
+index d72c5bb..02b7324 100644
+--- a/docs/relnotes-9.0.html
++++ b/docs/relnotes-9.0.html
+@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
+ 
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+ </pre>
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:47:40 +0000
+Subject: mesa: don't call TexImage driver hooks for zero-sized images
+
+This simply avoids some failed assertions but there's no reason to
+call the driver hooks for storing a tex image if its size is zero.
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 21646cc..8004876 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
+                                           border, internalFormat, texFormat);
+ 
+                /* Give the texture to the driver.  <pixels> may be null. */
+-               if (compressed) {
+-                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+-                                                 imageSize, pixels);
+-               }
+-               else {
+-                  ctx->Driver.TexImage(ctx, dims, texImage, format,
+-                                       type, pixels, unpack);
++               if (width > 0 && height > 0 && depth > 0) {
++                  if (compressed) {
++                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
++                                                    imageSize, pixels);
++                  }
++                  else {
++                     ctx->Driver.TexImage(ctx, dims, texImage, format,
++                                          type, pixels, unpack);
++                  }
+                }
+ 
+                check_gen_mipmap(ctx, target, texObj, level);
+--
+cgit v0.9.0.2-2-gbebe
+From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:59:27 +0000
+Subject: mesa: fix error check for zero-sized compressed subtexture
+
+For glCompressedTexSubImage, width or height = 0 is legal.
+Fixes a failure in piglit's s3tc-errors test.
+
+This is for the 9.0 and 8.0 branches.  Already fixed on master.
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 8004876..38fa9fa 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
+    if (!_mesa_is_compressed_format(ctx, format))
+       return GL_INVALID_ENUM;
+ 
+-   if (width < 1 || width > maxTextureSize)
++   if (width < 0 || width > maxTextureSize)
+       return GL_INVALID_VALUE;
+ 
+-   if ((height < 1 || height > maxTextureSize)
++   if ((height < 0 || height > maxTextureSize)
+        && dimensions > 1)
+       return GL_INVALID_VALUE;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index a5fec610b..7abeae26c 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 76761 2012-09-29 12:58:36Z bluewind $
+# $Id: PKGBUILD 77690 2012-10-13 14:39:25Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.5.14
+pkgver=1.5.15
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
-md5sums=('f84c54bd7422328e96b6cf14ee6e163c'
-         'dd0c87e2dea529f0c898fe2ffa5390ce')
+md5sums=('41728374d14d0f13552250c70c0d40d2'
+         '6d8a5749f3f7d45340fc9e43e906c238')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -28,6 +28,7 @@ depends=(
   libxdamage      lib32-libxdamage
   libxi           lib32-libxi
   gettext         lib32-gettext
+  glu             lib32-glu
   desktop-file-utils
 )
 
diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD
index 2cf05544d..5ad2678e6 100644
--- a/multilib/wine_gecko/PKGBUILD
+++ b/multilib/wine_gecko/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74651 2012-08-01 08:37:25Z bluewind $
+# $Id: PKGBUILD 77615 2012-10-13 10:57:22Z bluewind $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)
 # Contributor: Allan McRae (allan <at> archlinux <dot> org)
 # Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org)
 
 pkgname=wine_gecko
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer"
 arch=(i686 x86_64)
@@ -13,8 +13,8 @@ url="http://wiki.winehq.org/Gecko"
 license=(MPL)
 depends=('wine>=1.5')
 source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi)
-md5sums=('2f69934abb13dcea0224baf4b4665700'
-         '903d682ef2b4ef31d256d1bf56d17d08')
+md5sums=('c2f19f07e399d8b9d75a14f37fdddca7'
+         '5ce40ef8e3fd56d2c8c4e8d938f10f7b')
 
 if [[ $CARCH == i686 ]]; then
   # Strip x86_64 msi