Update to 04.14a

4 files changed, 16 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30e20db0a2eb..820c5d48db99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Mon Jun 20 14:07:06 UTC 2016
+# Wed Feb  7 15:02:10 UTC 2018
 pkgbase = linrad
 	pkgdesc = Software defined radio receiver for x11
-	pkgver = 04.10
+	pkgver = 04.14a
 	pkgrel = 1
 	url = http://www.sm5bsz.com/linuxdsp/linrad.htm
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = nasm
@@ -13,15 +12,13 @@ pkgbase = linrad
 	depends = portaudio
 	depends = libxext
 	depends = libusb-compat
-	depends = svgalib
-	provides = linrad,
-	provides = linrad-svga
-	source = http://www.sm5bsz.com/linuxdsp/archive/lir04-10.tbz
+	provides = linrad
+	source = http://www.sm5bsz.com/linuxdsp/archive/lir04-14a.tbz
 	source = linrad.png
 	source = linrad.desktop
-	sha512sums = 98e986fe61a238d2b9a67f09176ad649129f1d9c740807d49be7cb848c79ec9ced78d57f1ba7ac39a6037efe89afbf6593206d006f1e0443ae496464668ed936
+	sha512sums = 1a26635be30a51b4ffd02e3d21e118f717a2cc267929c4ff9214d76690fe7af54885b1d2fb4846a139a283c66e904445ebfbd1fed7116ebd0ad9beeaec956f99
 	sha512sums = 463d107e1732a35c53d23da32af93e1c18fa2e04d7977a1649ee06ac6a8ea5c11191102e51d124afc033ee038e63fdca2756e42de72b56b567b6b47a7b4e350f
-	sha512sums = f89ad218e4e02dd6502397509da443a44a51689078587913898de29d392e32b33348536fab09a23c7964abdc9349b146ef24b699f3d5d9a457a9a5eec4906f16
+	sha512sums = 16431308bfb2f1b168fd5730bc0b6992702fa71047482330e0e73b6fb725c0f24c0be7f982c3c0c7de45f3ca5a110ebc93242d4ca89e5e4634c7235a6a855135
 
 pkgname = linrad
 
diff --git a/.gitignore b/.gitignore
index 018a3de08144..3f7154f862fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 !PKGBUILD
 !.SRCINFO
 !.gitignore
+!*.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 3c80db047ec3..d175d7f553ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # Maintainer: Carsten Feuls <archlinux@carstenfeuls.de>
 
 pkgname=linrad
-pkgver=04.10
+pkgver=04.14a
 pkgrel=1
 pkgdesc="Software defined radio receiver for x11"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.sm5bsz.com/linuxdsp/linrad.htm"
 license=('custom')
-depends=('portaudio' 'libxext' 'libusb-compat' 'svgalib')
+depends=('portaudio' 'libxext' 'libusb-compat')
 makedepends=('nasm' 'autoconf')
-provides=('linrad', 'linrad-svga')
+provides=('linrad')
 # Check the developer website for the latest version
 source=(http://www.sm5bsz.com/linuxdsp/archive/lir${pkgver/./-}.tbz
               $pkgname.png
               $pkgname.desktop)
-sha512sums=('98e986fe61a238d2b9a67f09176ad649129f1d9c740807d49be7cb848c79ec9ced78d57f1ba7ac39a6037efe89afbf6593206d006f1e0443ae496464668ed936'
+sha512sums=('1a26635be30a51b4ffd02e3d21e118f717a2cc267929c4ff9214d76690fe7af54885b1d2fb4846a139a283c66e904445ebfbd1fed7116ebd0ad9beeaec956f99'
             '463d107e1732a35c53d23da32af93e1c18fa2e04d7977a1649ee06ac6a8ea5c11191102e51d124afc033ee038e63fdca2756e42de72b56b567b6b47a7b4e350f'
-            'f89ad218e4e02dd6502397509da443a44a51689078587913898de29d392e32b33348536fab09a23c7964abdc9349b146ef24b699f3d5d9a457a9a5eec4906f16')
+            '16431308bfb2f1b168fd5730bc0b6992702fa71047482330e0e73b6fb725c0f24c0be7f982c3c0c7de45f3ca5a110ebc93242d4ca89e5e4634c7235a6a855135')
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,15 +27,7 @@ prepare() {
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
-    if [ "$(uname -m)" = "x86_64" ]; then
-        make linrad64
-        mv linrad64 linrad
-        make xlinrad64
-        mv xlinrad64 xlinrad
-    else
-        make linrad
-        make xlinrad
-    fi
+    make xlinrad64
 }
 
 package(){
@@ -44,7 +36,7 @@ package(){
     mkdir -p $pkgdir/usr/share/$pkgname
     cp -a $srcdir/$pkgname-$pkgver/*.lir $pkgdir/usr/share/$pkgname/
     mkdir -p $pkgdir/usr/bin
-    cp -a $srcdir/$pkgname-$pkgver/{,x}linrad $pkgdir/usr/bin/
+    cp -a $srcdir/$pkgname-$pkgver/xlinrad64 $pkgdir/usr/bin/
     mkdir -p $pkgdir/usr/share/pixmaps
     mkdir -p $pkgdir/usr/share/applications
     install -Dm644 $pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
diff --git a/linrad.desktop b/linrad.desktop
index d77ec95105ee..b2ab2c6f01ec 100644
--- a/linrad.desktop
+++ b/linrad.desktop
@@ -4,7 +4,7 @@ Name[en_US]=Linrad
 Comment=Software defined radio interface
 Comment[en_US]=Software defined radio interface
 Encoding=UTF-8
-Exec=/opt/linrad/linrad-03.45/xlinrad
+Exec=/usr/bin/xlinrad
 Icon=linrad.png
 MimeType=text
 StartupNotify=true