[arch-commits] Commit in gnuradio/trunk (6 files)

Felix Yan felixonmars at gemini.archlinux.org
Fri Aug 19 13:12:42 UTC 2022 

    Date: Friday, August 19, 2022 @ 13:12:42
  Author: felixonmars
Revision: 1270080

upgpkg: gnuradio 3.10.2.0-7: rebuild with fmt 9.0

Added:
  gnuradio/trunk/gnuradio-fmt-9.0.patch
  gnuradio/trunk/keys/
  gnuradio/trunk/keys/pgp/
  gnuradio/trunk/keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc
  gnuradio/trunk/keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc
Modified:
  gnuradio/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |    5 
 gnuradio-fmt-9.0.patch                                |  145 ++++++++++++++++
 keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc |    1 
 keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc |    1 
 4 files changed, 151 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-19 13:10:42 UTC (rev 1270079)
+++ PKGBUILD	2022-08-19 13:12:42 UTC (rev 1270080)
@@ -5,7 +5,7 @@
 pkgbase=gnuradio
 pkgname=(gnuradio gnuradio-companion)
 pkgver=3.10.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
 arch=('x86_64')
 url="https://gnuradio.org"
@@ -40,11 +40,13 @@
         #"https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/gnuradio-$pkgver.tar.gz"
         # "https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/gnuradio-$pkgver.tar.gz.asc"
         gnuradio-bind-placeholders.patch
+        gnuradio-fmt-9.0.patch
         "21-fcd.rules")
 validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2'  # GNU Radio Project
               'D74F9F146E7F755783583158B343B2BA293E5174') # Marcus Müller
 sha512sums=('f34cd3aee1a5d72da387246c25f8494d9a28b2d66aa58ec99a6ff2ae45672f3ec65111af095282f026e2ef267bca2e64042a2aa3ee284ce770351629963fe468'
             'f4e52e6e9ef6054f358d3ee00cbcb70bab65c36dfac8975c3182f6514c547905f36801a049f0918d69c9ffd98ce801891a3bfc4e4faeb8fb33582d84140a70b7'
+            'cb45360160325fb8904a7d2edf2eaf09143327c3133575f91cfe2fb41a4ce06102b1ba364ac5917fddd78b24ebc0038f1eabc02476e211429410a39242069851'
             '6f02dc8e20a7a1cd11099c851a7c8427fcd21e9652e6cddd0a72ca747b0e93cd4fd1b7b7b7e426b6231348bcc34fb2417716a2f03c92ec141889edc65031c3a0')
 
 prepare() {
@@ -51,6 +53,7 @@
   cd "$srcdir/$pkgbase-$pkgver"
   #patch -Np1 -i ../gnuradio-bind-placeholders.patch
   sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/scripts/freedesktop/CMakeLists.txt
+  patch -Np1 -i ../gnuradio-fmt-9.0.patch
 }
 
 build() {

Added: gnuradio-fmt-9.0.patch
===================================================================
--- gnuradio-fmt-9.0.patch	                        (rev 0)
+++ gnuradio-fmt-9.0.patch	2022-08-19 13:12:42 UTC (rev 1270080)
@@ -0,0 +1,145 @@
+From e63ee41fd455cdd39ae983c258d8632c3ea57fc6 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar at gmail.com>
+Date: Sun, 7 Aug 2022 22:06:30 +0800
+Subject: [PATCH] Fix build failures with libfmt-9.0.0
+
+libfmt-9.0.0 require explicit tagging of ARG types. This commit
+adds those tags for the types that are currently formatted via fmt.
+
+Bug: https://bugs.gentoo.org/858659
+Closes: https://github.com/gnuradio/gnuradio/issues/6052
+Signed-off-by: Huang Rui <vowstar at gmail.com>
+---
+ gnuradio-runtime/lib/flat_flowgraph.cc     | 25 ++++++++++++++++++++++
+ gnuradio-runtime/lib/flowgraph.cc          | 10 +++++++++
+ gnuradio-runtime/lib/hier_block2_detail.cc | 19 ++++++++++++++++
+ gr-analog/lib/sig_source_impl.cc           | 10 +++++++++
+ gr-uhd/lib/usrp_block_impl.cc              |  7 ++++++
+ 5 files changed, 71 insertions(+)
+
+diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc
+index 42875fb4c32..ac7c8ce9109 100644
+--- a/gnuradio-runtime/lib/flat_flowgraph.cc
++++ b/gnuradio-runtime/lib/flat_flowgraph.cc
+@@ -25,6 +25,31 @@
+ #include <map>
+ #include <numeric>
+ 
++#if FMT_VERSION >= 90000
++#include <fmt/ostream.h>
++template <>
++struct fmt::formatter<gr::edge> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<gr::msg_endpoint> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<gr::block_detail>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<gr::buffer_reader>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<gr::buffer>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
++};
++#endif // FMT_VERSION >= 90000
++
+ namespace gr {
+ 
+ 
+diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc
+index 0bc04adc22c..6c63b834a89 100644
+--- a/gnuradio-runtime/lib/flowgraph.cc
++++ b/gnuradio-runtime/lib/flowgraph.cc
+@@ -20,6 +20,16 @@
+ // TODO: Replace with GNU Radio logging
+ #include <iostream>
+ 
++#if FMT_VERSION >= 90000
++#include <fmt/ostream.h>
++template <>
++struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
++};
++#endif // FMT_VERSION >= 90000
++
+ namespace gr {
+ 
+ edge::~edge() {}
+diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
+index 5cb42030dca..d3e27aee5b4 100644
+--- a/gnuradio-runtime/lib/hier_block2_detail.cc
++++ b/gnuradio-runtime/lib/hier_block2_detail.cc
+@@ -22,6 +22,25 @@
+ // TODO: Replace with GNU Radio logging
+ #include <iostream>
+ 
++#if FMT_VERSION >= 90000
++#include <fmt/ostream.h>
++template <>
++struct fmt::formatter<gr::edge> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<gr::endpoint> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<gr::msg_endpoint> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
++};
++#endif // FMT_VERSION >= 90000
++
+ namespace gr {
+ 
+ hier_block2_detail::hier_block2_detail(hier_block2* owner)
+diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc
+index 0e1db81648a..afa6d779cb0 100644
+--- a/gr-analog/lib/sig_source_impl.cc
++++ b/gr-analog/lib/sig_source_impl.cc
+@@ -21,6 +21,16 @@
+ #include <algorithm>
+ #include <stdexcept>
+ 
++#if FMT_VERSION >= 90000
++#include <fmt/ostream.h>
++template <>
++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
++};
++template <>
++struct fmt::formatter<gr::analog::gr_waveform_t&> : ostream_formatter {
++};
++#endif // FMT_VERSION >= 90000
++
+ namespace gr {
+ namespace analog {
+ 
+diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
+index cb6dccfcdea..b11b82a9e70 100644
+--- a/gr-uhd/lib/usrp_block_impl.cc
++++ b/gr-uhd/lib/usrp_block_impl.cc
+@@ -12,6 +12,13 @@
+ #include <chrono>
+ #include <thread>
+ 
++#if FMT_VERSION >= 90000
++#include <fmt/ostream.h>
++template <>
++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter {
++};
++#endif // FMT_VERSION >= 90000
++
+ using namespace gr::uhd;
+ using namespace std::chrono_literals;
+ 

Added: keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc
===================================================================
(Binary files differ)

Index: gnuradio/trunk/keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc
===================================================================
--- keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc	2022-08-19 13:10:42 UTC (rev 1270079)
+++ keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc	2022-08-19 13:12:42 UTC (rev 1270080)

Property changes on: gnuradio/trunk/keys/pgp/B90DDFAC56989BF62262EB812987C77CBB8ED9B2.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc
===================================================================
(Binary files differ)

Index: gnuradio/trunk/keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc
===================================================================
--- keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc	2022-08-19 13:10:42 UTC (rev 1270079)
+++ keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc	2022-08-19 13:12:42 UTC (rev 1270080)

Property changes on: gnuradio/trunk/keys/pgp/D74F9F146E7F755783583158B343B2BA293E5174.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property

More information about the arch-commits mailing list