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 <[email protected]>

diff --git a/sound/shine/Makefile b/sound/shine/Makefile
index c645f39f775f7e6570b232ce819cf99f931b79cb..75c1c730cf3f354b0415d3a5b4f292fad75dca5b 100644 (file)
--- 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 (file)
index 0000000..15d914f
--- /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 <[email protected]>
+Date: Tue, 25 Nov 2025 16:40:09 +0100
+Subject: [PATCH] fix mdct init declaration
+
+Signed-off-by: Vladimir Ermakov <[email protected]>
+---
+ 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\r
+ #define shine_MDCT_H\r
+ \r
+-void shine_mdct_initialise();\r
++void shine_mdct_initialise(shine_global_config *config);\r
+ void shine_mdct_sub(shine_global_config *config, int stride);\r
+ \r
+ #endif\r

diff --git a/sound/shine/patches/001-fix_mips64_bswap.patch b/sound/shine/patches/001-fix_mips64_bswap.patch
deleted file mode 100644 (file)
index 8c42297..0000000
--- 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))