Updated to 1.6

1 files changed, 24 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a053393ab0f6..d8862bd44020 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: Wijnand Modderman-Lenstra <maze@pyth0n.org>
 pkgname=direwolf
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
-epoch=
 pkgdesc="Dire Wolf is a software modem/TNC and APRS encoder/decoder"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/wb2osz/direwolf"
@@ -10,48 +9,44 @@ license=('GPL')
 depends=('alsa-lib' 'gpsd')
 makedepends=('make' 'gcc' 'patch')
 source=(
-    "https://github.com/wb2osz/direwolf/archive/$pkgver.zip"
-    'Makefile.patch'
+    "$pkgname-$pkgver.tar.gz::https://github.com/wb2osz/direwolf/archive/refs/tags/1.6.tar.gz"
+    'dwgpsd.patch'
     'direwolf.service'
     'direwolf-kiss.service'
 )
-sha1sums=('109e4119ead6ee98b952185faae059770d4292f1'
-          '2b5290da15331d1cba0cef9d3607abc0441680b1'
+sha1sums=('4290155b96289409a6d3a0a93cf9eb821829136e'
+          '5e77ccc6d861a60fb73c9c16423cf4894e1434e2'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
-sha256sums=('ef74ffd75572531ed4a93fc28bc0ccb6eb70f3315cd7df4640a784f156d8f79a'
-            '66573cdd7619784dd4967bdee219619c0f12fda7c953374380f40949a5c8a9bb'
+sha256sums=('208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660'
+            '8cacecc740bf067bec8f6daa834f591ca02da54a85cdf4367e2e827a8758df22'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
 prepare() {
-	cd "$pkgname-$pkgver"
-	patch -p1 < "$srcdir/Makefile.patch"
+    cd "$pkgname-$pkgver"
+    patch -p1 < "$srcdir/dwgpsd.patch"
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	make
-}
-
-check() {
-	:
+    cd "$pkgname-$pkgver"
+    mkdir -p build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX="/usr" \
+          -DCMAKE_BUILD_TYPE=Release \
+          ..
+    make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	mkdir -p "$pkgdir/usr/bin"
-	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-	mkdir -p "$pkgdir/var/log/direwolf"
-	make DESTDIR="$pkgdir/usr" enable_gpsd="" install
-
-    mkdir -p "$pkgdir/etc/udev/rules.d"
-    install -D -m 644 99-direwolf-cmedia.rules "$pkgdir/etc/udev/rules.d/99-direwolf-cmedia.rules"
+    cd "$pkgname-$pkgver/build"
+    make DESTDIR="$pkgdir" install
 
-	mkdir -p "$pkgdir/etc/direwolf"
-	install -D -m 644 direwolf.conf "$pkgdir/etc/direwolf/direwolf.conf"
+    mkdir -p "$pkgdir/etc/direwolf"
+    install -D -m 644 direwolf.conf "$pkgdir/etc/direwolf/direwolf.conf"
 
-	mkdir -p "$pkgdir/usr/lib/systemd/system"
-	install -D -m 644 ../direwolf.service "$pkgdir/usr/lib/systemd/system"
-	install -D -m 644 ../direwolf-kiss.service "$pkgdir/usr/lib/systemd/system"
+    cd "$srcdir"
+    mkdir -p "$pkgdir/usr/lib/systemd/system"
+    install -D -m 644 ../direwolf.service "$pkgdir/usr/lib/systemd/system"
+    install -D -m 644 ../direwolf-kiss.service "$pkgdir/usr/lib/systemd/system"
 }