diff mbox series

[1/2] package/gnuradio: bump to 3.10.5.1

Message ID 20230223201511.217372-1-contact@martb.dev
State Superseded
Headers show
Series [1/2] package/gnuradio: bump to 3.10.5.1 | expand

Commit Message

Martin Böh Feb. 23, 2023, 8:15 p.m. UTC 
Signed-off-by: Martin Böh <contact@martb.dev>
---
 ...g-missing-vector-in-blockinterleaver.patch | 42 -------------------
 ...rleaving.h-add-missing-cstddef-heade.patch | 33 ---------------
 package/gnuradio/gnuradio.hash                |  2 +-
 package/gnuradio/gnuradio.mk                  |  2 +-
 4 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
 delete mode 100644 package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch

Comments

Thomas Petazzoni July 31, 2023, 10:20 p.m. UTC | #1 
Hello Martin,

On Thu, 23 Feb 2023 21:15:10 +0100
Martin Böh via buildroot <buildroot@buildroot.org> wrote:

> Signed-off-by: Martin Böh <contact@martb.dev>
> ---
>  ...g-missing-vector-in-blockinterleaver.patch | 42 -------------------
>  ...rleaving.h-add-missing-cstddef-heade.patch | 33 ---------------
>  package/gnuradio/gnuradio.hash                |  2 +-
>  package/gnuradio/gnuradio.mk                  |  2 +-
>  4 files changed, 2 insertions(+), 77 deletions(-)
>  delete mode 100644 package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
>  delete mode 100644 package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch

Thanks for your contribution. However, a newer version bump was
proposed and applied, see:
https://gitlab.com/buildroot.org/buildroot/-/commit/10f40a6b0c58a10f00d6a9b44fc76aea756e6036.
So I've marked this patch as Superseded.

Best regards,

Thomas
diff mbox series

Patch

diff --git a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
deleted file mode 100644
index 39b8c0b51e..0000000000
--- a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
+++ /dev/null
@@ -1,42 +0,0 @@ 
-From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001
-From: Ryan Volz <ryan.volz@gmail.com>
-Date: Fri, 16 Sep 2022 21:05:51 -0400
-Subject: [PATCH] blocks: Including missing <vector> in blockinterleaver.
-
-Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
-[Retrieved (and backported) from:
-https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64]
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
----
- gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +-
- gr-blocks/lib/blockinterleaving.cc                    | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-index 9d4e0f249..df831fe5a 100644
---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-@@ -12,7 +12,7 @@
- #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H
- 
- #include <gnuradio/blocks/api.h>
--
-+#include <vector>
- 
- namespace gr {
- namespace blocks {
-diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc
-index fc5873e11..768ad9ea7 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 {
--- 
-2.35.1
-
diff --git a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch
deleted file mode 100644
index f1ad77580f..0000000000
--- a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001
-From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-Date: Fri, 23 Sep 2022 08:41:26 +0200
-Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header
- (required for size_t)
-
-Fix build failure like:
-
-gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: ‘size_t’ was not declared in this scope
-
-This failure is due to the miss of cstddef include
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188]
----
- gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-index df831fe5a..33c59e35b 100644
---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-@@ -13,6 +13,7 @@
- 
- #include <gnuradio/blocks/api.h>
- #include <vector>
-+#include <cstddef>
- 
- namespace gr {
- namespace blocks {
--- 
-2.35.1
-
diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash
index efa0bb462b..44bb6562df 100644
--- a/package/gnuradio/gnuradio.hash
+++ b/package/gnuradio/gnuradio.hash
@@ -1,3 +1,3 @@ 
 # Locally computed
-sha256  c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd  gnuradio-3.10.4.0.tar.gz
+sha256  85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f  gnuradio-3.10.5.1.tar.gz
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index cc41f1e12b..8004ef0554 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-GNURADIO_VERSION = 3.10.4.0
+GNURADIO_VERSION = 3.10.5.1
 GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION))
 GNURADIO_LICENSE = GPL-3.0+
 GNURADIO_LICENSE_FILES = COPYING