Updated to 1.5

3 files changed, 77 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2372d813fde..a2b93d5f0b49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = direwolf
 	pkgdesc = Dire Wolf is a software modem/TNC and APRS encoder/decoder
-	pkgver = 1.4
+	pkgver = 1.5
 	pkgrel = 1
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
@@ -13,16 +13,16 @@ pkgbase = direwolf
 	makedepends = patch
 	depends = alsa-lib
 	depends = gpsd
-	source = https://github.com/wb2osz/direwolf/archive/1.4.zip
+	source = https://github.com/wb2osz/direwolf/archive/1.5.zip
 	source = Makefile.patch
 	source = direwolf.service
 	source = direwolf-kiss.service
-	sha1sums = 0d05476f4030b423fe0fd3ccc14c49247a1c47f2
-	sha1sums = f94b193a8e49bae073de3cedff4394821d6148fa
+	sha1sums = 109e4119ead6ee98b952185faae059770d4292f1
+	sha1sums = 2b5290da15331d1cba0cef9d3607abc0441680b1
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
-	sha256sums = 4f11bbaab46ce097b525d6532da28fd87ff41afc3680824ab3367668954d3811
-	sha256sums = 5a4bee3543da1bbe9cd8bd5edb3bb9b502728841c4c34da332a19f34f876a140
+	sha256sums = ef74ffd75572531ed4a93fc28bc0ccb6eb70f3315cd7df4640a784f156d8f79a
+	sha256sums = 66573cdd7619784dd4967bdee219619c0f12fda7c953374380f40949a5c8a9bb
 	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
 	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
 
diff --git a/Makefile.patch b/Makefile.patch
index 6c34dfb8accb..f6c0e3f9e921 100644
--- a/Makefile.patch
+++ b/Makefile.patch
@@ -1,20 +1,63 @@
-diff -Nurd direwolf-1.3.orig/Makefile.linux direwolf-1.3/Makefile.linux
---- direwolf-1.3.orig/Makefile.linux	2016-05-03 00:08:29.000000000 +0000
-+++ direwolf-1.3/Makefile.linux	2016-10-18 20:56:54.709562096 +0000
-@@ -490,11 +490,11 @@
+Only in direwolf-1.5: aclients
+Only in direwolf-1.5: atest
+Only in direwolf-1.5: ax25_link.o
+Only in direwolf-1.5: cm108
+Only in direwolf-1.5: cm108.o
+Only in direwolf-1.5: decode_aprs
+Only in direwolf-1.5: direwolf
+Only in direwolf-1.5: direwolf.conf
+Only in direwolf-1.5: direwolf.desktop
+Only in direwolf-1.5: dtime_now.o
+Only in direwolf-1.5: dwgpsd.o
+Only in direwolf-1.5: error_string.o
+Only in direwolf-1.5: gen_packets
+Only in direwolf-1.5: geotranz.a
+Only in direwolf-1.5: kissutil
+Only in direwolf-1.5: ll2utm
+Only in direwolf-1.5: log2gpx
+diff -ur direwolf-1.5.org/Makefile.linux direwolf-1.5/Makefile.linux
+--- direwolf-1.5.org/Makefile.linux	2018-10-08 16:15:21.000000000 +0200
++++ direwolf-1.5/Makefile.linux	2018-10-18 08:58:37.487067005 +0200
+@@ -272,17 +272,6 @@
+ endif
+ 
+ 
+-# Enable GPS if header file is present.
+-# Finding libgps.so* is more difficult because it
+-# is in different places on different operating systems.
+-
+-enable_gpsd := $(wildcard /usr/include/gps.h)
+-ifneq ($(enable_gpsd),)
+-CFLAGS += -DENABLE_GPSD
+-LDFLAGS += -lgps
+-endif
+-
+-
+ # Enable hamlib support if header file is present.
+ 
+ enable_hamlib := $(wildcard /usr/include/hamlib/rig.h /usr/local/include/hamlib/rig.h)
+@@ -680,7 +669,7 @@
+ # Set group and mode of HID devices corresponding to C-Media USB Audio adapters.
+ # This will allow us to use the CM108/CM119 GPIO pins for PTT.
  #
- # Misc. data such as "tocall" to system mapping.
- #
--	$(INSTALL) -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
--	$(INSTALL) -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
--	$(INSTALL) -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
--	$(INSTALL) -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
--	$(INSTALL) -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
-+	$(INSTALL) -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt
-+	$(INSTALL) -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt
-+	$(INSTALL) -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt
-+	$(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/dw-icon.png
-+	$(INSTALL) -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop
- #
- # Documentation.  Various plain text files and PDF.
+-	$(INSTALL) -D --mode=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
++#	$(INSTALL) -D --mode=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
  #
+ 	@echo " "
+ 	@echo "If this is your first install, not an upgrade, type this to put a copy"
+Only in direwolf-1.5: mgrs.o
+Only in direwolf-1.5: mheard.o
+Only in direwolf-1.5: misc.a
+Only in direwolf-1.5: polarst.o
+Only in direwolf-1.5: sock.o
+Only in direwolf-1.5: strlcat.o
+Only in direwolf-1.5: strlcpy.o
+Only in direwolf-1.5: text2tt
+Only in direwolf-1.5: tranmerc.o
+Only in direwolf-1.5: tt2text
+Only in direwolf-1.5: ttcalc
+Only in direwolf-1.5: ttcalc.o
+Only in direwolf-1.5: ups.o
+Only in direwolf-1.5: usng.o
+Only in direwolf-1.5: utm2ll
+Only in direwolf-1.5: utm.o
diff --git a/PKGBUILD b/PKGBUILD
index 377bba703fa9..a053393ab0f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Wijnand Modderman-Lenstra <maze@pyth0n.org>
 pkgname=direwolf
-pkgver=1.4
+pkgver=1.5
 pkgrel=1
 epoch=
 pkgdesc="Dire Wolf is a software modem/TNC and APRS encoder/decoder"
@@ -15,18 +15,18 @@ source=(
     'direwolf.service'
     'direwolf-kiss.service'
 )
-sha1sums=('0d05476f4030b423fe0fd3ccc14c49247a1c47f2'
-          'f94b193a8e49bae073de3cedff4394821d6148fa'
+sha1sums=('109e4119ead6ee98b952185faae059770d4292f1'
+          '2b5290da15331d1cba0cef9d3607abc0441680b1'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
-sha256sums=('4f11bbaab46ce097b525d6532da28fd87ff41afc3680824ab3367668954d3811'
-            '5a4bee3543da1bbe9cd8bd5edb3bb9b502728841c4c34da332a19f34f876a140'
+sha256sums=('ef74ffd75572531ed4a93fc28bc0ccb6eb70f3315cd7df4640a784f156d8f79a'
+            '66573cdd7619784dd4967bdee219619c0f12fda7c953374380f40949a5c8a9bb'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
 
 prepare() {
 	cd "$pkgname-$pkgver"
-	patch -p1 < ../Makefile.patch
+	patch -p1 < "$srcdir/Makefile.patch"
 }
 
 build() {
@@ -43,7 +43,10 @@ package() {
 	mkdir -p "$pkgdir/usr/bin"
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
 	mkdir -p "$pkgdir/var/log/direwolf"
-	make INSTALLDIR="$pkgdir/usr" install
+	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"
 
 	mkdir -p "$pkgdir/etc/direwolf"
 	install -D -m 644 direwolf.conf "$pkgdir/etc/direwolf/direwolf.conf"