summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Theodorou2021-07-14 00:59:59 +0200
committerAngelo Theodorou2021-07-14 00:59:59 +0200
commitac10185bb588bd6dc8294bade529393fe7dc24a1 (patch)
tree7f98e681e3024ed817826f447a408d12d5551ed3
parent9e76e85303841cc5d384b796960a88fe97eb20bc (diff)
downloadaur-ac10185bb588bd6dc8294bade529393fe7dc24a1.tar.gz
Update CMake variables for new template scripts
- Change git describe command for pkgver function
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e36e571f0124..619534f97a2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ncinvaders-git
pkgdesc = A simplified version of Space Invaders made with the nCine
- pkgver = r2.9c3d273
+ pkgver = r34.7b9c639
pkgrel = 1
url = http://ncine.github.io
arch = i686
@@ -16,4 +16,3 @@ pkgbase = ncinvaders-git
md5sums = SKIP
pkgname = ncinvaders-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 074ac7a99f49..8dd0d030f239 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Angelo Theodorou <encelo@gmail.com>
pkgname=ncinvaders-git
-pkgver=r2.9c3d273
+pkgver=r34.7b9c639
pkgrel=1
pkgdesc="A simplified version of Space Invaders made with the nCine"
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ md5sums=('SKIP')
pkgver() {
cd "$srcdir/ncInvaders"
( set -o pipefail
- git describe --tags --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+ git describe --tags --long --exact-match 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
)
}
@@ -32,9 +32,10 @@ build() {
cmake ../ncInvaders\
-DCMAKE_BUILD_TYPE=Release\
- -DPACKAGE_BUILD_ANDROID=OFF\
- -DPACKAGE_STRIP_BINARIES=ON\
- -DPACKAGE_DEFAULT_DATA_DIR=/usr/share/ncinvaders/data\
+ -DCMAKE_PREFIX_PATH=/usr/lib/cmake/nCine\
+ -DNCPROJECT_BUILD_ANDROID=OFF\
+ -DNCPROJECT_STRIP_BINARIES=ON\
+ -DNCPROJECT_DEFAULT_DATA_DIR=/usr/share/ncinvaders/data\
-DCMAKE_INSTALL_PREFIX=/usr
make
}