From 91f3e869b757e3bee60010f585a93c50899efce9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 5 Jan 2025 00:24:07 +0000 Subject: [PATCH] bcm2835-utils: update to githash e709cd6 log: - https://github.com/raspberrypi/utils/compare/6dc6f5f3d129a6c9423316ac1a53efb19a5c40d1...e709cd6bc7b80646a99e8834eb872bd5189a3af9 --- packages/tools/bcm2835-utils/package.mk | 4 +-- .../patches/bcm2835-utils-111.patch | 28 ++++++++++++++++++ .../patches/bcm2835-utils-86.patch | 29 ------------------- 3 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 packages/tools/bcm2835-utils/patches/bcm2835-utils-111.patch delete mode 100644 packages/tools/bcm2835-utils/patches/bcm2835-utils-86.patch diff --git a/packages/tools/bcm2835-utils/package.mk b/packages/tools/bcm2835-utils/package.mk index 6678e8b0ec..5a51d30c89 100644 --- a/packages/tools/bcm2835-utils/package.mk +++ b/packages/tools/bcm2835-utils/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-utils" -PKG_VERSION="6dc6f5f3d129a6c9423316ac1a53efb19a5c40d1" -PKG_SHA256="b61752ec069075c7ca95bee70c95ef2fc3088c299dfcded2e164f81277a76940" +PKG_VERSION="e709cd6bc7b80646a99e8834eb872bd5189a3af9" +PKG_SHA256="7627edf857d21d88037cf53b46fb87dd092ae5f0c7d823dc652e8143c4407288" PKG_ARCH="arm aarch64" PKG_LICENSE="BSD-3-Clause" PKG_SITE="https://github.com/raspberrypi/utils" diff --git a/packages/tools/bcm2835-utils/patches/bcm2835-utils-111.patch b/packages/tools/bcm2835-utils/patches/bcm2835-utils-111.patch new file mode 100644 index 0000000000..5b8362a2e1 --- /dev/null +++ b/packages/tools/bcm2835-utils/patches/bcm2835-utils-111.patch @@ -0,0 +1,28 @@ +From c176592e36bb1ace8d5017df602b12acf132721e Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 5 Jan 2025 23:49:42 +1100 +Subject: [PATCH] piolib: fixes may be used uninitialized + +Fixes compile error: + In function 'quadrature_encoder_get_count', + inlined from 'main' at /build/bcm2835-utils/piolib/examples/quadrature_encoder.c:58:21: +/build/bcm2835-utils/piolib/examples/quadrature_encoder.pio.h:106:12: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] + 106 | return ret; + | ^~~ +--- + piolib/examples/quadrature_encoder.pio.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/piolib/examples/quadrature_encoder.pio.h b/piolib/examples/quadrature_encoder.pio.h +index eb15cb7..90991b0 100644 +--- a/piolib/examples/quadrature_encoder.pio.h ++++ b/piolib/examples/quadrature_encoder.pio.h +@@ -94,7 +94,7 @@ static inline void quadrature_encoder_program_init(PIO pio, uint sm, uint pin, i + } + static inline int32_t quadrature_encoder_get_count(PIO pio, uint sm) + { +- uint ret; ++ uint ret = 0; + int n; + // if the FIFO has N entries, we fetch them to drain the FIFO, + // plus one entry which will be guaranteed to not be stale diff --git a/packages/tools/bcm2835-utils/patches/bcm2835-utils-86.patch b/packages/tools/bcm2835-utils/patches/bcm2835-utils-86.patch deleted file mode 100644 index 2772a350f4..0000000000 --- a/packages/tools/bcm2835-utils/patches/bcm2835-utils-86.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4e4e5736b5c69de3c68c5c02ceddfbe42eb8f915 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 22 May 2024 21:29:31 +1000 -Subject: [PATCH] vclog: fix compiler error with gcc-14.1 - -Fixes: - -./vclog/vclog.c:199:30: error: 'msg.size' may be used uninitialized [-Werror=maybe-uninitialized] - 199 | payload_len = msg.size - sizeof(msg_hdr_t); - | ~~~^~~~~ -./vclog/vclog.c:193:23: note: 'msg' declared here - 193 | msg_hdr_t msg; - | ^~~ ---- - vclog/vclog.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vclog/vclog.c b/vclog/vclog.c -index 85e1366..34590fd 100644 ---- a/vclog/vclog.c -+++ b/vclog/vclog.c -@@ -194,6 +194,7 @@ int32_t main(int32_t argc, char *argv[]) - uint32_t payload_pos; - uint32_t payload_len; - -+ msg.size = 0; - payload_pos = log_copy_wrap(log_buffer, log_size, - read_pos, sizeof(msg), (char *)&msg); - payload_len = msg.size - sizeof(msg_hdr_t);