[arch-commits] Commit in gnuradio-iqbal/trunk (PKGBUILD gr38-update.diff)
Date: Wednesday, August 21, 2019 @ 03:00:27
Author: kkeen
Revision: 500366
upgpkg: gnuradio-iqbal 0.37.2-34 fix yaml
Modified:
gnuradio-iqbal/trunk/PKGBUILD
gnuradio-iqbal/trunk/gr38-update.diff
--+
PKGBUILD |5 +-
gr38-update.diff | 96 ++---
2 files changed, 50 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-21 02:12:53 UTC (rev 500365)
+++ PKGBUILD2019-08-21 03:00:27 UTC (rev 500366)
@@ -3,7 +3,7 @@
pkgname=gnuradio-iqbal
_pkgname=gr-iqbal
pkgver=0.37.2
-pkgrel=33
+pkgrel=34
pkgdesc="Gnuradio I/Q balancing"
arch=('x86_64')
url="https://cgit.osmocom.org/gr-iqbal/";
@@ -14,7 +14,7 @@
source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
'gr38-update.diff')
md5sums=('SKIP'
- 'f78ad3ce43473fc6ec6486687afe54dc')
+ '18484d0184b37f4e43a6e6f58b5c4c12')
prepare() {
cd "$srcdir/$_pkgname"
@@ -22,7 +22,6 @@
git submodule update
#sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES
${FFTW3F_LIBRARIES}/' CMakeLists.txt
- #sed -i 's/3.7.0/3.8.0.0/' CMakeLists.txt
#sed -i 's/lib64/lib/' CMakeLists.txt
# patch from Maitland Bottoms of Debian
Modified: gr38-update.diff
===
--- gr38-update.diff2019-08-21 02:12:53 UTC (rev 500365)
+++ gr38-update.diff2019-08-21 03:00:27 UTC (rev 500366)
@@ -181,33 +181,33 @@
+flags: [ python, cpp ]
+
+parameters:
-+- id: period
-+ label: Period
-+ dtype: int
++- id: period
++label: Period
++dtype: int
+
+inputs:
-+- domain: stream
-+ id: in
-+ dtype: complex
++- domain: stream
++id: in
++dtype: complex
+
+outputs:
-+- domain: message
-+ id: iqbal_corr
-+ dtype: complex
-+ optional: true
++- domain: message
++id: iqbal_corr
++dtype: complex
++optional: true
+
+templates:
-+ imports: from gnuradio import iqbalance
-+ make: iqbalance.optimize_c(${period})
-+ callbacks:
-+ - set_period(${period})
++imports: from gnuradio import iqbalance
++make: iqbalance.optimize_c(${period})
++callbacks:
++- set_period(${period})
+cpp_templates:
-+ includes: ['#include ']
-+ declarations: 'iqbalance::optimize_c::sptr ${id};'
-+ make: 'this->${id} = iqbalance::optimize_c::make(${period});'
-+ callbacks:
-+ - set_period(${period})
-+ link: ['gnuradio-iqbalance']
++includes: ['#include ']
++declarations: 'iqbalance::optimize_c::sptr ${id};'
++make: 'this->${id} = iqbalance::optimize_c::make(${period});'
++callbacks:
++- set_period(${period})
++link: ['gnuradio-iqbalance']
+
+file_format: 1
--- /dev/null
@@ -218,41 +218,41 @@
+flags: [ python, cpp ]
+
+parameters:
-+- id: mag
-+ label: Magnitude
-+ dtype: real
-+- id: phase
-+ label: Phase
-+ dtype: real
++- id: mag
++label: Magnitude
++dtype: real
++- id: phase
++label: Phase
++dtype: real
+
+inputs:
-+- domain: stream
-+ id: in
-+ dtype: complex
-+- domain: message
-+ id: iqbal_corr
-+ dtype: complex
-+ optional: true
++- domain: stream
++id: in
++dtype: complex
++- domain: message
++id: iqbal_corr
++dtype: complex
++optional: true
+
+outputs:
-+- domain: stream
-+ id: out
-+ dtype: complex
++- domain: stream
++id: out
++dtype: complex
+
+templates:
-+ imports: from gnuradio import iqbalance
-+ make: iqbalance.fix_cc(${mag}, ${phase})
-+ callbacks:
-+ - set_mag(${mag})
-+ - set_phase(${phase})
++imports: from gnuradio import iqbalance
++make: iqbalance.fix_cc(${mag}, ${phase})
++callbacks:
++- set_mag(${mag})
++- set_phase(${phase})
+
+cpp_templates:
-+ includes: ['#include ']
-+ declarations: 'iqbalance::fix_cc::sptr ${id};'
-+ make: 'this->${id} = iqbalance::fix_cc::make(${mag}, ${phase});'
-+ callbacks:
-+ - set_mag(${mag})
-+ - set_phase(${phase})
-+ link: ['gnuradio-iqbalance']
++includes: ['#include ']
++declarations: 'iqbalance::fix_cc::sptr ${id};'
++make: 'this->${id} = iqbalance::fix_cc::make(${mag}, ${phase});'
++callbacks:
++- set_mag(${mag})
++- set_phase(${phase})
++link: ['gnuradio-iqbalance']
+
+file_format: 1
[arch-commits] Commit in gnuradio-iqbal/trunk (PKGBUILD gr38-update.diff)
Date: Wednesday, August 21, 2019 @ 00:56:01
Author: kkeen
Revision: 500360
upgpkg: gnuradio-iqbal 0.37.2-33
Added:
gnuradio-iqbal/trunk/gr38-update.diff
Modified:
gnuradio-iqbal/trunk/PKGBUILD
--+
PKGBUILD | 38 +--
gr38-update.diff | 258 +
2 files changed, 287 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-20 22:46:54 UTC (rev 500359)
+++ PKGBUILD2019-08-21 00:56:01 UTC (rev 500360)
@@ -3,7 +3,7 @@
pkgname=gnuradio-iqbal
_pkgname=gr-iqbal
pkgver=0.37.2
-pkgrel=32
+pkgrel=33
pkgdesc="Gnuradio I/Q balancing"
arch=('x86_64')
url="https://cgit.osmocom.org/gr-iqbal/";
@@ -11,25 +11,45 @@
depends=('gnuradio' 'fftw')
replaces=('gr-iqbal')
makedepends=('git' 'cmake' 'boost' 'swig')
-source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver")
-md5sums=('SKIP')
+source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
+'gr38-update.diff')
+md5sums=('SKIP'
+ 'f78ad3ce43473fc6ec6486687afe54dc')
-build() {
+prepare() {
cd "$srcdir/$_pkgname"
git submodule init
git submodule update
- sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES}/'
CMakeLists.txt
- mkdir build
+
+ #sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES
${FFTW3F_LIBRARIES}/' CMakeLists.txt
+ #sed -i 's/3.7.0/3.8.0.0/' CMakeLists.txt
+ #sed -i 's/lib64/lib/' CMakeLists.txt
+
+ # patch from Maitland Bottoms of Debian
+ patch -p1 -i "$srcdir/gr38-update.diff"
+ #rm cmake/Modules/GrMiscUtils.cmake
+
+ # upstream mixed tabs and spaces
+ sed -i 's/\t//' python/__init__.py
+}
+
+build() {
+ cd "$srcdir/$_pkgname"
+ mkdir -p build
cd build
cmake \
-Wno-dev \
-DCMAKE_BUILD_TYPE=Release \
--DPYTHON_EXECUTABLE=$(which python2) \
--DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
--DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
+-DPYTHON_EXECUTABLE=$(which python3) \
+-DPYTHON_INCLUDE_DIR=$(echo /usr/include/python3*) \
+-DPYTHON_LIBRARY=$(echo /usr/lib/libpython3.*.so) \
+-DGR_PYTHON_DIR=$(echo /usr/lib/python3.*/site-packages/) \
+-DPKG_CONFIG_PATH=/usr/lib/pkgconfig \
-DCMAKE_LIBRARY_PATH=/usr/lib \
-DCMAKE_INSTALL_PREFIX=/usr ../
make
+#-DGnuradio_DIR=/usr/lib/cmake/gnuradio \
+#-DVolk_DIR=/usr/lib/cmake/vol \
}
package() {
Added: gr38-update.diff
===
--- gr38-update.diff(rev 0)
+++ gr38-update.diff2019-08-21 00:56:01 UTC (rev 500360)
@@ -0,0 +1,258 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -33,7 +33,18 @@
+ endif(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
+
+-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
++
++# set search path for cmake modules to OOT, Gnuradio
++
++set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
++find_package(Gnuradio "3.8" REQUIRED)
++
++# Set the version information here
++set(VERSION_INFO_MAJOR_VERSION 3)
++set(VERSION_INFO_API_COMPAT8)
++set(VERSION_INFO_MINOR_VERSION 0)
++set(VERSION_INFO_MAINT_VERSION "")
++include(GrVersion) #setup version info
+
+
+ # Compiler specific setup
+@@ -58,11 +69,7 @@
+ "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0"
"1.64"
+ "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0"
"1.69"
+ )
+-find_package(Boost "1.35" COMPONENTS system)
+-
+-if(NOT Boost_FOUND)
+-message(FATAL_ERROR "Boost required to compile iqbalance")
+-endif()
++find_package(Boost "1.35" COMPONENTS filesystem program_options regex system
thread)
+
+
+ # Find FFTW3
+@@ -85,7 +92,7 @@
+ if(NOT LIBOSMODSP_FOUND)
+ message(STATUS "libosmodsp not found, using local checkout")
+ set(LIBOSMODSP_INCLUDE_DIRS "libosmo-dsp/include/")
+-set(LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES})
++set(LIBOSMODSP_LIBRARIES fftw3f::fftw3f)
+ set(LIBOSMODSP_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/cxvec.c
${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/iqbal.c)
+ endif()
+
+@@ -93,9 +100,15 @@
+ # Install directories
+
+ include(GrPlatform) #define LIB_SUFFIX
++
++if(NOT CMAKE_MODULES_DIR)
++ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
++endif(NOT CMAKE_MODULES_DIR)
++
+ set(GR_RUNTIME_DIR bin)
+ set(GR_LIBRARY_DIR lib${LIB_SUFFIX})
+-set(GR_INCLUDE_DIR include)
++set(GR_INCLUDE_DIR include/gnuradio/iqbalance)
++SET(GR_CMAKE_DIR${CMAKE_MODULES_DIR}/gr-iqbal)
