CVS commit: pkgsrc/ham/gnuradio-core

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 18 11:50:39 UTC 2024

Modified Files:
        pkgsrc/ham/gnuradio-core: distinfo options.mk
Added Files:
        pkgsrc/ham/gnuradio-core/patches:
            patch-gnuradio-runtime_lib_io__signature.cc
            patch-gr-blocks_lib_message__debug__impl.cc

Log Message:
gnuradio: fix build w/ fmtlib 11


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/ham/gnuradio-core/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/ham/gnuradio-core/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_io__signature.cc
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/gnuradio-core/distinfo
diff -u pkgsrc/ham/gnuradio-core/distinfo:1.58 pkgsrc/ham/gnuradio-core/distinfo:1.59
--- pkgsrc/ham/gnuradio-core/distinfo:1.58      Sat Jan 27 09:27:36 2024
+++ pkgsrc/ham/gnuradio-core/distinfo   Sun Aug 18 11:50:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2024/01/27 09:27:36 mef Exp $
+$NetBSD: distinfo,v 1.59 2024/08/18 11:50:39 tnn Exp $
 
 BLAKE2s (gnuradio-3.10.9.2.tar.gz) = 1ff9c9ee91f1feddc1c76fed6fa644c7b687e6e5a2ac97f86c69e0c28d76178d
 SHA512 (gnuradio-3.10.9.2.tar.gz) = 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
@@ -7,7 +7,9 @@ SHA1 (patch-cmake_Modules_GrPybind.cmake
 SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = 3e4ae78cd722aa54a9626ca458cfe90ab11619a5
 SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = 8f29121bcff204fd4533c113cd05440a7d39477d
 SHA1 (patch-gnuradio-runtime_lib_constants.cc.in) = fef80a546c713c565c3851ee7289b4fa3a49e45b
+SHA1 (patch-gnuradio-runtime_lib_io__signature.cc) = 296612c8b4d91877dbc0db2e9abf0f692f5f43b5
 SHA1 (patch-gnuradio-runtime_lib_thread_thread.cc) = e3679afc3b05879736c5d5683518405f407313a2
 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = d5acab47fdb007c50bb544af436102f0d38317aa
 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = cfa9b629e5cf21198cfd53cf27a908b5874866f4
+SHA1 (patch-gr-blocks_lib_message__debug__impl.cc) = ae36b039e0224185fdd317390fcdfc47acb28365
 SHA1 (patch-gr-qtgui_examples_c++_CMakeLists.txt) = 06a5885b5e661667cf4bfe936ff45723d0801c22

Index: pkgsrc/ham/gnuradio-core/options.mk
diff -u pkgsrc/ham/gnuradio-core/options.mk:1.10 pkgsrc/ham/gnuradio-core/options.mk:1.11
--- pkgsrc/ham/gnuradio-core/options.mk:1.10    Thu May 16 20:02:20 2024
+++ pkgsrc/ham/gnuradio-core/options.mk Sun Aug 18 11:50:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2024/05/16 20:02:20 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2024/08/18 11:50:39 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnuradio
 PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
@@ -26,7 +26,7 @@ do-build:
 .endif
 
 .if !empty(PKG_OPTIONS:Mfilter-design)
-PYTHON_VERSIONS_INCOMPATIBLE+= 27 38 312
+PYTHON_VERSIONS_INCOMPATIBLE+= 27 38
 DEPENDS+=      ${PYPKGPREFIX}-qtgraph-qt5-[0-9]*:../../x11/py-qtgraph-qt5
 .endif
 

Added files:

Index: pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_io__signature.cc
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_io__signature.cc:1.1
--- /dev/null   Sun Aug 18 11:50:39 2024
+++ pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_io__signature.cc        Sun Aug 18 11:50:39 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-gnuradio-runtime_lib_io__signature.cc,v 1.1 2024/08/18 11:50:39 tnn Exp $
+
+fix build w/ fmtlib 11
+https://github.com/gnuradio/gnuradio/commit/19b070051c1c2b5fb6f2da8fb6422b27418c3dfa.patch
+
+--- gnuradio-runtime/lib/io_signature.cc.orig  2024-01-17 20:36:19.000000000 +0000
++++ gnuradio-runtime/lib/io_signature.cc
+@@ -16,6 +16,11 @@
+ #include <spdlog/tweakme.h>
+ 
+ #include <spdlog/fmt/fmt.h>
++#if __has_include(<spdlog/fmt/ranges.h>)
++#include <spdlog/fmt/ranges.h>
++#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
++#include <spdlog/fmt/bundled/ranges.h>
++#endif
+ #include <string_view>
+ #include <algorithm>
+ #include <memory>

Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc:1.3
--- /dev/null   Sun Aug 18 11:50:39 2024
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc        Sun Aug 18 11:50:39 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-gr-blocks_lib_message__debug__impl.cc,v 1.3 2024/08/18 11:50:39 tnn Exp $
+
+fix build w/ fmtlib 11
+https://github.com/gnuradio/gnuradio/commit/19b070051c1c2b5fb6f2da8fb6422b27418c3dfa.patch
+
+--- gr-blocks/lib/message_debug_impl.cc.orig   2024-01-17 20:36:19.000000000 +0000
++++ gr-blocks/lib/message_debug_impl.cc
+@@ -19,6 +19,11 @@
+ #include <pmt/pmt.h>
+ #include <spdlog/common.h>
+ #include <spdlog/fmt/fmt.h>
++#if __has_include(<spdlog/fmt/ranges.h>)
++#include <spdlog/fmt/ranges.h>
++#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
++#include <spdlog/fmt/bundled/ranges.h>
++#endif
+ #include <functional>
+ #include <utility>
+ #include <vector>