Change to make it compile for 0.999

2 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50e166ff008b..61c76a23705e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Oct 15 12:07:22 UTC 2016
+# Tue Jul 25 04:05:33 UTC 2017
 pkgbase = sdr-j-dabreceiver
-	pkgdesc = The DAB decoding software (SDR-J)
-	pkgver = 0.997
+	pkgdesc = software dab decoder for use with a dabstick, airspy or sdrplay for RPI and PC
+	pkgver = 0.999
 	pkgrel = 0
 	url = http://www.sdr-j.tk/
 	arch = x86_64
@@ -16,8 +16,8 @@ pkgbase = sdr-j-dabreceiver
 	depends = rtl-sdr
 	conflicts = dabstick-radio
 	replaces = dabstick-radio
-	source = https://github.com/JvanKatwijk/sdr-j-dab/archive/V0.997.tar.gz
-	md5sums = 45133eab902bd1b0084d9cca9c20b5a3
+	source = https://github.com/JvanKatwijk/qt-dab/archive/qt-dab-0.999.tar.gz
+	md5sums = bdde4c1f5abf4141c4a18c6c1ac96ff7
 
 pkgname = sdr-j-dabreceiver
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d9da3c68c1b..d7ead6567bde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Swift Geek <swifgeek  google c m>
 
 pkgname=sdr-j-dabreceiver
-pkgver=0.997
+pkgver=0.999
 pkgrel=0
-pkgdesc="The DAB decoding software (SDR-J)"
+pkgdesc="software dab decoder for use with a dabstick, airspy or sdrplay for RPI and PC"
 arch=('x86_64')
 url="http://www.sdr-j.tk/"
 license=('GPL2')
@@ -11,33 +11,34 @@ depends=('fftw' 'qwt-qt5' 'faad2' 'portaudio' 'qt5-quick1' 'rtl-sdr')
 conflicts=('dabstick-radio')
 replaces=('dabstick-radio')
 makedepends=('cmake')
-source=("https://github.com/JvanKatwijk/sdr-j-dab/archive/V${pkgver}.tar.gz")
-md5sums=('45133eab902bd1b0084d9cca9c20b5a3')
+source=("https://github.com/JvanKatwijk/qt-dab/archive/qt-dab-${pkgver}.tar.gz")
+md5sums=('bdde4c1f5abf4141c4a18c6c1ac96ff7')
 
 build() {
   export CFLAGS="${CFLAGS} -Wno-unused" # Tons of unnecessary warnings, breaking terminal output :D
   export CXXFLAGS="${CFLAGS}"
 
-  cd "$srcdir/sdr-j-dab-${pkgver}/"
+  cd "$srcdir/qt-dab-qt-dab-${pkgver}/"
+  ln -sf CMakeLists.txt-qt5 ./CMakeLists.txt
 
-  # Toggle build-in features/device support
-  sed -i '/set(SDRPLAY true)/d' CMakeLists.txt
-#  sed -i '/set(AIRSPY true)/d' CMakeLists.txt
-#  sed -i '/set(DABSTICK true)/d' CMakeLists.txt
-#  sed -i '/^#.*set(RTLTCP true)/s/^#//' CMakeLists.txt # THIS ONE UNCOMMENTS
-#  sed -i '/set(SPECTRUM true)/d' CMakeLists.txt
-  sed -i '/set (objectName sdr-j-dabreceiver-/c\set (objectName sdr-j-dabreceiver)' CMakeLists.txt
 
   # Actual build
   mkdir -p build
   cd build
-  cmake -DAIRSPYLIB_INCLUDE_DIR='/usr/include/libairspy/' ../
+  cmake_flags=(
+    -DSPECTRUM=ON
+    -DRTLTCP=ON
+#    -DDABSTICK=ON
+#    -DAIRSPY=ON
+  )
+
+  cmake ${cmake_flags[@]} ../
+
   make -j1 # Is this workaround still needed!?
 }
 
 package () {
   install -d "$pkgdir/usr/bin"
 
-#  install -m 755 "$srcdir/sdr-j-dab-${pkgver}/build/sdr-j-dabreceiver-${pkgver}" "$pkgdir/usr/bin/sdr-j-dabreceiver"
-  install -m 755 "$srcdir/sdr-j-dab-${pkgver}/build/sdr-j-dabreceiver" "$pkgdir/usr/bin/sdr-j-dabreceiver"
+  install -m 755 "$srcdir/qt-dab-qt-dab-${pkgver}/build/qt-dab-${pkgver}" "$pkgdir/usr/bin/qt-dab"
 }