ham/glrpt: Updated for version 2.6.1.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 34 insertions, 31 deletions

diff --git a/ham/glrpt/README b/ham/glrpt/README
index 9eac0f8a74..a2c7700dd0 100644
--- a/ham/glrpt/README
+++ b/ham/glrpt/README
@@ -1,11 +1,11 @@
-glrpt can decode images in real time as they are received from
-the satellite and display them incrementally as they form,
-slow-scan TV fashion.
+glrpt can decode images in real time as they are received from the
+satellite and display them incrementally as they form, slow-scan TV
+fashion.
 
 The images displayed in the glrpt window are scaled down by a factor
 specified in the ~/glrpt/glrptrc configuration file.
-The APID channel images stored in ~/glrpt/images/ are full sized and
-are saved either in the PGM (Portable Grey Map) format or JPEG format.
+The APID channel images stored in ~/glrpt/images/ are full sized and are
+saved either in the PGM (Portable Grey Map) format or JPEG format.
 A new JPEG compression code in glrpt allows both monochrome and color
 images to be saved as good quality jpeg files.
 Please note that the images/ directory can be a relative link to some
diff --git a/ham/glrpt/SoapySDR.diff.gz b/ham/glrpt/SoapySDR.diff.gz
deleted file mode 100644
index d600121434..0000000000
--- a/ham/glrpt/SoapySDR.diff.gz
+++ /dev/null
diff --git a/ham/glrpt/glrpt.SlackBuild b/ham/glrpt/glrpt.SlackBuild
index 212f9d17eb..49ffabf3d3 100644
--- a/ham/glrpt/glrpt.SlackBuild
+++ b/ham/glrpt/glrpt.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=glrpt
-VERSION=${VERSION:-2.5.4}
+VERSION=${VERSION:-2.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -56,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -66,9 +69,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -76,30 +81,28 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix SoapySDR
-zcat $CWD/SoapySDR.diff.gz | patch -p0 || exit
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --mandir=/usr/man \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS LICENSE README.md TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -name "Makefile" -exec rm {} \;
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/ham/glrpt/glrpt.info b/ham/glrpt/glrpt.info
index 901c70166c..40af7a91ec 100644
--- a/ham/glrpt/glrpt.info
+++ b/ham/glrpt/glrpt.info
@@ -1,10 +1,10 @@
 PRGNAM="glrpt"
-VERSION="2.5.4"
-HOMEPAGE="https://www.qsl.net/5b4az/"
-DOWNLOAD="https://www.qsl.net/5b4az/pkg/lrpt/glrpt-2.5.4.tar.bz2"
-MD5SUM="6fe52f57808f163ca129981132d227ac"
+VERSION="2.6.1"
+HOMEPAGE="https://github.com/dvdesolve/glrpt"
+DOWNLOAD="https://github.com/dvdesolve/glrpt/archive/v2.6.1/glrpt-2.6.1.tar.gz"
+MD5SUM="927acabd14d2733e9898d556fb7f3b4f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SoapySDR"
+REQUIRES="libconfig SoapySDR"
 MAINTAINER="Andrea Sacchetti Picchio"
-EMAIL="andreaN.OsacchettipicchioSP@AMgmail.com (remove NO and SPAM)"
+EMAIL="andrea dot sacchettipicchio at gmail dot com"