Accepting request 1310900 from hardware:sdr

OBS-URL: https://build.opensuse.org/request/show/1310900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uhd?expand=0&rev=48

boost.patch

@@ -0,0 +1,21 @@
+diff -Nrua uhd-4.9.0.0.orig/host/CMakeLists.txt uhd-4.9.0.0/host/CMakeLists.txt
+--- uhd-4.9.0.0.orig/host/CMakeLists.txt	2025-09-01 15:24:04.000000000 +0200
++++ uhd-4.9.0.0/host/CMakeLists.txt	2025-09-29 13:27:38.331231692 +0200
+@@ -321,7 +321,6 @@
+     date_time
+     filesystem
+     program_options
+-    system
+     serialization
+     thread
+     unit_test_framework
+diff -purN a/uhd-4.9.0.0/host/uhd.pc.in b/uhd-4.9.0.0/host/uhd.pc.in
+--- uhd-4.9.0.0.orig/host/uhd.pc.in	2025-09-01 15:24:04.000000000 +0200
++++ uhd-4.9.0.0/host/uhd.pc.in	2025-10-11 20:32:54.031357131 +0200
+@@ -11,5 +11,5 @@ Requires:
+ Requires.private: @UHD_PC_REQUIRES@
+ Conflicts:
+ Cflags: -I${includedir} @UHD_PC_CFLAGS@
+-Libs: -L${libdir} -luhd -lboost_system
++Libs: -L${libdir} -luhd
+ Libs.private: @UHD_PC_LIBS@

reproducible.patch

@@ -0,0 +1,69 @@
+Date: 2025-02-06
+Author: Bernhard M. Wiedemann
+
+drop build timestamps for reproducible builds
+
+The alternative is to use SOURCE_DATE_EPOCH as described in
+https://reproducible-builds.org/docs/source-date-epoch/#python--3x
+
+diff --git a/host/lib/convert/gen_convert_general.py b/host/lib/convert/gen_convert_general.py
+index eb43301..97d0f55 100644
+--- a/host/lib/convert/gen_convert_general.py
++++ b/host/lib/convert/gen_convert_general.py
+@@ -14,7 +14,7 @@ TMPL_HEADER = """
+     import time
+ %>
+ /***********************************************************************
+- * This file was generated by ${file} on ${time.strftime("%c")}
++ * This file was generated by ${file}
+  **********************************************************************/
+ 
+ #include "convert_common.hpp"
+diff --git a/host/lib/ic_reg_maps/common.py b/host/lib/ic_reg_maps/common.py
+index 499f262..96b0e1d 100644
+--- a/host/lib/ic_reg_maps/common.py
++++ b/host/lib/ic_reg_maps/common.py
+@@ -13,7 +13,7 @@ from mako.template import Template
+ 
+ COMMON_TMPL = """<% import time %>\
+ /***********************************************************************
+- * This file was generated by ${file} on ${time.strftime("%c")}
++ * This file was generated by ${file}
+  **********************************************************************/
+ 
+ #ifndef INCLUDED_${name.upper()}_HPP
+@@ -128,7 +128,7 @@ private:
+ # This template matches the functionality of COMMON_TMPL in Python syntax
+ COMMON_PY_TMPL = """<% import time %>\
+ ##########################################################################
+-# This file was generated by ${file} on ${time.strftime("%c")}
++# This file was generated by ${file}
+ <%text>##########################################################################</%text>
+ 
+ from enum import Enum
+diff --git a/host/lib/include/uhdlib/usrp/common/rpc.py b/host/lib/include/uhdlib/usrp/common/rpc.py
+index 5ed6b13..72ea334 100644
+--- a/host/lib/include/uhdlib/usrp/common/rpc.py
++++ b/host/lib/include/uhdlib/usrp/common/rpc.py
+@@ -126,7 +126,7 @@ IFACES = [
+ 
+ COMMON_TMPL = """<% import time %>\
+ /***********************************************************************
+- * This file was generated by ${file} on ${time.strftime("%c")}
++ * This file was generated by ${file}
+  **********************************************************************/
+ 
+ //
+diff --git a/host/lib/transport/gen_vrt_if_packet.py b/host/lib/transport/gen_vrt_if_packet.py
+index 865b972..9b19c15 100644
+--- a/host/lib/transport/gen_vrt_if_packet.py
++++ b/host/lib/transport/gen_vrt_if_packet.py
+@@ -17,7 +17,7 @@ The generated code infers jump tables to speed-up the parsing time.
+ 
+ TMPL_TEXT = """<% import time %>
+ /***********************************************************************
+- * This file was generated by ${file} on ${time.strftime("%c")}
++ * This file was generated by ${file}
+  **********************************************************************/
+ 
+ #include <uhd/exception.hpp>

uhd-4.7.0.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afe56842587ce72d6a57535a2b15c061905f0a039abcc9d79f0106f072a00d10
-size 41128157

uhd-4.9.0.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2288998dc0eeece287934e016d1501d5c200aa8047553d7405f3c3e0e5edac8
+size 37510586

uhd-images_4.7.0.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f12706080502cc4c69a3abcdc05ae919dd177e38b19e99d574e93091b5bd1525
-size 180670936

uhd-images_4.9.0.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e5c508d334ce2b1164e42040cda5a6a010f1ac03a711ad691bcbe6377d58fa4
+size 176470760

uhd.changes

@@ -1,3 +1,111 @@
+-------------------------------------------------------------------
+Sat Oct 11 18:34:04 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- Remove -lboost_system from pkgconfig template as well
+  % boost.patch
+
+-------------------------------------------------------------------
+Mon Sep 29 11:27:45 UTC 2025 - Ana Guerrero <ana.guerrero@suse.com>
+
+-  Remove BuildRequires on libboost_system-devel,
+   removed on boost 1.89 (bsc#1249599)
+   * Patch boost.patch
+ 
+-------------------------------------------------------------------
+Sat Sep  6 15:15:46 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- Update to version 4.9.0.0
+  * Highlights / Main Changes
+    + Support for USRP B206mini-i
+    + Support for OBX daughterboard
+  * New Features
+    + OBX daughterboard and B206mini support added.
+    + X3x0: Add support for the gps_iface feature. This allows
+      sending arbitrary commands to the GPS module.
+    + rfnoc_modtool: Add a new subcommand, make-yaml, that
+      generates a block YAML file from some user inputs. When
+      calling rfnoc_modtool add without a valid block YAML file,
+      the tool will now automatically call make-yaml to generate
+      a new YAML file.
+    + Added support for processing multiple samples per cycle in
+      FFT block.
+    + LabVIEW/USRP: New repository containing example applications
+      which demonstrate how to use NI LabVIEW with USRP devices
+      via the UHD APIs. (https://github.com/ni/labview-usrp-examples)
+    + Improved RFNoC OOT Block support:
+      New repository containing official RFNoC OOT Blocks
+      (https://github.com/EttusResearch/rfnoc-oot-blocks)
+      . Added new RFNoC Aurora Block for TX and RX remote streaming
+        applications to and from Aurora capable compute nodes like
+        FPGA Coprocessors.
+  * API Changes
+    + uhd::math::gcd and uhd::math::lcm are removed from the public
+      headers. Use std::gcd and std::lcm instead if C++17 is
+      available, or boost::math::gcd and boost::math::lcm if not.
+    + When calling recv() on an RX streamer connected to an RFNoC
+      device, we no longer artificially inflate the timeout value.
+      The old behaviour was in some cases abused to detect overruns,
+      but this is not a reliable method and is now explicitly
+      declared unsupported.
+  * Bug Fixes
+    + RFNoC
+      . Calling recv() on an RX streamer connected to an RFNoC
+        device with azero timeout value now correctly returns
+        immediately.
+      . rfnoc-gain: Moved the fpga/ subdirectory under rfnoc/.
+        This way, the directory structure inside the OOT module is
+        identical to the directory structure after installation.
+    + X410:
+      . Fixed NCO reset mechanism that caused ADC self-cal errors
+        to occur during reopening of a UHD session when timed tune
+        commands were previously used.
+  * Removals / Deprecations
+    + Removed tools/uhd_dump. This tool is obsolete, the USRP X3x0
+      is not even compatible with it any more. Dumps can be recorded
+      and analyzed with wireshark and the UHD dissectors in here.
+    + Removed network_relay example.
+- Remove uhd-new-boost.patch and uhd-fix-build-gcc15.patch patches
+  (applied upstream)
+
+-------------------------------------------------------------------
+Wed Jul  9 08:53:02 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- Add uhd-fix-build-gcc15.patch to allow building with latest gcc
+- Fix build far Factory_ARM
+
+-------------------------------------------------------------------
+Tue May 27 06:25:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Add uhd-new-boost.patch to allow building with boost 1.88.0+
+
+-------------------------------------------------------------------
+Sat Mar 22 00:47:02 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
+
+- Add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix FTBFS from cmake4
+- Remove Group: Declarations, no longer used
+
+-------------------------------------------------------------------
+Sat Feb  8 12:56:30 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- Fix location of python examples
+
+-------------------------------------------------------------------
+Thu Feb  6 06:53:59 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add reproducible.patch to drop build date (boo#1047218)
+
+-------------------------------------------------------------------
+Wed Feb  5 08:56:57 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- Update to version 4.8.0.0
+  * Highlights / Main Changes:
+    + Addition of rfnoc_modtool and further improvements to RFNoC
+      Image Builder toolsets. This further improves the ability to
+      design RFNoC blocks and create custom FPGA bitfiles.
+    + Replaced RFNoC FFT block with a new version
+  See: https://github.com/EttusResearch/uhd/releases for all changes
+- Python 3.7+ is required for building python bindings.
+
 -------------------------------------------------------------------
 Sat Jun 29 21:43:53 UTC 2024 - Wojciech Kazubski <wk@ire.pw.edu.pl>
 

uhd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package uhd
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,20 @@
 #
 
 
-%define libname libuhd4_7_0
+%define libname libuhd4_9_0
 Name:           uhd
-Version:        4.7.0.0
+Version:        4.9.0.0
 Release:        0
 Summary:        The driver for USRP SDR boards
 License:        GPL-3.0-or-later
-Group:          Hardware/Other
 URL:            https://files.ettus.com/manual/
 Source0:        https://github.com/EttusResearch/uhd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        https://github.com/EttusResearch/uhd/releases/download/v%{version}/uhd-images_%{version}.tar.xz
-# PATCH-FIX-UPSTREAM fix-boost1.85-one.patch -- https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0
-# Patch0:         fix-boost1.85-one.patch
-# PATCH-FIX-UPSTREAM fix-boost1.85-two.patch -- https://github.com/EttusResearch/uhd/commit/c4863b9b9f8b639260f7797157e8ac4dd81fef93
-# Patch1:         fix-boost1.85-two.patch
-BuildRequires:  cmake >= 2.6
+Patch0:         reproducible.patch
+# This has been fixed upstream and this patch will need to be removed in next release.
+Patch1:         boost.patch
+
+BuildRequires:  cmake >= 3.5
 BuildRequires:  docutils
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -51,7 +50,6 @@ BuildRequires:  libboost_filesystem-devel
 BuildRequires:  libboost_program_options-devel
 BuildRequires:  libboost_regex-devel
 BuildRequires:  libboost_serialization-devel
-BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_test-devel
 BuildRequires:  libboost_thread-devel
 
@@ -63,7 +61,6 @@ UHD driver standalone or with 3rd party applications.
 
 %package     -n %{libname}
 Summary:        The UHD driver
-Group:          Hardware/Other
 Requires:       %{name}-udev >= %{version}
 # PRE script requires /usr/sbin/groupadd, that exists in the "shadow" package
 Requires(pre):  shadow
@@ -76,8 +73,9 @@ UHD driver standalone or with 3rd party applications.
 
 %package        utils
 Summary:        Utility programs for USRP hardware
-Group:          Hardware/Other
+%if 0%{?suse_version} >= 1600
 Requires:       python3-%{name} >= %{version}
+%endif
 
 %description    utils
 The UHD is the "Universal Software Radio Peripheral" hardware driver.
@@ -89,7 +87,6 @@ This package contains utility programs for handling USRP frontens
 
 %package     -n python3-%{name}
 Summary:        Python bindings for uhd
-Group:          Hardware/Other
 
 %description  -n python3-%{name}
 The UHD is the "Universal Software Radio Peripheral" hardware driver.
@@ -101,7 +98,6 @@ This package contains Python bindings UHD.
 
 %package        udev
 Summary:        UHD udev rules
-Group:          Hardware/Other
 
 %description    udev
 The UHD is the "Universal Software Radio Peripheral" hardware driver.
@@ -113,7 +109,6 @@ This package contains udev rules for UHD.
 
 %package        devel
 Summary:        Development files for uhd
-Group:          Development/Libraries/Other
 Requires:       %{libname} = %{version}
 Recommends:     %{name}-doc
 Requires:       libboost_filesystem-devel
@@ -134,7 +129,6 @@ files for development with the UHD Driver.
 
 %package        doc
 Summary:        Documentation files for uhd
-Group:          Documentation/Other
 BuildArch:      noarch
 
 %description    doc
@@ -142,7 +136,6 @@ This package contains the documentation for the Universal Hardware Driver (UHD).
 
 %package        firmware
 Summary:        Firmware images for uhd
-Group:          Hardware/Other
 Requires:       %{libname} = %{version}
 BuildArch:      noarch
 
@@ -164,6 +157,7 @@ cd host
 %cmake \
   -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
   -DENABLE_TESTS=OFF \
+  -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 %ifarch %arm
   -DNEON_SIMD_ENABLE=OFF \
 %endif
@@ -185,17 +179,18 @@ sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE
 install -m 0644 -D %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_udevrulesdir}/10-usrp-uhd.rules
 rm %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
 
-## Move documentation to the default docdir
-mkdir -p  %{buildroot}%{_docdir}/uhd
-mv %{buildroot}%{_datadir}/doc/uhd %{buildroot}%{_docdir}/
+## Move executable files to the default bindir
 mv %{buildroot}%{_libdir}/uhd/utils/*[!.rules] %{buildroot}%{_bindir}
+%if 0%{?suse_version} >= 1600
+%ifnarch armv7hl
+mv %{buildroot}%{_libdir}/uhd/examples/python/* %{buildroot}%{_bindir}
+rm -R %{buildroot}%{_libdir}/uhd/examples/python
+%endif
+%endif
 mv %{buildroot}%{_libdir}/uhd/examples/* %{buildroot}%{_bindir}
-mv %{buildroot}%{_bindir}/python/* %{buildroot}%{_bindir}
-rm -R %{buildroot}%{_bindir}/python
+rm -R %{buildroot}%{_libdir}/uhd/examples
 #mv %%{buildroot}%%{_libdir}/uhd/tests/*_test %%{buildroot}%%{_bindir}
-#
 #rm -R %%{buildroot}%%{_libdir}/uhd/tests
-#rm -R %%{buildroot}%%{_libdir}/uhd/examples
 #
 rm %{buildroot}%{_docdir}/uhd/LICENSE
 rm %{buildroot}%{_docdir}/uhd/README.md
@@ -208,7 +203,7 @@ mv %{buildroot}%{_libdir}/uhd/utils/query_gpsdo_sensors %{buildroot}%{_bindir}
 ## extract firmware
 mkdir -p %{buildroot}%{_datadir}/uhd/images
 tar -xxvf %{SOURCE1} --transform="s,^uhd-images_%{version}/,," --show-transformed-names -C %{buildroot}%{_datadir}/uhd/images/
-rm -R %{buildroot}%{_datadir}/uhd/images/winusb_driver/
+#rm -R %{buildroot}%{_datadir}/uhd/images/winusb_driver/
 
 # find dupes
 %fdupes -s %{buildroot}%{_prefix}
@@ -234,9 +229,13 @@ getent group usrp >/dev/null || %{_sbindir}/groupadd -r usrp
 %{_datadir}/uhd/rfnoc
 %{_mandir}/man1/*
 
+%if 0%{?suse_version} >= 1600
 %files -n python3-%{name}
+%ifnarch armv7hl
 %{python3_sitearch}/uhd
 %{python3_sitearch}/usrp_mpm
+%endif
+%endif
 
 %files udev
 %{_udevrulesdir}/10-usrp-uhd.rules