wavelet-lab · irodushka · May 23, 2025 · May 24, 2025 · May 26, 2025 · May 26, 2025
diff --git a/README.md b/README.md
@@ -116,3 +116,43 @@ cd ../src/lib/lowlevel/pcie_uram/driver
 make
 sudo insmod usdr_pcie_uram.ko
 ````
+
+## Finding the installed `usdr` library
+
+You can find and use the installed library in two common ways — with `pkg-config` or with CMake's `find_package`.
+
+- Using pkg-config
+
+```bash
+# set to the install prefix used during `make install`
+export INSTALL_PREFIX=/path/to/install
+export PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# Get version, cflags and libs
+pkg-config --modversion usdr
+pkg-config --cflags usdr   # include flags, e.g. -I/path/to/install/include
+pkg-config --libs usdr     # link flags, e.g. -L/path/to/install/lib -lusdr
+```
+
+- Using CMake `find_package` (CONFIG-mode)
+
+Create a small CMake project that uses the installed package (replace `/path/to/install` with your install prefix):
+
+```cmake
+cmake_minimum_required(VERSION 3.8)
+project(example C)
+find_package(usdr CONFIG REQUIRED)
+add_executable(example main.c)
+target_link_libraries(example PRIVATE usdr::usdr)
+```
+
+Then configure and build:
+
+```bash
+mkdir build && cd build
+cmake -DCMAKE_PREFIX_PATH=/path/to/install ..
+cmake --build .
+```
+
+If `find_package` fails, ensure the file `usdrConfig.cmake` is installed under `<install-prefix>/lib/cmake/usdr/` (or the corresponding `libdir/cmake/usdr` for your system) and pass that prefix via `CMAKE_PREFIX_PATH`.
+
diff --git a/Taskfile.box.yaml b/Taskfile.box.yaml
@@ -7,7 +7,7 @@ vars:
   NOW:
     sh: "date +%Y%m%d%H%m%S"
   LABEL:
-    sh: "echo box-$(basename {{.ROOT_DIR}})"
+    sh: "echo box-$(basename {{.ROOT_DIR}} | tr '[:upper:]' '[:lower:]')"
   DOCKER_FILE_PREFIX: "docker/Dockerfile.box"
 
 tasks:

diff --git a/docker/Taskfile.yaml b/docker/Taskfile.yaml
@@ -42,6 +42,8 @@ tasks:
       - prepare
     dir: /work/build/source
     cmds:
+      - echo "#!/usr/bin/env sh" > /usr/bin/lintian # dirty hack to disable lintian
+      - echo "exit 0" >> /usr/bin/lintian
       - debuild -us -uc -eDH_VERBOSE=1
       - cp -ra /work/build/*.deb /work/output/{{.OUTPUT_DIR_NAME}}/
 

diff --git a/packaging/debian-bookworm/changelog b/packaging/debian-bookworm/changelog
@@ -1,5 +1,5 @@
-usdr (0.9.9~bookworm0) stable; urgency=low
+usdr (0.9.10b~bookworm0) stable; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Thu, 26 Jun 2025 00:00:00 +0000
diff --git a/packaging/debian-bookworm/control b/packaging/debian-bookworm/control
@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

diff --git a/packaging/ubuntu-bionic/changelog b/packaging/ubuntu-bionic/changelog
@@ -1,5 +1,5 @@
-usdr (0.9.9~bionic0) bionic; urgency=low
+usdr (0.9.10b~bionic0) bionic; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Thu, 26 Jun 2025 00:00:00 +0000
diff --git a/packaging/ubuntu-bionic/control b/packaging/ubuntu-bionic/control
@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

diff --git a/packaging/ubuntu-focal/changelog b/packaging/ubuntu-focal/changelog
@@ -1,5 +1,5 @@
-usdr (0.9.9~focal0) focal; urgency=low
+usdr (0.9.10b~focal0) focal; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Thu, 26 Jun 2025 00:00:00 +0000
diff --git a/packaging/ubuntu-focal/control b/packaging/ubuntu-focal/control
@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

diff --git a/packaging/ubuntu-jammy/changelog b/packaging/ubuntu-jammy/changelog
@@ -1,5 +1,5 @@
-usdr (0.9.9~jammy0) jammy; urgency=low
+usdr (0.9.10b~jammy0) jammy; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Thu, 26 Jun 2025 00:00:00 +0000
diff --git a/packaging/ubuntu-jammy/control b/packaging/ubuntu-jammy/control
@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

diff --git a/packaging/ubuntu-noble/changelog b/packaging/ubuntu-noble/changelog
@@ -1,5 +1,5 @@
-usdr (0.9.9~noble0) noble; urgency=low
+usdr (0.9.10b~noble0) noble; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>  Thu, 26 Jun 2025 00:00:00 +0000
diff --git a/packaging/ubuntu-noble/control b/packaging/ubuntu-noble/control
@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <ivan.kolesnikov@wavelet-lab.com>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2023-2024 Wavelet Lab
+# Copyright (c) 2023-2026 Wavelet Lab
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.8)
@@ -34,7 +34,7 @@ option(ENABLE_DMONITOR  "Enable debug tools" ON)
 option(ENABLE_VERILATOR "Enable verilator lowlevel bridge" OFF)
 option(ENABLE_SOAPY "Enable SopaySDR support" ON)
 option(ENABLE_GUI  "Enable USDR QT5 simple GUI" ON)
-option(ENABLE_TESTS  "Enable tests" ON)
+option(ENABLE_TESTS  "Enable tests" OFF)
 
 
 add_feature_info(VerilatorBridge ENABLE_VERILATOR "Verilator support for emulated devices")
@@ -94,3 +94,8 @@ message(STATUS "Install libs: ${CMAKE_INSTALL_LIBDIR}")
 message(STATUS "Shared libs: ${BUILD_SHARED_LIBS}")
 message(STATUS "Data dir: ${CMAKE_INSTALL_FULL_DATADIR}")
 message(STATUS "######################################################")
+
+include(cmake/UsdrPackage.cmake)
+
+# Use helper to generate/install CMake config, exported targets and pkg-config file
+usdr_install_package(NAME usdr VERSION ${USDR_VERSION} TARGETS usdrTargets PKGCONFIG ON)
diff --git a/src/Changelog.txt b/src/Changelog.txt
@@ -1,3 +1,8 @@
+Release 0.9.10b (2025-06-26)
+==========================
+
+- Fixes and improvements
+
 Release 0.9.9 (2025-01-30)
 ==========================
 

diff --git a/src/cmake/UsdrPackage.cmake b/src/cmake/UsdrPackage.cmake
@@ -0,0 +1,73 @@
+# Usdr CMake package helper
+# Provides a function `usdr_install_package(NAME <name> VERSION <ver> TARGETS <exported_targets> PKGCONFIG <ON|OFF>)`
+
+include(CMakePackageConfigHelpers)
+get_filename_component(USDR_PACKAGE_HELPER_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+function(usdr_install_package)
+    cmake_parse_arguments(_u "" "NAME;VERSION;PKGCONFIG" "TARGETS" ${ARGN})
+
+    if(NOT _u_NAME)
+        message(FATAL_ERROR "usdr_install_package: NAME is required")
+    endif()
+    if(NOT _u_VERSION)
+        message(FATAL_ERROR "usdr_install_package: VERSION is required")
+    endif()
+
+    set(_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${_u_NAME}")
+
+    # Helper dir (set at include-time) points to this file's directory
+    set(_usdr_helper_dir "${USDR_PACKAGE_HELPER_DIR}")
+
+    # Configure and write CMake package config files
+    set(_config_in "${_usdr_helper_dir}/${_u_NAME}Config.cmake.in")
+    if(NOT IS_ABSOLUTE "${_config_in}")
+        get_filename_component(_config_in "${_config_in}" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+    endif()
+
+    configure_package_config_file(
+        "${_config_in}"
+        "${CMAKE_CURRENT_BINARY_DIR}/${_u_NAME}Config.cmake"
+        INSTALL_DESTINATION "${_install_dir}"
+    )
+
+    write_basic_package_version_file(
+        "${CMAKE_CURRENT_BINARY_DIR}/${_u_NAME}ConfigVersion.cmake"
+        VERSION ${_u_VERSION}
+        COMPATIBILITY AnyNewerVersion
+    )
+
+    install(FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/${_u_NAME}Config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${_u_NAME}ConfigVersion.cmake"
+        DESTINATION "${_install_dir}"
+    )
+
+    # Install exported CMake targets
+    if(_u_TARGETS)
+        install(EXPORT ${_u_TARGETS}
+            FILE ${_u_NAME}Targets.cmake
+            NAMESPACE ${_u_NAME}::
+            DESTINATION "${_install_dir}"
+        )
+    endif()
+
+    # Optionally generate and install a pkg-config file
+    if(_u_PKGCONFIG STREQUAL "ON")
+        set(_pc_in "${_usdr_helper_dir}/${_u_NAME}.pc.in")
+        if(NOT IS_ABSOLUTE "${_pc_in}")
+            get_filename_component(_pc_in "${_pc_in}" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+        endif()
+
+        # Provide substitutions for the pkg-config template
+        set(PACKAGE_NAME "${_u_NAME}")
+        set(PACKAGE_VERSION "${_u_VERSION}")
+
+        configure_file("${_pc_in}"
+                       "${CMAKE_CURRENT_BINARY_DIR}/${_u_NAME}.pc" @ONLY)
+        unset(PACKAGE_NAME CACHE)
+        unset(PACKAGE_VERSION CACHE)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_u_NAME}.pc"
+                DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+    endif()
+endfunction()
diff --git a/src/cmake/detect_arch.cmake b/src/cmake/detect_arch.cmake
@@ -9,7 +9,7 @@ if(${WVLT_ARCH} STREQUAL "x86")
     message(STATUS "Will compile for ${WVLT_ARCH} architecture")
     message(STATUS "Intel SIMD intrinsics will be used")
 
-elseif(${WVLT_ARCH} STREQUAL "x86_64")
+elseif(${WVLT_ARCH} STREQUAL "x86_64" OR ${WVLT_ARCH} STREQUAL "AMD64")
     add_definitions(-DWVLT_ARCH_X86_64)
     set(WVLT_ARCH_X86_64 1 CACHE BOOL "Arch x86_64")
     message(STATUS "Will compile for ${WVLT_ARCH} architecture")

diff --git a/src/cmake/usdr.pc.in b/src/cmake/usdr.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}/@CMAKE_INSTALL_BINDIR@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/usdr
+
+Name: @PACKAGE_NAME@
+Description: usdr library
+URL: https://docs.wsdr.io
+Version: @PACKAGE_VERSION@
+Requires: libusb-1.0
+Libs: -L${libdir} -l@PACKAGE_NAME@
+Cflags: -I${includedir}
diff --git a/src/cmake/usdrConfig.cmake.in b/src/cmake/usdrConfig.cmake.in
@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+# Find dependencies used by the usdr package
+include(CMakeFindDependencyMacro)
+find_dependency(LIBUSB_1 REQUIRED)
+
+# Import the targets exported by the usdr build
+include("${CMAKE_CURRENT_LIST_DIR}/usdrTargets.cmake")
diff --git a/src/dmonitor/pyqt5_widget.py b/src/dmonitor/pyqt5_widget.py
@@ -1,25 +1,31 @@
 #!/usr/bin/python3
 
-# Copyright (c) 2023-2024 Wavelet Lab
+# Copyright (c) 2023-2026 Wavelet Lab
 # SPDX-License-Identifier: MIT
 
 import sys
-from PyQt5.QtWidgets import *
-from PyQt5.QtGui import QRegExpValidator, QPalette, QColor, QIcon
-from PyQt5.QtCore import Qt, QObject, pyqtSignal, QRegExp
+try:
+    from PySide6.QtWidgets import *
+    from PySide6.QtGui import QRegularExpressionValidator, QPalette, QColor, QIcon
+    from PySide6.QtCore import Qt, QObject, Signal, QRegularExpression
+    QT_VER = 6
+except ImportError:
+    from PyQt5.QtWidgets import *
+    from PyQt5.QtGui import QRegExpValidator, QPalette, QColor, QIcon
+    from PyQt5.QtCore import Qt, QObject, pyqtSignal, QRegExp
+    QT_VER = 5
+
 import math
 import configparser
 import re
 import time
 import os
 
-
 ABS_PATH = os.path.dirname(os.path.abspath(__file__))
 
-
 class LongSpinBox(QAbstractSpinBox):
-    valueChanged = pyqtSignal(int)
-    clicked = pyqtSignal(Qt.MouseButton)
+    valueChanged = Signal(int) if QT_VER == 6 else pyqtSignal(int)
+    clicked = Signal(Qt.MouseButton)if QT_VER == 6 else pyqtSignal(Qt.MouseButton)
 
     def __init__(self, parent = None):
         super(LongSpinBox, self).__init__(parent)
@@ -28,7 +34,11 @@ def __init__(self, parent = None):
         self.setMaximum(255)
         self.lineEdit().setText("0")
         self.lineEdit().textChanged.connect(lambda t: self.setValue(int(t)))
-        self.lineEdit().setValidator(QRegExpValidator(QRegExp("[0-9]*"), self.lineEdit()))
+
+        if QT_VER == 6:
+            self.lineEdit().setValidator(QRegularExpressionValidator(QRegularExpression("[0-9]*"), self.lineEdit()))
+        else:
+            self.lineEdit().setValidator(QRegExpValidator(QRegExp("[0-9]*"), self.lineEdit()))
 
     def setMaximum(self, max_value):
         self.maximum = max_value
@@ -312,11 +322,11 @@ def load_button_clicked(self)->None:
             if(not line):
                 break
 
-            line = line.rstrip('\n').strip()
+            line = line.rstrip(r'\n').strip()
 
             if(found):
 
-                if re.match('^\[(.*)\]$', line) is not None:
+                if re.match(r'^\[(.*)\]$', line) is not None:
                     break
 
                 parts = line.split('=')
@@ -334,14 +344,14 @@ def load_button_clicked(self)->None:
                 regcnt += 1
                 #print('loaded 0x%04x=0x%04x' % (addr, val))
             else:
-                found = ('[%s]' % ini_section_name) == line
+                found = (r'[%s]' % ini_section_name) == line
                 if(found):
-                    print('LOAD: found section [%s] in file "%s"' % (ini_section_name, inifile_name))
+                    print(r'LOAD: found section [%s] in file "%s"' % (ini_section_name, inifile_name))
 
         if(not found):
-            print('LOAD: section [%s] not found in file "%s", registers were not loaded!' % (ini_section_name, inifile_name))
+            print(r'LOAD: section [%s] not found in file "%s", registers were not loaded!' % (ini_section_name, inifile_name))
         else:
-            print('LOAD: %d registers were loaded from "%s".[%s]' % (regcnt, inifile_name, ini_section_name))
+            print(r'LOAD: %d registers were loaded from "%s".[%s]' % (regcnt, inifile_name, ini_section_name))
             self.update()
 
         f.close()