From 1f95c62217f38e060a982123a52265550010bc6b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 10 Jan 2014 00:45:39 -0200 Subject: lib32-mesa-demos-libre-8.1.0-3: updating revision * fix conflicting files with mesa-demos * lib32-glew rebuild * add mksource --- libre/lib32-mesa-demos-libre/PKGBUILD | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'libre/lib32-mesa-demos-libre') diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD index d5efffe26..a85fb1ba6 100644 --- a/libre/lib32-mesa-demos-libre/PKGBUILD +++ b/libre/lib32-mesa-demos-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $ +# $Id: PKGBUILD 94584 2013-07-27 15:01:38Z lcarlier $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgbasename=mesa-demos-libre pkgname=lib32-$_pkgbasename pkgver=8.1.0 -pkgrel=1 +pkgrel=3 arch=(x86_64) pkgdesc="Mesa demos and tools (32-bit), without nonfree demos" url="http://mesa3d.sourceforge.net" @@ -14,11 +14,9 @@ license=('custom') provides=("lib32-mesa-demos=$pkgver") replaces=('lib32-mesa-demos') conflicts=('lib32-mesa-demos') -makedepends=(gcc-multilib 'lib32-mesa-libgl>=9.1' 'lib32-glew' 'libgl>=9.1') -source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2 - mesa-demos-libre.patch) -md5sums=('9df33ba69a26bbfbc7c8148602e59542' - '5ce0660b46beb1230194fbd852d33ab0') +makedepends=(gcc-multilib 'lib32-mesa') +source=(https://repo.parabolagnulinux.org/sources/mesa-demos-libre-${pkgver}.tar.bz2) +md5sums=('18225619a97e6900afd2b48a89dcbd4e') build() { export CC="gcc -m32" @@ -26,14 +24,7 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd "${srcdir}/mesa-demos-${pkgver}" - - # Remove nonfree demos (pointblast and spriteblast) - rm -v src/demos/{pointblast,spriteblast}.c - patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" - - ./configure --prefix=/usr \ - --enable-gles1 \ - --enable-gles2 + ./configure --prefix=/usr make } @@ -48,6 +39,8 @@ package() { mv "$i" "$i"32 done + rm -r "$pkgdir/usr/share/mesa-demos" + mkdir -p "$pkgdir/usr/share/licenses" ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos" } -- cgit v1.2.3