Rebuilds

dy · dy · commit 01c186fd8c2e · 2026-04-04T22:57:59.000-04:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "packages/decode-aac/lib/faad2"]
+	path = packages/decode-aac/lib/faad2
+	url = https://github.com/knik0/faad2.git
+[submodule "packages/decode-wma/lib/rockbox-wma"]
+	path = packages/decode-wma/lib/rockbox-wma
+	url = https://github.com/xOpenLee/wmaDecode.git
+[submodule "packages/decode-amr/lib/opencore-amr"]
+	path = packages/decode-amr/lib/opencore-amr
+	url = https://git.code.sf.net/p/opencore-amr/code
diff --git a/packages/decode-aac/.gitignore b/packages/decode-aac/.gitignore
@@ -1,3 +1,2 @@
 node_modules/
-lib/faad2/
 /.claude
diff --git a/packages/decode-aac/lib/faad2 b/packages/decode-aac/lib/faad2
@@ -0,0 +1 @@
+Subproject commit f2f4e8e8093df276fb1f6f96eb69efd37aba3da3
diff --git a/packages/decode-aac/src/aac.wasm.cjs b/packages/decode-aac/src/aac.wasm.cjs
diff --git a/packages/decode-amr/.gitignore b/packages/decode-amr/.gitignore
@@ -1,2 +1 @@
 node_modules/
-lib/opencore-amr/
diff --git a/packages/decode-amr/build.sh b/packages/decode-amr/build.sh
@@ -195,6 +195,7 @@ INCS="
   -I $OC/amr_nb/dec/include
   -I $OC/amr_nb/common/include
   -I $OC/amr_nb/common/src
+  -I $OC/amr_nb/enc/src
   -I $OC/amr_wb/dec/src
   -I $OC/amr_wb/dec/include
   -I $OC/common/dec/include
diff --git a/packages/decode-amr/lib/opencore-amr b/packages/decode-amr/lib/opencore-amr
@@ -0,0 +1 @@
+Subproject commit 7dba8c32238418ce0b316a852b2224df586ca896
diff --git a/packages/decode-wma/build.sh b/packages/decode-wma/build.sh
@@ -19,10 +19,16 @@ fi
 
 OUT=src/wma.wasm
 
+# Patch wmadeci.c typedefs that conflict with stdint.h (char vs signed char)
+PATCHED=src/_wmadeci_patched.c
+sed 's/^typedef .*int[0-9]*_t;//' lib/rockbox-wma/wmadeci.c > "$PATCHED"
+trap "rm -f $PATCHED" EXIT
+
 echo "Compiling RockBox WMA WASM module..."
 emcc \
   src/wma_glue.c \
   -I lib/rockbox-wma \
+  -Wno-typedef-redefinition \
   -O3 \
   -flto \
   -s WASM=1 \
diff --git a/packages/decode-wma/lib/rockbox-wma b/packages/decode-wma/lib/rockbox-wma
@@ -0,0 +1 @@
+Subproject commit e54cde0c9ba59f4752acf8643cccb1859328d3a3
diff --git a/packages/decode-wma/src/wma.wasm.cjs b/packages/decode-wma/src/wma.wasm.cjs
diff --git a/packages/decode-wma/src/wma_glue.c b/packages/decode-wma/src/wma_glue.c
@@ -16,8 +16,20 @@
 #define EXPORT
 #endif
 
-/* Pull in the decoder — it's a single-file implementation */
-#include "../lib/rockbox-wma/wmadeci.c"
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#ifdef __EMSCRIPTEN__
+#include <emscripten/emscripten.h>
+#define EXPORT EMSCRIPTEN_KEEPALIVE
+#else
+#define EXPORT
+#endif
+
+/* Pull in the decoder — it's a single-file implementation.
+   wmadeci.c typedefs are patched out by build.sh (conflict with stdint.h). */
+#include "_wmadeci_patched.c"
 
 typedef struct {
     CodecContext ctx;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`node_modules/`
`2`		`-lib/faad2/`
`3`	`2`	`/.claude`