Hello community, here is the log from the commit of package libxtrx for openSUSE:Factory checked in at 2020-12-12 20:32:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxtrx (Old) and /work/SRC/openSUSE:Factory/.libxtrx.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxtrx" Sat Dec 12 20:32:20 2020 rev:4 rq:854979 version:0.0.0+git.20201202 Changes: -------- --- /work/SRC/openSUSE:Factory/libxtrx/libxtrx.changes 2019-01-11 14:04:22.407867407 +0100 +++ /work/SRC/openSUSE:Factory/.libxtrx.new.2328/libxtrx.changes 2020-12-12 20:36:13.442093663 +0100 @@ -1,0 +2,39 @@ +Thu Dec 10 16:21:44 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Update to version 0.0.0+git.20201202: + * xtrx_open_string: properly terminate 4096-byte paramstrings + * soapy: Fix RX stream activation by avoiding unintended + runtime error. + * Fix test_xtrx_soapy build issue + * soapy: Fix the timestamp calculation of the first sample in + the burst + * soapy: Implement support of special mode for simultaneous Rx + and Tx streams activation + * soapy: add the option for setting antenna in auto mode using + the function setAntenna() + * soapy: set antenna in auto mode during setup stream procedure + * soapy: Explain an internal variable purpose. + * Fix typos in the log output. + * add RCVEX_REPORT_GTIME to report global time on recv() + * Set reference clock at all levels when needed. + * Set _actual_masterclock in the SoapySDR module. + * Remove xtrx_fe_lms7.c - we no longer support libLMS7002M. + * Add API flags to work with time sync without seconds recovery + * Fix compilation due to xtrx_api.h not being found + * octoCAL: add ability to switch A/B channels in GUI + * add new octo version + * fix GPIO xonfiguration + * xtrx_fe_octorx0.c: don't use absolute include paths for + external libraries + * build and install example + * fix include for proper build + * add octoRFX6 support + * fix uninitialized variables +- Drop not longer needed patch + * libxtrx-fix-include.patch +- Rebase and rename patch + * libxtrx-fix-xtrx_fft.patch -> 0001-Fix-CMake-FindQCustomPlot.patch +- Add patch: + * 0001-Fix-test_xtrx_soapy-build-issue.patch + +------------------------------------------------------------------- Old: ---- libxtrx-0.0.0+git.20181227.tar.xz libxtrx-fix-include.patch libxtrx-fix-xtrx_fft.patch New: ---- 0001-Fix-CMake-FindQCustomPlot.patch 0001-Fix-test_xtrx_soapy-build-issue.patch libxtrx-0.0.0+git.20201202.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxtrx.spec ++++++ --- /var/tmp/diff_new_pack.SOQAqK/_old 2020-12-12 20:36:14.094094343 +0100 +++ /var/tmp/diff_new_pack.SOQAqK/_new 2020-12-12 20:36:14.094094343 +0100 @@ -1,8 +1,8 @@ # # spec file for package libxtrx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2017, Martin Hauke <mar...@gmx.de> +# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2017-2020, Martin Hauke <mar...@gmx.de> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ %define soapy_modname soapysdr%{soapy_modver}-module-xtrx Name: libxtrx -Version: 0.0.0+git.20181227 +Version: 0.0.0+git.20201202 Release: 0 Summary: High level XTRX API License: LGPL-2.1-only @@ -31,8 +31,9 @@ URL: http://xtrx.io #Git-Clone: https://github.com/xtrx-sdr/libxtrx.git Source: %{name}-%{version}.tar.xz -Patch1: libxtrx-fix-include.patch -Patch2: libxtrx-fix-xtrx_fft.patch +# We are still using SoapySDR ABI 0.7 (revert change for ABI 0.8 comapatibility) +Patch0: 0001-Fix-test_xtrx_soapy-build-issue.patch +Patch1: 0001-Fix-CMake-FindQCustomPlot.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core @@ -69,6 +70,7 @@ %package -n xtrx-tools Summary: Tools for XTRX Group: Productivity/Hamradio/Other +Requires: %{soapy_modname} %description -n xtrx-tools Tools for XTRX SDR devices. @@ -83,8 +85,8 @@ %prep %setup -q +%patch0 -p1 -R %patch1 -p1 -%patch2 -p1 %build # FIXME: Architecture detection in the used CMake is br0ken, use FORCE_ARCH for now @@ -102,8 +104,10 @@ %install %cmake_install install -d %{buildroot}/%{_bindir} -install -m 0755 build/examples/xtrx_fft/mainwindow %{buildroot}/%{_bindir}/xtrx_fft +#install -m 0755 build/examples/xtrx_fft/mainwindow %{buildroot}/%{_bindir}/xtrx_fft +mv %{buildroot}/%{_libdir}/xtrx/xtrx_fft %{buildroot}/%{_bindir}/xtrx_fft mv %{buildroot}/%{_libdir}/xtrx/test_xtrx %{buildroot}/%{_bindir}/test_xtrx +mv build/soapy/test_xtrx_soapy %{buildroot}/%{_bindir}/test_xtrx_soapy %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -125,6 +129,7 @@ %files -n xtrx-tools %{_bindir}/test_xtrx +%{_bindir}/test_xtrx_soapy %{_bindir}/xtrx_fft %changelog ++++++ 0001-Fix-CMake-FindQCustomPlot.patch ++++++ From 9c2fd206367616b22ab6442aedd2af217e51fd84 Mon Sep 17 00:00:00 2001 From: Martin Hauke <mar...@gmx.de> Date: Thu, 10 Dec 2020 17:54:01 +0100 Subject: [PATCH] Fix CMake FindQCustomPlot --- CMakeLists.txt | 2 +- cmake/FindQCustomPlot.cmake | 31 +++++++++++++++++++++++++ examples/xtrx_fft/CMakeLists.txt | 4 ++-- examples/xtrx_fft/FindQCustomPlot.cmake | 31 +++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 cmake/FindQCustomPlot.cmake create mode 100644 examples/xtrx_fft/FindQCustomPlot.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 4615124..c8ec2d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,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 2d1662a..2cd1ca5 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,5 +27,5 @@ set(mainwindow_SRCS include_directories(${LIBXTRX_INCLUDE_DIRS}) add_executable(xtrx_fft ${mainwindow_SRCS}) -target_link_libraries(xtrx_fft Qt5::Widgets Qt5::PrintSupport ${QCustomPlot_LIBRARIES} ${LIBXTRX_LIBRARIES}) +target_link_libraries(xtrx_fft Qt5::Widgets Qt5::PrintSupport ${QCUSTOMPLOT_LIBRARIES} ${LIBXTRX_LIBRARIES}) install(TARGETS xtrx_fft DESTINATION ${XTRX_UTILS_DIR}) 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) + -- 2.26.2 ++++++ 0001-Fix-test_xtrx_soapy-build-issue.patch ++++++ From bdb2e7ec22d9030c741f7da5b794fde3b778a956 Mon Sep 17 00:00:00 2001 From: ghostop14 <ghosto...@gmail.com> Date: Sun, 29 Mar 2020 18:56:53 -0400 Subject: [PATCH] Fix test_xtrx_soapy build issue The Soapy setupstream function now passes back rxStream as the return value rather than taking it as a parameter. This PR corrects the code to build correctly and addresses issue #23. --- soapy/test_xtrx_soapy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soapy/test_xtrx_soapy.c b/soapy/test_xtrx_soapy.c index de1c52c..7221410 100644 --- a/soapy/test_xtrx_soapy.c +++ b/soapy/test_xtrx_soapy.c @@ -67,8 +67,8 @@ int main(void) //setup a stream (complex floats) SoapySDRStream *rxStream; - if (SoapySDRDevice_setupStream(sdr, &rxStream, SOAPY_SDR_RX, SOAPY_SDR_CF32, NULL, 0, NULL) != 0) - { + rxStream = SoapySDRDevice_setupStream(sdr, SOAPY_SDR_RX, SOAPY_SDR_CF32, NULL, 0, NULL); + if ( rxStream == 0) { printf("setupStream fail: %s\n", SoapySDRDevice_lastError()); } SoapySDRDevice_activateStream(sdr, rxStream, 0, 0, 0); //start streaming -- 2.26.2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.SOQAqK/_old 2020-12-12 20:36:14.154094406 +0100 +++ /var/tmp/diff_new_pack.SOQAqK/_new 2020-12-12 20:36:14.158094410 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/xtrx-sdr/libxtrx.git</param> - <param name="changesrevision">2443a10621039049c3ced7c295d4959e74a1dcef</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">acb0b1cf7ab92744034767a04c1d4b4c281b840f</param></service></servicedata> \ No newline at end of file ++++++ libxtrx-0.0.0+git.20181227.tar.xz -> libxtrx-0.0.0+git.20201202.tar.xz ++++++ ++++ 6455 lines of diff (skipped) _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
