pcr/xtrx: update git revisions and improve PKGBUILDs

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

6 files changed, 30 insertions, 32 deletions

diff --git a/pcr/gnuradio-osmosdr-xtrx/PKGBUILD b/pcr/gnuradio-osmosdr-xtrx/PKGBUILD
index 5fbcaa54a..14c22c37f 100644
--- a/pcr/gnuradio-osmosdr-xtrx/PKGBUILD
+++ b/pcr/gnuradio-osmosdr-xtrx/PKGBUILD
@@ -1,6 +1,5 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd@gmail.com?>
-# Contributor: Dominik Heidler <dheidler@gmail.com>
+# Maintainer (Arch): Kyle Keen <keenerd@gmail.com?>
+# Contributor (Arch): Dominik Heidler <dheidler@gmail.com>
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 pkgname=gnuradio-osmosdr-xtrx
 _pkgname=gr-osmosdr
@@ -8,18 +7,22 @@ pkgver=0.1.4+git
 pkgrel=26
 pkgdesc="Source block for Funcube Dongle, RTL-SDR, USRP, OsmoSDR, BladeRF, HackRF and AirSpy devices"
 url="http://sdr.osmocom.org/trac/"
-arch=(armv7h i686 x86_64)
+arch=('armv7h' 'i686' 'x86_64')
 license=('GPL')
-depends=('gnuradio' 'gnuradio-iqbal' 'rtl-sdr' 'gnuradio-fcdproplus' 'hackrf' 'bladerf' 'airspy')
+depends=('gnuradio' 'gnuradio-iqbal' 'rtl-sdr' 'gnuradio-fcdproplus' 'hackrf' 'bladerf' 'airspy' 'libxtrx')
 optdepends=('python2-opengl: osmocom_fft')
 makedepends=('git' 'cmake' 'boost' 'python2-cheetah' 'swig')
 conflicts=('gr-osmosdr-git' 'gnuradio-osmosdr')
-branch=libxtrx
-source=("git://github.com/xtrx-sdr/gr-osmosdr.git#branch=$branch")
-md5sums=('SKIP')
+commit=e239811df16e9bfdbfa904fab1b235d63ea724d8
+source=("git://github.com/xtrx-sdr/gr-osmosdr.git#commit=$commit")
+sha512sums=('SKIP')
 
 # add support for miri, osmo?
 
+pkgver() {
+    cd $_pkgname
+    echo r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)
+}
 prepare() {
   cd "$srcdir/$_pkgname"
   sed -i 's/python$/python2/' apps/osmocom_siggen_base.py
@@ -32,6 +35,7 @@ build() {
   cmake \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
+    -DENABLE_XTRX=ON \
     -DPYTHON_EXECUTABLE=$(which python2) \
     -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
     -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
diff --git a/pcr/gqrx-xtrx/PKGBUILD b/pcr/gqrx-xtrx/PKGBUILD
index 83a906f0d..d1c425a8c 100644
--- a/pcr/gqrx-xtrx/PKGBUILD
+++ b/pcr/gqrx-xtrx/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Dominik Heidler <dheidler@gmail.com>
+# Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
+# Contributor (Arch): Dominik Heidler <dheidler@gmail.com>
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 
 _pkgname=gqrx
 pkgname=gqrx-xtrx
-pkgver=2.11.1
-pkgrel=2
+pkgver=2.11.5
+pkgrel=1
 pkgdesc="Interactive SDR receiver waterfall for many devices."
-arch=(i686 x86_64)
+arch=('armv7h' 'i686' 'x86_64')
 url="http://gqrx.dk/"
 license=('GPL')
 depends=('qt5-svg' 'libpulse' 'gnuradio-osmosdr-xtrx' 'libxkbcommon-x11')
 conflicts=('gqrx')
 makedepends=('boost')
-#source=("$_pkgname-$pkgver.tgz::https://github.com/csete/gqrx/archive/v$pkgver.tar.gz")
 source=("https://github.com/csete/gqrx/releases/download/v$pkgver/gqrx-sdr-$pkgver-src.tar.xz")
-md5sums=('e6aa0d72de6420fc4fec00669996eac7')
+sha512sums=('f1006c37567a6c177ec0f5d15dcef9803b5dc1b124226b552b408e4ce0b3279a845a5875bfb1d7ccd6563b41f67c07a434f325e4ee8d28db2ee19b249159d3a3')
 
 prepare() {
   cd "$srcdir"
diff --git a/pcr/liblms7002m/PKGBUILD b/pcr/liblms7002m/PKGBUILD
index 9a976f901..50f2b29a2 100644
--- a/pcr/liblms7002m/PKGBUILD
+++ b/pcr/liblms7002m/PKGBUILD
@@ -1,15 +1,15 @@
 # $id$
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 pkgname=liblms7002m
-pkgver=r3.g27fb96f
-pkgrel=2
+pkgver=r8.g91b5107
+pkgrel=1
 pkgdesc="Compact LMS7002 library suitable for MCU"
 url="https://github.com/xtrx-sdr/liblms7002m"
 arch=('armv7h' 'i686' 'x86_64')
 license=('LGPL')
 depends=('python2-cheetah')
 makedepends=('git' 'cmake')
-commit=27fb96fbad28676fa37639062e8990e8cb37c029
+commit=91b5107a11eb5335bbaf02ac0c744ea58d2a0b74
 source=("git://github.com/xtrx-sdr/liblms7002m#commit=$commit")
 sha512sums=('SKIP')
 
@@ -18,11 +18,6 @@ pkgver() {
     echo r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)
 }
 
-prepare() {
-  cd "$srcdir/$pkgname"
-  sed 's/^python/python2/' -i regs/genenum.sh
-}
-
 build() {
     case "$CARCH" in
 	i686) ARCH=i386;;
@@ -36,6 +31,7 @@ build() {
 
     cmake \
 	-DFORCE_ARCH=$ARCH \
+	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
 	../
     make
 }
diff --git a/pcr/libxtrx/PKGBUILD b/pcr/libxtrx/PKGBUILD
index c68394d39..3279b98e4 100644
--- a/pcr/libxtrx/PKGBUILD
+++ b/pcr/libxtrx/PKGBUILD
@@ -1,14 +1,14 @@
 # $id$
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 pkgname=libxtrx
-pkgver=r32.ge65719b
-pkgrel=2
+pkgver=r49.g2443a10
+pkgrel=1
 pkgdesc="High level XTRX API"
 url="https://github.com/xtrx-sdr/libxtrx"
 arch=('armv7h' 'i686' 'x86_64')
 license=('LGPL')
 makedepends=('git' 'cmake' 'liblms7002m' 'libxtrxdsp' 'libxtrxll')
-commit=e65719b3e1158c0cdc0fbc747c8937298f9aa758
+commit=2443a10621039049c3ced7c295d4959e74a1dcef
 source=("git://github.com/xtrx-sdr/libxtrx#commit=$commit")
 sha512sums=('SKIP')
 
diff --git a/pcr/libxtrxdsp/PKGBUILD b/pcr/libxtrxdsp/PKGBUILD
index 641d3cc8c..7a977e067 100644
--- a/pcr/libxtrxdsp/PKGBUILD
+++ b/pcr/libxtrxdsp/PKGBUILD
@@ -1,14 +1,14 @@
 # $Id$
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 pkgname=libxtrxdsp
-pkgver=r6.g5dc9e4d
-pkgrel=2
+pkgver=r7.g84c6f4c
+pkgrel=1
 pkgdesc="DSP specific function for SDR in general and XTRX in specific"
 url="https://github.com/xtrx-sdr/libxtrxdsp"
 arch=('armv7h' 'i686' 'x86_64')
 license=('LGPL')
 makedepends=('git' 'cmake')
-commit=5dc9e4d4c440ef5ce9ecc26b5c730ece2e99fd24
+commit=84c6f4c8bdb9e26e7c9a62bd96f02e35d61aaf45
 source=("git://github.com/xtrx-sdr/libxtrxdsp#commit=$commit")
 sha512sums=('SKIP')
 
diff --git a/pcr/libxtrxll/PKGBUILD b/pcr/libxtrxll/PKGBUILD
index 622204767..b5016780e 100644
--- a/pcr/libxtrxll/PKGBUILD
+++ b/pcr/libxtrxll/PKGBUILD
@@ -1,14 +1,14 @@
 # $id$
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 pkgname=libxtrxll
-pkgver=r18.g1158c4f
+pkgver=r32.g9106b98
 pkgrel=1
 pkgdesc="Low level XTRX hardware abstraction library"
 url="https://github.com/xtrx-sdr/libxtrxll"
 arch=('armv7h' 'i686' 'x86_64')
 license=('LGPL')
 makedepends=('git' 'cmake')
-commit=1158c4f845ddebf5ab98b737ce8ba12d0dec6564
+commit=9106b98096734b3d0e3ff5f35e6bfca72e873fc4
 source=("git://github.com/xtrx-sdr/libxtrxll#commit=$commit")
 sha512sums=('SKIP')