diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-21 02:09:25 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-21 02:09:25 +0000 |
commit | afcb9236a72cf602364c28b9bde6648e4a7f1ca5 (patch) | |
tree | 9608aa2c881b2688207832334c938f0e38d5c71c /net-wireless/gnuradio | |
parent | d3419aa304ff2564036398be5e8ed4bdeaeaa007 (diff) |
gentoo auto-resync : 21:01:2024 - 02:09:25
Diffstat (limited to 'net-wireless/gnuradio')
4 files changed, 0 insertions, 194 deletions
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 2513de39294e..f4aa692136ba 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,6 +1,3 @@ -AUX gnuradio-3.10.3.0-fix-fmt-v9.patch 4393 BLAKE2B eb915d3e63a96e0527b8525da35fa6ad9870f7ed8b113b7aeda5d616e235a89937f2187e6bd862ec3703ba2d763ae0f0d4821ed0d27f3fba290af2e7c8c1eb92 SHA512 cb45360160325fb8904a7d2edf2eaf09143327c3133575f91cfe2fb41a4ce06102b1ba364ac5917fddd78b24ebc0038f1eabc02476e211429410a39242069851 -AUX gnuradio-3.10.4.0-fix-blockinterleaving.patch 797 BLAKE2B 9a32f372f6a2600dda0f341404f922f51f349c88f285257f125b7c1c87db15a074471c44139fd27bb699e2ead3c81a527d24754e82b5910e57e132edb9b4cbad SHA512 343615c80b17fab076b9509d39c4fa0ac86c84d82093805b1bd488a7c8c95a935550c1acba30fc227f374b8842fec3b9d6cbf559eb67c2dd1abc82223708cc9d -AUX gnuradio-3.10.6.0-fix-stdint.patch 536 BLAKE2B e20cb9a07faaee543dd4a5ec1d1ec5e4657e5dbb5335162adfe8bfc64793f77f710a76677d920392beaf147b47acbcfa2483e6ab0c1cb7132159cee94f96a997 SHA512 66432cabbb199547536b550a704a7b64da77f616641f01e00dfcfd1e933acb1dc19775aecd88986e022217f97c9f13ade6260d44d0026821c66bab3bfa79f6b2 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd EBUILD gnuradio-3.10.9.2.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e EBUILD gnuradio-9999.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch b/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch deleted file mode 100644 index 7b17021213d8..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch +++ /dev/null @@ -1,145 +0,0 @@ -From e63ee41fd455cdd39ae983c258d8632c3ea57fc6 Mon Sep 17 00:00:00 2001 -From: Huang Rui <vowstar@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@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; - diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch b/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch deleted file mode 100644 index b2c8270338c5..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -index 9d4e0f2..f6b8bc6 100644 ---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -@@ -12,7 +12,8 @@ - #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H - - #include <gnuradio/blocks/api.h> -- -+#include <cstddef> -+#include <vector> - - namespace gr { - namespace blocks { -diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc -index fc5873e..768ad9e 100644 ---- a/gr-blocks/lib/blockinterleaving.cc -+++ b/gr-blocks/lib/blockinterleaving.cc -@@ -12,6 +12,7 @@ - #include <spdlog/fmt/fmt.h> - #include <algorithm> - #include <numeric> -+#include <vector> - - namespace gr { - namespace blocks { diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch deleted file mode 100644 index 6252d96fd8b5..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Christian Inci <chris.gh@broke-the-inter.net> -Date: Mon May 15 21:26:05 2023 +0200 -Upstream: https://github.com/gnuradio/gnuradio/pull/6667 - - Include cstdint in gr-fec's alist.h - - GCC 13 will error out otherwise. - - Signed-off-by: Christian Inci <chris.gh@broke-the-inter.net> - ---- a/gr-fec/include/gnuradio/fec/alist.h -+++ b/gr-fec/include/gnuradio/fec/alist.h -@@ -23,6 +23,7 @@ - #define ALIST_H - - #include <gnuradio/fec/api.h> -+#include <cstdint> - #include <cstdlib> - #include <fstream> - #include <sstream> |