Update

2 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5fa14796bdbd..e64de8e03542 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Jul  4 00:30:24 UTC 2016
 pkgbase = sdrangel-git
 	pkgdesc = Qt5/OpenGL SDR and signal analyzer frontend for Airspy, BladeRF, HackRF, RTL-SDR and FunCube
-	pkgver = r608.205fee6
+	pkgver = r1123.83d5703
 	pkgrel = 1
 	url = https://github.com/f4exb/sdrangel
 	arch = i686
@@ -13,12 +15,16 @@ pkgbase = sdrangel-git
 	depends = fftw
 	depends = log4cpp
 	depends = pkg-config
+	depends = lz4
+	depends = nanomsg
+	depends = dsdcc-git
+	depends = pulseaudio
 	depends = qt5-base
 	depends = qt5-tools
 	depends = qt5-multimedia
 	provides = sdrangel
 	conflicts = sdrangel
-	source = git+https://github.com/f4exb/sdrangel.git#branch=dev
+	source = git+https://github.com/f4exb/sdrangel.git
 	sha256sums = SKIP
 
 pkgname = sdrangel-git
diff --git a/PKGBUILD b/PKGBUILD
index 3943c31095d6..41db7d0a6ed0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Michal Krenek (Mikos) <m.krenek@gmail.com>
 pkgname=sdrangel-git
-pkgver=r608.205fee6
+pkgver=r1123.83d5703
 pkgrel=1
 pkgdesc="Qt5/OpenGL SDR and signal analyzer frontend for Airspy, BladeRF, HackRF, RTL-SDR and FunCube"
 arch=('i686' 'x86_64')
 url="https://github.com/f4exb/sdrangel"
 license=('GPL3')
-depends=('gnuradio-osmosdr' 'boost' 'fftw' 'log4cpp' 'pkg-config'
+depends=('gnuradio-osmosdr' 'boost' 'fftw' 'log4cpp' 'pkg-config' 'lz4' 'nanomsg' 'dsdcc-git' 'pulseaudio'
          'qt5-base' 'qt5-tools' 'qt5-multimedia')
 makedepends=('git' 'cmake')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/f4exb/sdrangel.git#branch=dev')
+source=('git+https://github.com/f4exb/sdrangel.git')
 sha256sums=('SKIP')
 
 pkgver() {
@@ -25,19 +25,17 @@ build() {
     cd build
     cmake .. \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
+        -DCMAKE_INSTALL_PREFIX=/opt/sdrangel \
+        -DLIBDSDCC_INCLUDE_DIR=/usr/include/dsdcc
     make
 }
 
 package() {
     cd "$srcdir/${pkgname%-git}/build"
-    for f in $(find . -name '*.so'); do
-        install -Dm755 "$f" "$pkgdir/opt/sdrangel/$f"
-    done
-    for f in $(find . -name '*.h'); do
-        install -Dm644 "$f" "$pkgdir/opt/sdrangel/$f"
-    done
-    install -Dm755 sdrangel "$pkgdir/opt/sdrangel/sdrangel"
+    make DESTDIR="$pkgdir/" install
+
+    # For some reason SDRangel only works if it is installed outside of /usr,
+    # so we install it into /opt/sdrangel and create link to it in /usr/bin
     install -d "${pkgdir}/usr/bin"
-    ln -s /opt/sdrangel/sdrangel "${pkgdir}/usr/bin/sdrangel"
+    ln -s /opt/sdrangel/bin/sdrangel "${pkgdir}/usr/bin/sdrangel"
 }