Bump to 0.99

Update build process
Fetch tarball from github

2 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ee7c282d6b9..6abd4f51a229 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sdr-j-dabreceiver
 	pkgdesc = The DAB decoding software (SDR-J)
-	pkgver = 0.98
+	pkgver = 0.99
 	pkgrel = 0
 	url = http://www.sdr-j.tk/
 	arch = x86_64
@@ -10,10 +10,11 @@ pkgbase = sdr-j-dabreceiver
 	depends = qwt
 	depends = faad2
 	depends = portaudio
+	depends = qt5-quick1
 	conflicts = dabstick-radio
 	replaces = dabstick-radio
-	source = http://www.sdr-j.tk/sdr-j-dabreceiver-0.98.tgz
-	md5sums = 58fbef4cd8d418ddc23f5a85ec87c1b8
+	source = https://github.com/JvanKatwijk/sdr-j-dab/archive/V0.99.tar.gz
+	md5sums = 4e4ba826c8aa818188a9777de691ae6c
 
 pkgname = sdr-j-dabreceiver
 
diff --git a/PKGBUILD b/PKGBUILD
index 704172ba7048..7d3533d47ea4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,41 @@
 # Maintainer: Swift Geek <swifgeek  google c m>
 
 pkgname=sdr-j-dabreceiver
-pkgver=0.98
+pkgver=0.99
 pkgrel=0
 pkgdesc="The DAB decoding software (SDR-J)"
 arch=('x86_64')
 url="http://www.sdr-j.tk/"
 license=('GPL2')
-depends=('fftw' 'qwt' 'faad2' 'portaudio')
+depends=('fftw' 'qwt' 'faad2' 'portaudio' 'qt5-quick1')
 conflicts=('dabstick-radio')
 replaces=('dabstick-radio')
 makedepends=('cmake')
-source=("http://www.sdr-j.tk/sdr-j-dabreceiver-${pkgver}.tgz")
-md5sums=('58fbef4cd8d418ddc23f5a85ec87c1b8')
+source=("https://github.com/JvanKatwijk/sdr-j-dab/archive/V${pkgver}.tar.gz")
+md5sums=('4e4ba826c8aa818188a9777de691ae6c')
 
 build() {
   export CFLAGS="${CFLAGS} -Wno-unused" # Tons of unnecessary warnings, breaking terminal output :D
   export CXXFLAGS="${CFLAGS}"
 
-  # Large GUI
-  msg2 "Building large GUI"
-  cd "$srcdir/sdr-j-dabreceiver-${pkgver}/"
+  cd "$srcdir/sdr-j-dab-${pkgver}/"
+
+  # 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
+
+  # Actual build
   mkdir -p build
   cd build
-  cmake ../large-gui/
-  make -j1
-
-  # Small GUI
-  msg2 "Building small GUI"
-  cd "$srcdir/sdr-j-dabreceiver-${pkgver}/"
-  mkdir -p build-mini
-  cd build-mini
-  cmake ../small-gui/
-  make -j1
+  cmake -DAIRSPYLIB_INCLUDE_DIR='/usr/include/libairspy/' ../
+  make -j1 # Is this workaround still needed!?
 }
 
 package () {
   install -d "$pkgdir/usr/bin"
 
-  install -m 755 "$srcdir/sdr-j-dabreceiver-${pkgver}/build/sdr-j-dabreceiver-${pkgver}" "$pkgdir/usr/bin/sdr-j-dabreceiver"
-  install -m 755 "$srcdir/sdr-j-dabreceiver-${pkgver}/build-mini/sdr-j-dab-mini-${pkgver}" "$pkgdir/usr/bin/sdr-j-dabreceiver-mini"
+  install -m 755 "$srcdir/sdr-j-dab-${pkgver}/build/sdr-j-dabreceiver-${pkgver}" "$pkgdir/usr/bin/sdr-j-dabreceiver"
 }