From 5cfabbfd0e67405a58a226e58991dd85afcc341c Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Tue, 25 Nov 2025 14:57:17 +0100 Subject: [PATCH] shine: fix compile bug in l3mdct - Project has different function declaration in header and source. - Reformat patches for `git am` Fixes: https://github.com/openwrt/packages/issues/27957 Signed-off-by: Vladimir Ermakov --- sound/shine/Makefile | 2 +- .../0001-fix-mdct-init-declaration.patch | 21 +++++++++++++++++++ .../shine/patches/001-fix_mips64_bswap.patch | 11 ---------- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 sound/shine/patches/0001-fix-mdct-init-declaration.patch delete mode 100644 sound/shine/patches/001-fix_mips64_bswap.patch diff --git a/sound/shine/Makefile b/sound/shine/Makefile index c645f39f77..75c1c730cf 100644 --- a/sound/shine/Makefile +++ b/sound/shine/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shine PKG_VERSION:=3.1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/toots/shine/releases/download/$(PKG_VERSION)/ diff --git a/sound/shine/patches/0001-fix-mdct-init-declaration.patch b/sound/shine/patches/0001-fix-mdct-init-declaration.patch new file mode 100644 index 0000000000..15d914fff9 --- /dev/null +++ b/sound/shine/patches/0001-fix-mdct-init-declaration.patch @@ -0,0 +1,21 @@ +From 905d4367cf57860b7f86e2d2f6fed5529c94ee98 Mon Sep 17 00:00:00 2001 +From: Vladimir Ermakov +Date: Tue, 25 Nov 2025 16:40:09 +0100 +Subject: [PATCH] fix mdct init declaration + +Signed-off-by: Vladimir Ermakov +--- + src/lib/l3mdct.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/lib/l3mdct.h ++++ b/src/lib/l3mdct.h +@@ -1,7 +1,7 @@ + #ifndef shine_MDCT_H + #define shine_MDCT_H + +-void shine_mdct_initialise(); ++void shine_mdct_initialise(shine_global_config *config); + void shine_mdct_sub(shine_global_config *config, int stride); + + #endif diff --git a/sound/shine/patches/001-fix_mips64_bswap.patch b/sound/shine/patches/001-fix_mips64_bswap.patch deleted file mode 100644 index 8c42297c6d..0000000000 --- a/sound/shine/patches/001-fix_mips64_bswap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/bin/wave.c -+++ b/src/bin/wave.c -@@ -168,7 +168,7 @@ unsigned char wave_open(const char *fnam - } - - #ifdef SHINE_BIG_ENDIAN --#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) - #define bswap_16(x) __builtin_bswap16(x) - #else - #define bswap_16(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) -- 2.30.2