summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre-multilib/lib32-mesa-demos/PKGBUILD (renamed from libre-multilib/lib32-mesa-demos-libre/PKGBUILD)17
-rw-r--r--libre-multilib/lib32-mesa-demos/libre.patch (renamed from libre-multilib/lib32-mesa-demos-libre/libre.patch)0
2 files changed, 8 insertions, 9 deletions
diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos/PKGBUILD
index badab3a2e..07230a3d7 100644
--- a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre-multilib/lib32-mesa-demos/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 115314 2014-07-08 15:30:12Z bluewind $
+# $Id: PKGBUILD 117596 2014-08-19 02:28:18Z fyan $
# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgbasename=mesa-demos-libre
+_pkgbasename=mesa-demos
pkgname=lib32-$_pkgbasename
pkgver=8.2.0
-pkgrel=2
+pkgrel=2.parabola1
arch=(x86_64)
pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
url="http://mesa3d.sourceforge.net"
license=('custom')
-provides=("lib32-mesa-demos=$pkgver")
-replaces=('lib32-mesa-demos')
-conflicts=('lib32-mesa-demos')
-depends=('lib32-libgl' 'lib32-glew' 'mesa-demos-libre')
+replaces=('lib32-mesa-demos-libre')
+conflicts=('lib32-mesa-demos-libre')
+depends=('lib32-libgl' 'lib32-glew' 'mesa-demos')
makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew')
source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2
libre.patch)
@@ -39,7 +38,7 @@ build() {
}
package() {
- depends=('lib32-glew' mesa-demos-libre)
+ depends=('lib32-glew' mesa-demos)
cd "${srcdir}/mesa-demos-${pkgver}"
make DESTDIR="${pkgdir}" install
@@ -51,5 +50,5 @@ package() {
rm -r "$pkgdir/usr/share/mesa-demos"
mkdir -p "$pkgdir/usr/share/licenses"
- ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos"
+ ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
}
diff --git a/libre-multilib/lib32-mesa-demos-libre/libre.patch b/libre-multilib/lib32-mesa-demos/libre.patch
index 43e2d1e37..43e2d1e37 100644
--- a/libre-multilib/lib32-mesa-demos-libre/libre.patch
+++ b/libre-multilib/lib32-mesa-demos/libre.patch