CMake package guidelines

2 files changed, 7 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eeb0ce0de82d..b854476c147f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chipmachine
 	pkgdesc = Demoscene/Retro Music Player
 	pkgver = 1.4b3
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/sasq64/chipmachine
 	arch = x86_64
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 3c5ec9f80448..c15de7abbf1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=chipmachine
 pkgver=1.4b3
-pkgrel=5
+pkgrel=6
 pkgdesc='Demoscene/Retro Music Player'
 arch=('x86_64')
 url='https://github.com/sasq64/chipmachine'
@@ -22,24 +22,22 @@ prepare() {
   gendesk -f -n --pkgname="$pkgname" --pkgdesc="$pkgdesc" --categories="AudioVideo"
   mv ../apone-chipmachine-v1.4b3 apone
   patch -p0 -i ../apone-chipmachine-v1.4b3-datadir.patch
-  sed -i '/link_directories(\/usr\/local\/lib)/d' CMakeLists.txt  # remove insecure rpath
-  mkdir -p ../build
 }
 
 build() {
-  cd build
-
   # Workaround for gcc10 linking errors
   export CFLAGS+=" -fcommon"
 
-  cmake ../$pkgname-$pkgver
-  make
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=YES \
+    -Wno-dev
+  make -C build
 }
 
 package() {
   cd $pkgname-$pkgver
   install -Dm755 ../build/chipmachine "$pkgdir"/usr/bin/chipmachine
-#  install -Dm755 ../build/cm "$pkgdir"/usr/bin/cm
   install -d "$pkgdir"/usr/share/chipmachine
   cp -r data lua "$pkgdir"/usr/share/chipmachine/
   install -Dm644 chipmachine.desktop "$pkgdir"/usr/share/applications/chipmachine.desktop