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

[Laurent Carlier]

    Date: Wednesday, February 27, 2013 @ 16:10:40
  Author: lcarlier
Revision: 85175

upgpkg: lib32-mesa-demos 8.1.0-2

Fix conflicting files with mesa-demos

Modified:
  lib32-mesa-demos/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-27 15:10:10 UTC (rev 85174)
+++ PKGBUILD	2013-02-27 15:10:40 UTC (rev 85175)
@@ -5,12 +5,13 @@
 _pkgbasename=mesa-demos
 pkgname=lib32-$_pkgbasename
 pkgver=8.1.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc="Mesa demos and tools (32-bit)"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-makedepends=(gcc-multilib 'lib32-mesa-libgl>=9.1' 'lib32-glew' 'libgl>=9.1')
+depends=('lib32-libgl' 'lib32-glew' 'mesa-demos')
+makedepends=(gcc-multilib 'lib32-mesa')
 source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2)
 md5sums=('9df33ba69a26bbfbc7c8148602e59542')
 
@@ -20,9 +21,7 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/mesa-demos-${pkgver}"
-  ./configure --prefix=/usr \
-    --enable-gles1 \
-    --enable-gles2
+  ./configure --prefix=/usr 
 
   make
 }
@@ -37,6 +36,8 @@
     mv "$i" "$i"32
   done
 
+  rm -r "$pkgdir/usr/share/mesa-demos"
+
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }