From aedeb22f00ff70c7d62647bb26fa6e4588dda7c2 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 17 Jan 2019 03:15:04 +0100 Subject: pcr/xtrx: update git revisions and improve PKGBUILDs Signed-off-by: Denis 'GNUtoo' Carikli --- pcr/gnuradio-osmosdr-xtrx/PKGBUILD | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'pcr/gnuradio-osmosdr-xtrx') 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 -# Contributor: Dominik Heidler +# Maintainer (Arch): Kyle Keen +# Contributor (Arch): Dominik Heidler # Contributor: Denis 'GNUtoo' Carikli 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) \ -- cgit v1.2.3