[upd] use cmake, [fix] game library path

3 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4286c9706e59..11b231817cac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = yamagi-quake2-ctf-git
 	arch = x86_64
 	license = GPL
 	license = custom
+	makedepends = cmake
 	depends = sh
 	depends = yamagi-quake2
 	provides = yamagi-quake2-ctf
@@ -16,7 +17,7 @@ pkgbase = yamagi-quake2-ctf-git
 	source = yamagi-quake2-ctf.desktop
 	sha256sums = SKIP
 	sha256sums = 9a9abd8d720a719180713163261fed154ec34787c82dda2b9465aefd9890b64c
-	sha256sums = da8c69eb05eb9aab8526616b2808c7535ae38c1e28b5e7db341ff633bc09be31
+	sha256sums = 1191c20ea0e7609d28b44d678ff02b2f06b95a7037d1adfd02e963a62b8f3af2
 
 pkgname = yamagi-quake2-ctf-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d7357d2c747..460160b83886 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=yamagi-quake2-ctf-git
-pkgver=1.02.r5.ge2b397d
+pkgver=1.05.r1.g6f1b2f1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Quake II - Three Wave Capture The Flag for yamagi-quake2 (development version)"
 url="http://www.yamagi.org/quake2/"
 license=('GPL' 'custom')
 depends=('sh' 'yamagi-quake2')
+makedepends=('cmake')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 source=(${pkgname%-*}::"git+https://github.com/yquake2/ctf.git"
@@ -15,26 +16,33 @@ source=(${pkgname%-*}::"git+https://github.com/yquake2/ctf.git"
         "${pkgname%-*}.desktop")
 sha256sums=('SKIP'
             '9a9abd8d720a719180713163261fed154ec34787c82dda2b9465aefd9890b64c'
-            'da8c69eb05eb9aab8526616b2808c7535ae38c1e28b5e7db341ff633bc09be31')
+            '1191c20ea0e7609d28b44d678ff02b2f06b95a7037d1adfd02e963a62b8f3af2')
 
 pkgver() {
   cd ${pkgname%-*}
   git describe --long --tags | sed 's/^CTF_//;s/_/./;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  rm -rf build
+  mkdir -p build
+}
+
 build() {
-  make -C ${pkgname%-*}
+  cd build
+  cmake ../${pkgname%-*} -DCMAKE_BUILD_TYPE=Release
+  make
 }
 
 package() {
+  # game library
+  install -Dm644 build/Release/game.so "$pkgdir"/usr/lib/yamagi-quake2/ctf/game.so
+
   cd ${pkgname%-*}
 
   # game launcher
   install -Dm755 ../${pkgname%-*}.sh "$pkgdir"/usr/bin/${pkgname%-*}
 
-  # game library
-  install -Dm644 release/game.so "$pkgdir"/usr/share/yamagi-quake2/ctf/game.so
-
   # doc
   install -Dm644 README "$pkgdir"/usr/share/doc/${pkgname%-*}/README
 
diff --git a/yamagi-quake2-ctf.desktop b/yamagi-quake2-ctf.desktop
index 4c857c13d1d0..26704ba54dc1 100644
--- a/yamagi-quake2-ctf.desktop
+++ b/yamagi-quake2-ctf.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Type=Application
-Version=1.0
 Name=Quake II - Three Wave Capture The Flag
 Comment=Yamagi Quake II
 Icon=yamagi-quake2