Rebuild PHP JSPI

Author: adamziel

packages/php-wasm/compile/libImageMagick/Dockerfile

@@ -88,13 +88,13 @@ RUN source /root/emsdk/emsdk_env.sh && \
 
 # Manually compile PNG and WebP coders and add them to the library
 RUN source /root/emsdk/emsdk_env.sh && \
-    export JSPI_FLAGS=$(if [ "$JSPI" = "1" ]; then echo "-sSUPPORT_LONGJMP=wasm -fwasm-exceptions"; else echo ""; fi) && \
+    export JSPI_COMPILE_FLAGS=$(if [ "$JSPI" = "1" ]; then echo "-fwasm-exceptions"; else echo ""; fi) && \
     emcc -fPIC -O1 -g0 -fexceptions -I. -I./config -I/root/lib/include -I/root/lib/include/libpng16 \
         -DHAVE_CONFIG_H -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_CHANNEL_MASK_DEPTH=32 \
-        -D__x86_64__ $JSPI_FLAGS -c coders/png.c -o coders/png.o && \
+        -D__x86_64__ $JSPI_COMPILE_FLAGS -c coders/png.c -o coders/png.o && \
     emcc -fPIC -O1 -g0 -fexceptions -I. -I./config -I/root/lib/include \
         -DHAVE_CONFIG_H -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_CHANNEL_MASK_DEPTH=32 \
-        -D__x86_64__ $JSPI_FLAGS -c coders/webp.c -o coders/webp.o && \
+        -D__x86_64__ $JSPI_COMPILE_FLAGS -c coders/webp.c -o coders/webp.o && \
     ar r MagickCore/.libs/libMagickCore-7.Q16HDRI.a coders/png.o coders/webp.o && \
     echo "Added PNG and WebP coders to library"
 

packages/php-wasm/compile/libImageMagick/jspi/dist/root/lib/include/ImageMagick-7/MagickCore/magick-baseconfig.h

@@ -1211,7 +1211,7 @@
 /* #undef PIPES_SUPPORT */
 
 /* Define if you have PNG library */
-/* #undef PNG_DELEGATE */
+#define MAGICKCORE_PNG_DELEGATE 1
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1415,7 +1415,7 @@
 /* #undef WEBPMUX_DELEGATE */
 
 /* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#define MAGICKCORE_WEBP_DELEGATE 1
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1461,9 +1461,7 @@
 /* #undef ZIP_DELEGATE */
 
 /* Define if you have ZLIB library */
-#ifndef MAGICKCORE_ZLIB_DELEGATE
-#define MAGICKCORE_ZLIB_DELEGATE 1
-#endif
+/* #undef ZLIB_DELEGATE */
 
 /* Define if you have ZSTD library */
 /* #undef ZSTD_DELEGATE */