4 files changed, 25 insertions, 14 deletions
diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD
index 356b3274a..f7cfc6c50 100644
--- a/multilib/lib32-libcups/PKGBUILD
+++ b/multilib/lib32-libcups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70966 2012-05-20 20:35:00Z bluewind $
+# $Id: PKGBUILD 74676 2012-08-01 19:35:45Z bluewind $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 _pkgbasename=libcups
 pkgname=lib32-$_pkgbasename
-pkgver=1.5.3
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="The CUPS Printing System - client libraries (32-bit)"
 arch=('x86_64')
@@ -12,7 +12,7 @@ url="http://www.cups.org/"
 depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename)
 makedepends=(gcc-multilib)
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 fix-libusb-configure.patch)
-md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
+md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          '9cf39a66f21d1208a585367b25cf117b')
 
 build() {
@@ -30,6 +30,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
      --enable-ssl=no --disable-gnutls --enable-threads --enable-libusb=no \
+	 --disable-avahi \
      --with-optim="$CFLAGS" --libdir=/usr/lib32
   make
 }
diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index ad78cf9f2..591a51d11 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74498 2012-07-29 17:55:29Z lcarlier $
+# $Id: PKGBUILD 74678 2012-08-01 20:07:21Z 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-libgbm') # 'lib32-nouveau-dri'
+pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-osmesa' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-libgbm') # 'lib32-nouveau-dri'
 
 #_git=true
 _gitdate=20111031
@@ -16,7 +16,7 @@ if [ "${_git}" = "true" ]; then
     pkgver=8.0.4
 fi
 
-pkgrel=3
+pkgrel=4
 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')
@@ -66,6 +66,7 @@ build() {
     --enable-texture-float \
     --enable-shared-dricore \
     --enable-gbm \
+    --enable-osmesa \
     --enable-32-bit \
     --libdir=/usr/lib32
     #  --enable-gallium-svga \
@@ -77,11 +78,11 @@ build() {
     --enable-gallium-llvm \
     --disable-gallium-egl --enable-shared-glapi \
     --enable-glx-tls \
-    --with-driver=dri \
     --enable-gles1 \
     --enable-gles2 \
     --disable-egl \
     --enable-gbm \
+    --enable-osmesa \
     --enable-texture-float \
     --enable-shared-dricore \
     --enable-32-bit \
@@ -113,6 +114,14 @@ package_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-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)"
@@ -185,7 +194,8 @@ package_lib32-mesa() {
   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,gbm.pc}
+  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}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD
index b00993592..34fec0e0e 100644
--- a/multilib/lib32-qt/PKGBUILD
+++ b/multilib/lib32-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71571 2012-05-29 19:31:30Z bluewind $
+# $Id: PKGBUILD 74654 2012-08-01 08:56:28Z bluewind $
 # Maintainer: Florian Pritz <flo@xssn.at>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,7 +6,7 @@
 _pkgbasename=qt
 pkgname=lib32-$_pkgbasename
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework (32-bit)'
 arch=('x86_64')
 url='http://qt-project.org/'
diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD
index 8c8f563a4..2cf05544d 100644
--- a/multilib/wine_gecko/PKGBUILD
+++ b/multilib/wine_gecko/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72870 2012-06-24 08:37:05Z bluewind $
+# $Id: PKGBUILD 74651 2012-08-01 08:37:25Z 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.6
+pkgver=1.7
 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=('8542fe0e03af053534bca65a74f58f91'
-         'ee638810f38d33d28c1de023637118ab')
+md5sums=('2f69934abb13dcea0224baf4b4665700'
+         '903d682ef2b4ef31d256d1bf56d17d08')
 
 if [[ $CARCH == i686 ]]; then
   # Strip x86_64 msi