From 686aed3b3f6b7d03349e365d08196a6ec8da5bee Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 1 Dec 2018 01:39:54 +0100 Subject: pcr-testing: Cleanup xtrx related packages Signed-off-by: Denis 'GNUtoo' Carikli --- pcr-testing/liblms7002m/PKGBUILD | 8 +++----- pcr-testing/libxtrx/PKGBUILD | 8 ++++---- pcr-testing/libxtrxdsp/PKGBUILD | 14 +++----------- pcr-testing/libxtrxll/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 pcr-testing/libxtrxll/PKGBUILD (limited to 'pcr-testing') diff --git a/pcr-testing/liblms7002m/PKGBUILD b/pcr-testing/liblms7002m/PKGBUILD index ebb8ff3f5..9a976f901 100644 --- a/pcr-testing/liblms7002m/PKGBUILD +++ b/pcr-testing/liblms7002m/PKGBUILD @@ -2,10 +2,10 @@ # Contributor: Denis 'GNUtoo' Carikli pkgname=liblms7002m pkgver=r3.g27fb96f -pkgrel=1 +pkgrel=2 pkgdesc="Compact LMS7002 library suitable for MCU" url="https://github.com/xtrx-sdr/liblms7002m" -arch=(armv7h i686 x86_64) +arch=('armv7h' 'i686' 'x86_64') license=('LGPL') depends=('python2-cheetah') makedepends=('git' 'cmake') @@ -35,9 +35,7 @@ build() { cd build cmake \ - -DENABLE_SOAPY=NO \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DFORCE_ARCH=x86 \ + -DFORCE_ARCH=$ARCH \ ../ make } diff --git a/pcr-testing/libxtrx/PKGBUILD b/pcr-testing/libxtrx/PKGBUILD index 070d32b2d..c68394d39 100644 --- a/pcr-testing/libxtrx/PKGBUILD +++ b/pcr-testing/libxtrx/PKGBUILD @@ -2,12 +2,12 @@ # Contributor: Denis 'GNUtoo' Carikli pkgname=libxtrx pkgver=r32.ge65719b -pkgrel=1 +pkgrel=2 pkgdesc="High level XTRX API" url="https://github.com/xtrx-sdr/libxtrx" -arch=(armv7h i686 x86_64) +arch=('armv7h' 'i686' 'x86_64') license=('LGPL') -makedepends=('git' 'cmake' 'liblms7002m' 'libxtrxdsp') +makedepends=('git' 'cmake' 'liblms7002m' 'libxtrxdsp' 'libxtrxll') commit=e65719b3e1158c0cdc0fbc747c8937298f9aa758 source=("git://github.com/xtrx-sdr/libxtrx#commit=$commit") sha512sums=('SKIP') @@ -37,7 +37,7 @@ build() { cmake \ -DENABLE_SOAPY=NO \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DFORCE_ARCH=x86 \ + -DFORCE_ARCH=$ARCH \ ../ make } diff --git a/pcr-testing/libxtrxdsp/PKGBUILD b/pcr-testing/libxtrxdsp/PKGBUILD index 3ccab5b01..641d3cc8c 100644 --- a/pcr-testing/libxtrxdsp/PKGBUILD +++ b/pcr-testing/libxtrxdsp/PKGBUILD @@ -1,11 +1,11 @@ # $Id$ # Contributor: Denis 'GNUtoo' Carikli pkgname=libxtrxdsp -pkgver=r0+git -pkgrel=1 +pkgver=r6.g5dc9e4d +pkgrel=2 pkgdesc="DSP specific function for SDR in general and XTRX in specific" url="https://github.com/xtrx-sdr/libxtrxdsp" -arch=(armv7h i686 x86_64) +arch=('armv7h' 'i686' 'x86_64') license=('LGPL') makedepends=('git' 'cmake') commit=5dc9e4d4c440ef5ce9ecc26b5c730ece2e99fd24 @@ -18,19 +18,11 @@ pkgver() { } build() { - case "$CARCH" in - i686) ARCH=i386;; - x86_64) ARCH=x86_64;; - arhmv7h) ARCH=armhf;; - esac - cd "$srcdir/$pkgname" mkdir -p build cd build cmake \ - -DENABLE_SOAPY=NO \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DFORCE_ARCH=x86 \ ../ make diff --git a/pcr-testing/libxtrxll/PKGBUILD b/pcr-testing/libxtrxll/PKGBUILD new file mode 100644 index 000000000..622204767 --- /dev/null +++ b/pcr-testing/libxtrxll/PKGBUILD @@ -0,0 +1,40 @@ +# $id$ +# Contributor: Denis 'GNUtoo' Carikli +pkgname=libxtrxll +pkgver=r18.g1158c4f +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 +source=("git://github.com/xtrx-sdr/libxtrxll#commit=$commit") +sha512sums=('SKIP') + +pkgver() { + cd $pkgname + echo r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD) +} + +build() { + case "$CARCH" in + i686) ARCH=i386;; + x86_64) ARCH=x86_64;; + arhmv7h) ARCH=armhf;; + esac + + cd "$srcdir/$pkgname" + mkdir -p build + cd build + + cmake \ + -DFORCE_ARCH=$ARCH \ + ../ + make +} + +package() { + cd "$srcdir/$pkgname/build/" + make DESTDIR="${pkgdir}" install +} -- cgit v1.2.3