Hello community, here is the log from the commit of package libxtrx for openSUSE:Factory checked in at 2019-01-11 14:03:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxtrx (Old) and /work/SRC/openSUSE:Factory/.libxtrx.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxtrx" Fri Jan 11 14:03:37 2019 rev:3 rq:661740 version:0.0.0+git.20181227 Changes: -------- --- /work/SRC/openSUSE:Factory/libxtrx/libxtrx.changes 2018-05-01 23:44:23.963197698 +0200 +++ /work/SRC/openSUSE:Factory/.libxtrx.new.28833/libxtrx.changes 2019-01-11 14:04:22.407867407 +0100 @@ -1,0 +2,46 @@ +Thu Dec 27 09:41:38 UTC 2018 - [email protected] + +- Update to version 0.0.0+git.20181227: + * gpio & sync API + * lms7_fe: fix initialization of LMS7 + * test_xtrx: fix samplerate output + * refactor test_xtrx + * more refactor of test_xtrx utility; fix previous compilation problem + * add '-o' option to write data to file + * fix logging for multidev mode + * fix include directory for xtrx_fft + * rework logging system + * soapy: setMasterClockRate isn't for refclk + * check refclk if it was set manually + * fix test_xtrx utility to report the correct samplerate + * fix minor problems in test_xtrx + * fix test utility for PCIe + * initial multidev support + * use new LMS7 frontend by default + * use old FE just for now + * update for rev4 + * fix incorrect interpolation settings + * add ability to set NCO independently + * fix div by 0 + * add clock selection API + * soapy: use getSampleRateRange instead of old function + * soapy: setupStream options + * soapy: hide warnings + * soapy: setSampleRate in case it was never called befor running the + RX stream (fixes some program). + * adopt for new ll-library + * new lml phy code adoptiion + * Fix failed VCO tuning on fast PCs. + * fix crashing when stream wasn'r initialized + * more transcoding 8 to 16 bits + * better description in CGEN selection + * add AUTO lna selection based on LO + * Fix RefClk selection on machines with imprecise PCIe clock. + * xtrx_tune: fix crashing when actualfreq wasn't provided +- Remove patch: + * libxtrx-cmake-disable-test.patch +- Add patches: + * libxtrx-fix-include.patch + * libxtrx-fix-xtrx_fft.patch + +------------------------------------------------------------------- Old: ---- libxtrx-0.0.0+git.20171213.tar.xz libxtrx-cmake-disable-test.patch New: ---- libxtrx-0.0.0+git.20181227.tar.xz libxtrx-fix-include.patch libxtrx-fix-xtrx_fft.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxtrx.spec ++++++ --- /var/tmp/diff_new_pack.Jf89o0/_old 2019-01-11 14:04:23.219866590 +0100 +++ /var/tmp/diff_new_pack.Jf89o0/_new 2019-01-11 14:04:23.223866586 +0100 @@ -19,22 +19,28 @@ %define sover 0 %define libname libxtrx%{sover} -%define soapy_modver 0.6 +%define soapy_modver 0.7 %define soapy_modname soapysdr%{soapy_modver}-module-xtrx + Name: libxtrx -Version: 0.0.0+git.20171213 +Version: 0.0.0+git.20181227 Release: 0 Summary: High level XTRX API License: LGPL-2.1-only Group: Development/Libraries/C and C++ URL: http://xtrx.io +#Git-Clone: https://github.com/xtrx-sdr/libxtrx.git Source: %{name}-%{version}.tar.xz -Patch0: libxtrx-cmake-disable-test.patch +Patch1: libxtrx-fix-include.patch +Patch2: libxtrx-fix-xtrx_fft.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core +BuildRequires: liblms7002m-devel BuildRequires: pkgconfig -BuildRequires: xtrx_lms7002m-devel +BuildRequires: qcustomplot-devel +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(SoapySDR) >= 0.5.2 BuildRequires: pkgconfig(libxtrxdsp) BuildRequires: pkgconfig(libxtrxll) @@ -60,6 +66,13 @@ This subpackage contains libraries and header files for developing applications that want to make use of libxtrx. +%package -n xtrx-tools +Summary: Tools for XTRX +Group: Productivity/Hamradio/Other + +%description -n xtrx-tools +Tools for XTRX SDR devices. + %package -n %{soapy_modname} Summary: SoapySDR XTRX module Group: System/Libraries @@ -70,15 +83,27 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +# FIXME: Architecture detection in the used CMake is br0ken, use FORCE_ARCH for now %cmake \ - -DCMAKE_SHARED_LINKER_FLAGS="" + -DCMAKE_SHARED_LINKER_FLAGS="" \ +%ifarch %{ix86} x86_64 + -DFORCE_ARCH=x86_64 \ +%endif +%ifarch %{arm} aarch64 + -DFORCE_ARCH=arm \ +%endif + -DENABLE_SOAPY=ON %make_jobs %install %cmake_install +install -d %{buildroot}/%{_bindir} +install -m 0755 build/examples/xtrx_fft/mainwindow %{buildroot}/%{_bindir}/xtrx_fft +mv %{buildroot}/%{_libdir}/xtrx/test_xtrx %{buildroot}/%{_bindir}/test_xtrx %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -98,4 +123,8 @@ %dir %{_libdir}/SoapySDR/modules%{soapy_modver} %{_libdir}/SoapySDR/modules%{soapy_modver}/libXTRXSupport.so +%files -n xtrx-tools +%{_bindir}/test_xtrx +%{_bindir}/xtrx_fft + %changelog ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Jf89o0/_old 2019-01-11 14:04:23.251866558 +0100 +++ /var/tmp/diff_new_pack.Jf89o0/_new 2019-01-11 14:04:23.251866558 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/xtrx-sdr/libxtrx.git</param> - <param name="changesrevision">e887c5976914e50c01870c8d1c002b6cb33baf64</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2443a10621039049c3ced7c295d4959e74a1dcef</param></service></servicedata> \ No newline at end of file ++++++ libxtrx-0.0.0+git.20171213.tar.xz -> libxtrx-0.0.0+git.20181227.tar.xz ++++++ ++++ 10216 lines of diff (skipped) ++++++ libxtrx-fix-include.patch ++++++ diff --git a/xtrx_fe_nlms7.c b/xtrx_fe_nlms7.c index 4cff277..4d4136c 100644 --- a/xtrx_fe_nlms7.c +++ b/xtrx_fe_nlms7.c @@ -28,7 +28,7 @@ #include <assert.h> #include <stdarg.h> -#include "../liblms7002m/liblms7002m.h" +#include "liblms7002m.h" #include "xtrx_api.h" ++++++ libxtrx-fix-xtrx_fft.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 16804b5..08841f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ target_link_libraries(test_xtrx xtrx ${SYSTEM_LIBS}) find_package(Qt5Widgets) find_package(Qt5PrintSupport) find_package(QCustomPlot) -if(Qt5Widgets_FOUND AND Qt5PrintSupport_FOUND AND QCustomPlot_FOUND) +if(Qt5Widgets_FOUND AND Qt5PrintSupport_FOUND AND QCUSTOMPLOT_FOUND) set(LIBXTRX_FOUND TRUE "libxtrx found") set(LIBXTRX_LIBRARIES xtrx) set(LIBXTRX_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/cmake/FindQCustomPlot.cmake b/cmake/FindQCustomPlot.cmake new file mode 100644 index 0000000..385cb1e --- /dev/null +++ b/cmake/FindQCustomPlot.cmake @@ -0,0 +1,31 @@ +if(NOT QCUSTOMPLOT_FOUND) + if(NOT WIN32) + include(FindPkgConfig) + pkg_check_modules (QCUSTOMPLOT_PKG qcustomplot) + endif(NOT WIN32) + + find_path(QCUSTOMPLOT_INCLUDE_DIRS NAMES qcustomplot.h + PATHS + ${QCUSTOMPLOT_PKG_INCLUDE_DIRS} + /usr/include + /usr/local/include + ) + + find_library(QCUSTOMPLOT_LIBRARIES NAMES qcustomplot + PATHS + ${QCUSTOMPLOT_PKG_LIBRARY_DIRS} + /usr/lib + /usr/local/lib + ) + + if(QCUSTOMPLOT_INCLUDE_DIRS AND QCUSTOMPLOT_LIBRARIES) + set(QCUSTOMPLOT_FOUND TRUE CACHE INTERNAL "QCustomPlot found") + message(STATUS "Found QCustomPlot: ${QCUSTOMPLOT_INCLUDE_DIRS}, ${QCUSTOMPLOT_LIBRARIES}") + else(QCUSTOMPLOT_INCLUDE_DIRS AND QCUSTOMPLOT_LIBRARIES) + set(QCUSTOMPLOT_FOUND FALSE CACHE INTERNAL "QCustomPlot found") + message(STATUS "QCustomPlot not found.") + endif(QCUSTOMPLOT_INCLUDE_DIRS AND QCUSTOMPLOT_LIBRARIES) + + mark_as_advanced(QCUSTOMPLOT_LIBRARIES QCUSTOMPLOT_INCLUDE_DIRS) +endif(NOT QCUSTOMPLOT_FOUND) + diff --git a/examples/xtrx_fft/CMakeLists.txt b/examples/xtrx_fft/CMakeLists.txt index 6f5ee74..6e52d18 100644 --- a/examples/xtrx_fft/CMakeLists.txt +++ b/examples/xtrx_fft/CMakeLists.txt @@ -12,7 +12,7 @@ message(${CMAKE_MODULE_PATH}) # Find the QtWidgets library find_package(Qt5Widgets CONFIG REQUIRED) find_package(Qt5PrintSupport CONFIG REQUIRED) -find_package(QCustomPlot CONFIG REQUIRED) +find_package(QCustomPlot REQUIRED) find_package(LibXTRX REQUIRED) # Populate a CMake variable with the sources @@ -27,4 +27,4 @@ set(mainwindow_SRCS include_directories(${LIBXTRX_INCLUDE_DIRS}) add_executable(mainwindow ${mainwindow_SRCS}) -target_link_libraries(mainwindow Qt5::Widgets Qt5::PrintSupport ${QCustomPlot_LIBRARIES} ${LIBXTRX_LIBRARIES}) +target_link_libraries(mainwindow Qt5::Widgets Qt5::PrintSupport ${QCUSTOMPLOT_LIBRARIES} ${LIBXTRX_LIBRARIES}) diff --git a/examples/xtrx_fft/FindQCustomPlot.cmake b/examples/xtrx_fft/FindQCustomPlot.cmake new file mode 100644 index 0000000..385cb1e --- /dev/null +++ b/examples/xtrx_fft/FindQCustomPlot.cmake @@ -0,0 +1,31 @@ +if(NOT QCUSTOMPLOT_FOUND) + if(NOT WIN32) + include(FindPkgConfig) + pkg_check_modules (QCUSTOMPLOT_PKG qcustomplot) + endif(NOT WIN32) + + find_path(QCUSTOMPLOT_INCLUDE_DIRS NAMES qcustomplot.h + PATHS + ${QCUSTOMPLOT_PKG_INCLUDE_DIRS} + /usr/include + /usr/local/include + ) + + find_library(QCUSTOMPLOT_LIBRARIES NAMES qcustomplot + PATHS + ${QCUSTOMPLOT_PKG_LIBRARY_DIRS} + /usr/lib + /usr/local/lib + ) + + if(QCUSTOMPLOT_INCLUDE_DIRS AND QCUSTOMPLOT_LIBRARIES) + set(QCUSTOMPLOT_FOUND TRUE CACHE INTERNAL "QCustomPlot found") + message(STATUS "Found QCustomPlot: ${QCUSTOMPLOT_INCLUDE_DIRS}, ${QCUSTOMPLOT_LIBRARIES}") + else(QCUSTOMPLOT_INCLUDE_DIRS AND QCUSTOMPLOT_LIBRARIES) + set(QCUSTOMPLOT_FOUND FALSE CACHE INTERNAL "QCustomPlot found") + message(STATUS "QCustomPlot not found.") + endif(QCUSTOMPLOT_INCLUDE_DIRS AND QCUSTOMPLOT_LIBRARIES) + + mark_as_advanced(QCUSTOMPLOT_LIBRARIES QCUSTOMPLOT_INCLUDE_DIRS) +endif(NOT QCUSTOMPLOT_FOUND) +
