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

[Laurent Carlier]

    Date: Saturday, May 24, 2014 @ 21:24:49
  Author: lcarlier
Revision: 111792

upgpkg: lib32-mesa 10.2.0rc4-1

upstream update 10.2.0rc4

Modified:
  lib32-mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-24 18:54:40 UTC (rev 111791)
+++ PKGBUILD	2014-05-24 19:24:49 UTC (rev 111792)
@@ -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.0rc3
+pkgver=10.2.0rc4
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
@@ -14,8 +14,8 @@
 license=('custom')
 options=('!libtool')
 #source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2)
-source=(ftp://ftp.freedesktop.org/pub/mesa/10.2/MesaLib-10.2.0-rc3.tar.bz2)
-md5sums=('266264483d5f1e3513f48f95392c15a2')
+source=(ftp://ftp.freedesktop.org/pub/mesa/10.2/MesaLib-10.2.0-rc4.tar.bz2)
+md5sums=('21be494c630a4a4658b3ed6ad0b24669')
 
 build() {
   export CC="gcc -m32"
@@ -112,16 +112,22 @@
   conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
   replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
 
-  mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+  install -m755 -d ${pkgdir}/usr/lib32/{gallium-pipe,gbm}
+  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/pkgconfig ${pkgdir}/usr/lib32/
+  
+  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/swrast_dri* ${pkgdir}/usr/lib32/xorg/modules/dri/
+
   install -m755 -d ${pkgdir}/usr/lib32/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv -v ${pkgdir}/usr/lib32/libGL.so*    ${pkgdir}/usr/lib32/mesa/
-  mv -v ${pkgdir}/usr/lib32/libEGL.so*   ${pkgdir}/usr/lib32/mesa/
-  mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib32/libGL.so*    ${pkgdir}/usr/lib32/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib32/libEGL.so*   ${pkgdir}/usr/lib32/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
 
-  rm -r ${pkgdir}/etc
-  rm -r ${pkgdir}/usr/include
-
   install -m755 -d "${pkgdir}/usr/share/licenses"
   ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa"
 }