[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Sunday, August 3, 2014 @ 14:53:03
  Author: lcarlier
Revision: 116788

upgpkg: lib32-mesa 10.2.5-1

upstream update 10.2.5, fix FS#41336 FS#41337

Modified:
  lib32-mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-03 12:06:05 UTC (rev 116787)
+++ PKGBUILD	2014-08-03 12:53:03 UTC (rev 116788)
@@ -4,7 +4,7 @@
 
 pkgbase=lib32-mesa
 pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl')
-pkgver=10.2.4
+pkgver=10.2.5
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
@@ -12,8 +12,9 @@
              'lib32-libvdpau' 'lib32-wayland')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2)
-sha256sums=('06a2341244eb85c283f59f70161e06ded106f835ed9b6be1ef0243bd9344811a')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig})
+sha256sums=('b4459f0bf7f4a3c8fb78ece3c9d2eac3d0e5bf38cb470f2a72705e744bd0310d'
+            SKIP)
 
 build() {
   export CC="gcc -m32"
@@ -37,8 +38,8 @@
     --enable-llvm-shared-libs \
     --enable-egl \
     --disable-gallium-egl \
+    --disable-gallium-gbm \
     --enable-gbm \
-    --enable-gallium-gbm \
     --enable-gallium-llvm \
     --enable-shared-glapi \
     --enable-glx-tls \
@@ -67,8 +68,8 @@
   install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/
 
-  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
-  mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib32/gallium-pipe/
+  #install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
+  #mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib32/gallium-pipe/
 
   install -m755 -d "${pkgdir}/usr/share/licenses"
   ln -s ati-dri "$pkgdir/usr/share/licenses/lib32-ati-dri"
@@ -95,8 +96,8 @@
   install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib32/xorg/modules/dri/
 
-  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
-  mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib32/gallium-pipe/
+  #install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
+  #mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib32/gallium-pipe/
 
   install -m755 -d "${pkgdir}/usr/share/licenses"
   ln -s nouveau-dri "$pkgdir/usr/share/licenses/lib32-nouveau-dri"
@@ -104,16 +105,17 @@
 
 package_lib32-mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
-  depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd' 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-libvdpau' 'lib32-wayland' 'mesa')
+  depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd' 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'mesa')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
   conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
   replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
 
-  install -m755 -d ${pkgdir}/usr/lib32/{gallium-pipe,gbm}
+  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib32/lib{OSMesa,gbm,glapi,wayland-egl}.so* ${pkgdir}/usr/lib32/
-  mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_swrast* ${pkgdir}/usr/lib32/gallium-pipe/
-  mv -v ${srcdir}/fakeinstall/usr/lib32/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib32/gbm/
+  #mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_swrast* ${pkgdir}/usr/lib32/gallium-pipe/
+  # FS#41337
+  #mv -v ${srcdir}/fakeinstall/usr/lib32/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib32/gbm/
 
   mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/