summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyp2016-06-29 08:39:21 +0200
committerRyp2016-06-29 08:39:21 +0200
commite41fad86cef750cd25edf9306f90e55174997212 (patch)
tree3e3c6a16d68da6f8ac902e0120854310cb90957a
parent075311eaac42b600428daab875396557fb6dcfcd (diff)
downloadaur-e41fad86cef750cd25edf9306f90e55174997212.tar.gz
Revert "PR Carlo Casta: Provide glm from the gli package directly to avoid mismatches."
This reverts commit 075311eaac42b600428daab875396557fb6dcfcd.
-rw-r--r--PKGBUILD21
1 files changed, 6 insertions, 15 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 8240136a53a5..b3f0602ec8ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,21 @@
# Maintainer: Thibault 'Ryp' Schueller <ryp.sqrt@gmail.com>
-# Contributor: Carlo Casta <carlo.casta@gmail.com>
pkgname=gli
-pkgver=0.8.1.0
+pkgver=0.7.0.0
pkgrel=1
pkgdesc="OpenGL Image (GLI) is a header only C++ image library for graphics software"
arch=('any')
license=('MIT')
url="http://gli.g-truc.net"
-provides=('glm=0.9.8.0')
-conflicts=('glm')
-source=("https://github.com/g-truc/gli/releases/download/${pkgver}/gli-${pkgver}.zip")
-sha512sums=('a3a0219903ebd445e377469047d482e5033441c0f610fc0f39b527ef20327892f9817b026a77c22198fec9ed1841d923c274e2b3fe0ed219309846348747c186')
+depends=('glm>=0.9.7.0')
+source=("https://github.com/g-truc/gli/archive/$pkgver.tar.gz")
+sha512sums=('5d8874081f25c30a761edec9282486d2b8ee9e2b7915c14f140daff0a28c89cf5f35430e84d4f4eca7e66a563ddcfd0d9b8e76b9d7352f0b609691460036776e')
package() {
- cd $pkgname
-
+ cd $pkgname-$pkgver
mkdir -p $pkgdir/usr/include/gli
cp -r gli $pkgdir/usr/include
rm -f $pkgdir/usr/include/gli/CMakeLists.txt
-
- # gli provides a custom / git version of GLM
- mkdir -p $pkgdir/usr/include/glm
- cp -r external/glm/glm $pkgdir/usr/include
- rm -f $pkgdir/usr/include/glm/CMakeLists.txt
-
find $pkgdir -type f -exec chmod 644 {} \;
find $pkgdir -type d -exec chmod 755 {} \;
-} \ No newline at end of file
+}