From b254f9c11ff625b5fc3b6d377ce6d33301183646 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 20 Feb 2019 00:40:34 +0000 Subject: [PATCH] Debian build: fixed missing sources in internal dsdcc libiio and LimeSuite libraries --- debian/changelog | 1 + debian/rules | 2 +- dsdcc/CMakeLists.txt | 2 ++ libiio/CMakeLists.txt | 11 +++++++---- liblimesuite/CMakeLists.txt | 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2017bbe20..c58426dfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ sdrangel (4.4.5-1) unstable; urgency=medium * UDP/RTP audio: added G722 and Opus support + * Debian build: fixed missing sources in dsdcc, libiio and limesuite -- Edouard Griffiths, F4EXB Tue, 19 Feb 2019 22:14:18 +0100 diff --git a/debian/rules b/debian/rules index b78931773..787bc981c 100755 --- a/debian/rules +++ b/debian/rules @@ -21,5 +21,5 @@ # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DDEBUG_OUTPUT=ON -DBUILD_TYPE=DEBIAN -DRX_SAMPLE_24BIT=ON -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBAIRSPYHFSRC=/z1/softs/airspyhf -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/z1/development/libmirisdr-4 -DLIBLIMESUITESRC=/z1/softs/LimeSuite -DLIBIIOSRC=/z1/softs/libiio -DLIBPERSEUSSRC=/z1/softs/libperseus-sdr -DSOAPYSDR_SOURCE_DIR=/z1/softs/SoapySDR + dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DDEBUG_OUTPUT=ON -DBUILD_TYPE=DEBIAN -DRX_SAMPLE_24BIT=ON -DLIBCM256CCSRC=/shared/development/cm256cc -DLIBDSDCCSRC=/shared/development/dsdcc -DLIBAIRSPYSRC=/shared/development/libairspy -DLIBAIRSPYHFSRC=/shared/softs/airspyhf -DLIBHACKRFSRC=/shared/development/hackrf/host -DLIBRTLSDRSRC=/shared/development/librtlsdr.f4exb -DLIBMBELIBSRC=/shared/development/mbelib -DLIBSERIALDVSRC=/shared/development/serialDV -DLIBBLADERFSRC=/shared/softs/bladeRF -DLIBBLADERFCOMMONSRC=/shared/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/shared/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/shared/development/libmirisdr-4 -DLIBLIMESUITESRC=/shared/softs/LimeSuite -DLIBIIOSRC=/shared/softs/libiio -DLIBPERSEUSSRC=/shared/softs/libperseus-sdr -DSOAPYSDR_SOURCE_DIR=/shared/softs/SoapySDR diff --git a/dsdcc/CMakeLists.txt b/dsdcc/CMakeLists.txt index 152efc73e..3dcb06bc3 100644 --- a/dsdcc/CMakeLists.txt +++ b/dsdcc/CMakeLists.txt @@ -29,6 +29,7 @@ set(dsdcc_SOURCES ${LIBDSDCCSRC}/mbefec.cpp ${LIBDSDCCSRC}/locator.cpp ${LIBDSDCCSRC}/phaselock.cpp + ${LIBDSDCCSRC}/timeutil.cpp ) set(dsdcc_HEADERS @@ -61,6 +62,7 @@ set(dsdcc_HEADERS ${LIBDSDCCSRC}/mbefec.h ${LIBDSDCCSRC}/locator.h ${LIBDSDCCSRC}/phaselock.h + ${LIBDSDCCSRC}/timeutil.h ) add_definitions(-DDSD_USE_MBELIB) diff --git a/libiio/CMakeLists.txt b/libiio/CMakeLists.txt index 4ef538a2a..cb247fb04 100644 --- a/libiio/CMakeLists.txt +++ b/libiio/CMakeLists.txt @@ -4,7 +4,7 @@ project(iio) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(LIBIIO_VERSION_MAJOR 0) -set(LIBIIO_VERSION_MINOR 10) +set(LIBIIO_VERSION_MINOR 17) set(VERSION "${LIBIIO_VERSION_MAJOR}.${LIBIIO_VERSION_MINOR}") # Set the default install path to /usr @@ -99,11 +99,14 @@ if (ENABLE_IPV6) endif() set(LIBIIO_CFILES ${LIBIIOSRC}/backend.c - ${LIBIIOSRC}/channel.c - ${LIBIIOSRC}/device.c - ${LIBIIOSRC}/context.c ${LIBIIOSRC}/buffer.c + ${LIBIIOSRC}/channel.c + ${LIBIIOSRC}/context.c + ${LIBIIOSRC}/device.c + ${LIBIIOSRC}/local.c + ${LIBIIOSRC}/lock.c ${LIBIIOSRC}/utilities.c + ${LIBIIOSRC}/sort.c ${LIBIIOSRC}/scan.c) set(LIBIIO_HEADERS ${LIBIIOSRC}/iio.h) diff --git a/liblimesuite/CMakeLists.txt b/liblimesuite/CMakeLists.txt index 6c1a3e616..b58174380 100644 --- a/liblimesuite/CMakeLists.txt +++ b/liblimesuite/CMakeLists.txt @@ -30,6 +30,7 @@ set(limesuite_SOURCES ${LIBLIMESUITESRC}/src/API/qLimeSDR.cpp ${LIBLIMESUITESRC}/src/API/LimeSDR_mini.cpp ${LIBLIMESUITESRC}/src/API/LimeSDR.cpp + ${LIBLIMESUITESRC}/src/API/LimeSDR_PCIE.cpp ${LIBLIMESUITESRC}/src/FPGA_common/FPGA_common.cpp ${LIBLIMESUITESRC}/src/FPGA_common/FPGA_Mini.cpp ${LIBLIMESUITESRC}/src/FPGA_common/FPGA_Q.cpp