diff options
Diffstat (limited to 'net-wireless/gnuradio')
| -rw-r--r-- | net-wireless/gnuradio/Manifest | 3 | ||||
| -rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch | 50 | ||||
| -rw-r--r-- | net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild | 7 |
3 files changed, 57 insertions, 3 deletions
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 42b7b7833c9e..02720e875a49 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,8 +1,9 @@ AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba AUX gnuradio-3.10.11.0-boost-1.87.patch 6533 BLAKE2B dea2f7d662c2c7119234f6cddd1405bd2b942257bea75110c3c2464b5f5137887fab7e2ec8cc2851770af44f2bcd44a8499ba3f6a9ad3f6dd21311ec8ccc9904 SHA512 1a7656d7310e59cd8fd8259920bbcffb443948bbe8193bddc65610b1e4418ec3ea806d0fb21b565aa9a54ec8302f9d2e408c07ba912a6fe910a4c51ab416e775 +AUX gnuradio-3.10.9.2-libfmt-11.patch 1624 BLAKE2B a50f5db97a276ec1c1fbaa28338db377de8659ce8b1f19b271cb79672f807e152cec57f83b9e32ff39492e11b4b6e655a69cd77a5e925f0b2b598d66b2ad2381 SHA512 50398cbeba0bad9908d3f96795833a7ca683e169634ef4a89e1502c304c4a695be44538e99236b691c2e4ea105604e882048b0500579031a9516fbeba4984173 DIST gnuradio-3.10.11.0.tar.gz 4659646 BLAKE2B 21d523030e578ac335dc1497da27a957026206b36323473d5e96d9bc3832a06765d26684c46c03017e23c0bc6302429c366befac40113f9987840d5c22f978af SHA512 faf47956924832b04c66469ba3bdf174876d25c41e0f1c1dde3755596d232e2d18f5dab7aa848463f2d23ec8bcda0283ee8ede34fd57b079fe3cdb62c6470a82 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd EBUILD gnuradio-3.10.11.0.ebuild 7203 BLAKE2B 8865037aea821433bdf7f71497007f7b9092732fba5180b85d64774ba53503833264020473b5bb3f74ea9da7e6bdaa195b21ad9e3e48b6922875f7830a6688c6 SHA512 800484b01de328e97525befb78717450982acd488bf05f0b3ee7b1d68a5f6a8133becedc0c659d7126978d97847f83ba58fe61cf74e32407888d459147b2bbfd -EBUILD gnuradio-3.10.9.2-r6.ebuild 7121 BLAKE2B 303ced66aafc13c232128e4147f4bc91df9e37b830caf2fc8ab63346c9f41c01ed478e5bed98510047c6d2bc8d0e0325d420bfd421e881c79cf8c2c9e6415602 SHA512 1e9cfae50f140ffa41b38897a4ad96f7c128f59e37838b649dcbaac1070420b9a9c7d792e45157b1dd216dffde21c0c857248a36334a8b7de3eceab4fa07327f +EBUILD gnuradio-3.10.9.2-r6.ebuild 7168 BLAKE2B 6d7c121fd4f1bb6c614ea78417436d58cf03f64c39b7f3a776edc72cf81d2b775eb813821f5c5cc4ece13dce4f6db847a6ae004b03727ff9d52f15e0184ca3d2 SHA512 8162308fe3edee23d865fb4c0a3c507ae64a4407fa23b2adce5e8ea8a0a024feaa5639692e26470245536378bf440fb7b1a284080bed32aa69bfea60fbd8d3d6 EBUILD gnuradio-9999.ebuild 7142 BLAKE2B 7d745da9a915959565a1ba95e34d778e3b2b2b3b8d488ed953e5a2a18bcec639aef9a27783dbb501012b879b5bdd56aa0369daa35c4efb74bf482b857cf07bcb SHA512 0c952b388e2a989f1ab2e7b6be8b413807c8e881bb443070e6e7ebc345f7a0540b600a5a61f90f9400fc4a97262426e3c07a5a1a527632260fb79913c00e753a MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0 diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch new file mode 100644 index 000000000000..60304a36ea16 --- /dev/null +++ b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch @@ -0,0 +1,50 @@ +From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001 +From: Kefu Chai <tchaikov@gmail.com> +Date: Mon, 15 Jul 2024 09:27:16 +0800 +Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for + using fmt::join() + +fmt::join() was moved into fmt/ranges.h since fmt 11, so let's +include the corresponding header in spdlog for using it. + +Signed-off-by: Kefu Chai <tchaikov@gmail.com> +--- + gnuradio-runtime/lib/io_signature.cc | 5 +++++ + gr-blocks/lib/message_debug_impl.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc +index 812f444f8..76bb2aba6 100644 +--- a/gnuradio-runtime/lib/io_signature.cc ++++ b/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> +diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc +index 41d312e43..373287b02 100644 +--- a/gr-blocks/lib/message_debug_impl.cc ++++ b/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> +-- +2.45.2 + diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild index f4eaff739bf2..e2b0ef2bca50 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -131,7 +131,10 @@ DEPEND="${RDEPEND} zeromq? ( net-libs/cppzmq ) " -PATCHES=( "${FILESDIR}/PR7093.patch" ) +PATCHES=( + "${FILESDIR}/PR7093.patch" + "${FILESDIR}"/${PN}-3.10.9.2-libfmt-11.patch +) src_prepare() { xdg_environment_reset #534582 |