diff options
| -rw-r--r-- | ham/direwolf/Makefile.patch | 112 | ||||
| -rw-r--r-- | ham/direwolf/direwolf.SlackBuild | 6 | ||||
| -rw-r--r-- | ham/direwolf/direwolf.info | 6 | ||||
| -rw-r--r-- | ham/direwolf/doinst.sh | 1 |
4 files changed, 63 insertions, 62 deletions
diff --git a/ham/direwolf/Makefile.patch b/ham/direwolf/Makefile.patch index e58ef7271c..09f7d75d20 100644 --- a/ham/direwolf/Makefile.patch +++ b/ham/direwolf/Makefile.patch @@ -1,8 +1,8 @@ ---- Makefile.linux 2014-04-13 22:13:06.000000000 -0500 -+++ Makefile.linux.fixed 2014-07-22 22:39:30.875648118 -0500 -@@ -4,8 +4,26 @@ +--- direwolf-1.1/Makefile.linux 2014-11-21 21:36:04.000000000 -0600 ++++ Makefile.linux 2015-05-14 19:30:26.500837838 -0500 +@@ -4,7 +4,26 @@ - all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients + all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx -CC = gcc +CC ?= gcc @@ -19,69 +19,63 @@ +appdir ?= /usr/share/applications +sysconfdir ?= ~ +LINK_IN_HOME ?= yes - ++ +ifeq ($(LINK_IN_HOME),yes) -+ HOME_DESKTOP = ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop ++ HOME_DESKTOP = ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop +else -+ HOME_DESKTOP = ++ HOME_DESKTOP = +endif + # # The DSP filters can be sped up considerably with the SSE - # instructions. The SSE instructions were introduced in 1999 -@@ -78,12 +96,14 @@ +@@ -78,15 +97,17 @@ # cause compatibility issues for those with older computers. # -arch := $(shell echo | gcc -E -dM - | grep __i386__) +arch ?= $(shell echo | gcc -E -dM - | grep __i386__) +-ifneq ($(arch),) +ifndef CFLAGS - ifneq ($(arch),) --CFLAGS := -DUSE_ALSA -O3 -march=pentium3 -pthread -+ CFLAGS := -DUSE_ALSA -O3 -march=pentium3 -pthread - else --CFLAGS := -DUSE_ALSA -O3 -pthread -+ CFLAGS := -DUSE_ALSA -O3 -pthread -+endif ++ ifneq ($(arch),) + # You might see improvement with -march fine tuned to your hardware. + # Probably should keep pentium3 if you will be redistributing binaries + # to other people. +-CFLAGS := -O3 -march=pentium3 -pthread -Iutm +-else +-CFLAGS := -O3 -pthread -Iutm ++ CFLAGS := -O3 -march=pentium3 -pthread -Iutm ++ else ++ CFLAGS := -O3 -pthread -Iutm ++ endif endif -@@ -131,37 +151,40 @@ - LatLong-UTMconversion.o : utm/LatLong-UTMconversion.c - $(CC) $(CFLAGS) -c -o $@ $^ - -- - # Optional install step. +@@ -150,27 +171,31 @@ # TODO: Review file locations. - # TODO: Handle Linux variations correctly. - # The Raspberry Pi has ~/Desktop but Ubuntu does not. - # For now, just put reference to it at the end so only last step fails. --install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop -- sudo install direwolf /usr/local/bin -- sudo install decode_aprs /usr/local/bin -- sudo install text2tt /usr/local/bin -- sudo install tt2text /usr/local/bin -- sudo install ll2utm /usr/local/bin -- sudo install utm2ll /usr/local/bin -- sudo install aclients /usr/local/bin -- sudo install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt -- sudo install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt -- sudo install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt -- sudo install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png -- sudo install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop -- cp direwolf.conf ~ -- cp dw-start.sh ~ -- sudo install -D --mode=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt -- sudo install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt -- sudo install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt -- sudo install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf -- sudo install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf -- sudo install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf -- sudo install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf -- ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop -- -+install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop + install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop +- install direwolf /usr/local/bin +- install decode_aprs /usr/local/bin +- install text2tt /usr/local/bin +- install tt2text /usr/local/bin +- install ll2utm /usr/local/bin +- install utm2ll /usr/local/bin +- install aclients /usr/local/bin +- install log2gpx /usr/local/bin +- 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 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt +- install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt +- install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt +- install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf +- install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf +- install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf +- install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf +- install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf + $(INSTALL_DIR) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) direwolf $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) decode_aprs $(DESTDIR)$(bindir)/ @@ -90,6 +84,7 @@ + $(INSTALL_PROGRAM) ll2utm $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) utm2ll $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) aclients $(DESTDIR)$(bindir)/ ++ $(INSTALL_PROGRAM) log2gpx $(DESTDIR)$(bindir)/ + $(INSTALL_DIR) $(DESTDIR)$(datadir) + $(INSTALL_DATA) tocalls.txt $(DESTDIR)$(datadir)/ + $(INSTALL_DATA) symbols-new.txt $(DESTDIR)$(datadir)/ @@ -97,18 +92,25 @@ + $(INSTALL_DATA) dw-icon.png $(DESTDIR)$(datadir)/ + $(INSTALL_DIR) $(DESTDIR)$(appdir) + $(INSTALL_DATA) direwolf.desktop $(DESTDIR)$(appdir)/ -+ $(INSTALL_DIR) $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) direwolf.conf $(DESTDIR)$(sysconfdir)/ -+ $(INSTALL_DATA) dw-start.sh $(DESTDIR)$(sysconfdir)/ + $(INSTALL_DIR) $(DESTDIR)$(docdir) + $(INSTALL_DATA) CHANGES.txt $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) LICENSE-dire-wolf.txt $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) LICENSE-other.txt $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) User-Guide.pdf $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) Raspberry-Pi-APRS.pdf $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) APRStt-Implementation-Notes.pdf $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) Quick-Start-Guide-Windows.pdf $(DESTDIR)$(docdir)/ -+ $(HOME_DESKTOP) - # Separate application to decode raw data. + # The Raspberry Pi has ~/Desktop but Ubuntu does not. +@@ -183,7 +208,8 @@ + ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop + + install-conf : direwolf.conf +- cp direwolf.conf ~ ++ $(INSTALL_DIR) $(DESTDIR)$(sysconfdir) ++ $(INSTALL_DATA) direwolf.conf $(DESTDIR)$(sysconfdir)/ + + + # Separate application to decode raw data. diff --git a/ham/direwolf/direwolf.SlackBuild b/ham/direwolf/direwolf.SlackBuild index 127403989c..1a45dc3c43 100644 --- a/ham/direwolf/direwolf.SlackBuild +++ b/ham/direwolf/direwolf.SlackBuild @@ -21,7 +21,7 @@ # that is unlikely, as I am rather tall. PRGNAM=direwolf -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,7 +70,7 @@ find -L . \ # Fix some silly Makefile choices patch -p0 < $CWD/Makefile.patch -CFLAGS="$SLKCFLAGS -DUSE_ALSA -pthread" \ +CFLAGS="$SLKCFLAGS -DUSE_ALSA -pthread -Iutm" \ LDFLAGS="-L/lib${LIBDIRSUFFIX} -L/usr/lib${LIBDIRSUFFIX}" \ make -f Makefile.linux INSTALL=install \ @@ -78,7 +78,7 @@ INSTALL=install \ docdir=/usr/doc/$PRGNAM-$VERSION \ sysconfdir=/etc \ LINK_IN_HOME=no \ -make -f Makefile.linux install DESTDIR=$PKG +make -f Makefile.linux install install-conf DESTDIR=$PKG # direwolf comes with a lovely desktop # file that assumes LXDE. Use our own diff --git a/ham/direwolf/direwolf.info b/ham/direwolf/direwolf.info index bf0a0eb484..82bf651906 100644 --- a/ham/direwolf/direwolf.info +++ b/ham/direwolf/direwolf.info @@ -1,8 +1,8 @@ PRGNAM="direwolf" -VERSION="1.0" +VERSION="1.1" HOMEPAGE="http://home.comcast.net/~wb2osz/site/" -DOWNLOAD="http://home.comcast.net/~wb2osz/Version%201.0/direwolf-1.0-src.zip" -MD5SUM="9386fb7f56ae7df6008869c82836fb11" +DOWNLOAD="http://home.comcast.net/~wb2osz/Version%201.1/direwolf-1.1-src.zip" +MD5SUM="6ea127d4c952eec1e5fb07355045f41d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/ham/direwolf/doinst.sh b/ham/direwolf/doinst.sh index fa7b7058f4..63af7cb856 100644 --- a/ham/direwolf/doinst.sh +++ b/ham/direwolf/doinst.sh @@ -16,4 +16,3 @@ config etc/direwolf.conf.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi - |