discord · skidder · Oct 10, 2024 · Oct 9, 2024
diff --git a/README.md b/README.md
@@ -7,11 +7,11 @@ decompressing, resizing and compressing images. It aims to do as little memory
 allocation as possible and especially not to create garbage in Go. As a result,
 it is suitable for very high throughput image resizing services.
 
-Lilliput supports resizing JPEG, PNG, WEBP and animated GIFs. It can also convert formats.
+Lilliput supports resizing JPEG, PNG, static WEBP, and animated GIFs & WEBPs. It can also convert formats.
 Lilliput also has some support for getting the first frame from MOV and WEBM
 videos.
 
-**Lilliput presently only supports OSX Intel and Linux.**
+**Lilliput presently only supports OSX ARM64 and Linux.**
 
 ## Example
 Lilliput comes with a [fully working example](examples/main.go) that runs on the command line. The

diff --git a/deps/build-deps-osx.sh b/deps/build-deps-osx.sh
@@ -2,11 +2,37 @@
 
 set -e
 
+# Add Homebrew to PATH
+export PATH="/opt/homebrew/bin:$PATH"
+
+# Function to check and install build tools
+install_build_tools() {
+    for tool in automake libtool autoconf coreutils; do
+        if ! command -v $tool >/dev/null 2>&1; then
+            echo "Installing $tool..."
+            brew install $tool
+        else
+            echo "$tool is already installed."
+        fi
+    done
+}
+
+# Call the function to ensure build tools are installed
+install_build_tools
+
 BASEDIR=$(cd $(dirname "$0") && pwd)
 PREFIX="$BASEDIR/osx"
 BUILDDIR="$BASEDIR/build"
 SRCDIR="$BASEDIR/lilliput-dep-source"
 
+# Add architecture detection
+ARCH=$(uname -m)
+if [ "$ARCH" = "arm64" ]; then
+    export CFLAGS="-arch arm64"
+    export CXXFLAGS="-arch arm64"
+    export LDFLAGS="-arch arm64"
+fi
+
 mkdir -p "$PREFIX/include"
 mkdir -p "$PREFIX/lib"
 
@@ -34,7 +60,7 @@ tar -xzf $SRCDIR/libjpeg-turbo-2.1.4.tar.gz -C $BASEDIR/libjpeg-turbo --strip-co
 cd $BASEDIR/libjpeg-turbo
 mkdir -p $BUILDDIR/libjpeg-turbo
 cd $BUILDDIR/libjpeg-turbo
-cmake $BASEDIR/libjpeg-turbo -DENABLE_STATIC=1 -DENABLE_SHARED=0 -DWITH_JPEG8=1 -DCMAKE_INSTALL_PREFIX=$PREFIX
+cmake $BASEDIR/libjpeg-turbo -DENABLE_STATIC=1 -DENABLE_SHARED=0 -DWITH_JPEG8=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_OSX_ARCHITECTURES=arm64
 make
 make install
 
@@ -56,7 +82,7 @@ mkdir -p $BASEDIR/libpng
 tar -xzf $SRCDIR/libpng-1.6.38.tar.gz -C $BASEDIR/libpng --strip-components 1
 mkdir -p $BUILDDIR/libpng
 cd $BUILDDIR/libpng
-$BASEDIR/libpng/configure --prefix=$PREFIX --disable-shared --enable-static --enable-intel-sse
+$BASEDIR/libpng/configure --prefix=$PREFIX --disable-shared --enable-static --host=arm-apple-darwin
 make
 make install
 
@@ -66,7 +92,17 @@ echo '--------------------\n'
 mkdir -p $BASEDIR/libwebp
 tar -xzf $SRCDIR/libwebp-a35ea50d-2023-09-12.tar.gz -C $BASEDIR/libwebp --strip-components 1
 cd $BASEDIR/libwebp
-./autogen.sh
+# Run autogen.sh with error handling
+if [ ! -f "./configure" ]; then
+    if ! ./autogen.sh; then
+        echo "autogen.sh failed. Trying to proceed anyway..."
+    fi
+fi
+# If configure still doesn't exist, exit with error
+if [ ! -f "./configure" ]; then
+    echo "Error: ./configure script not found and couldn't be generated."
+    exit 1
+fi
 mkdir -p $BUILDDIR/libwebp
 cd $BUILDDIR/libwebp
 $BASEDIR/libwebp/configure --prefix=$PREFIX --disable-shared --enable-static
@@ -80,7 +116,16 @@ mkdir -p $BASEDIR/giflib
 tar -xzf $SRCDIR/giflib-5.2.1.tar.gz -C $BASEDIR/giflib --strip-components 1
 mkdir -p $BUILDDIR/giflib
 cd $BASEDIR/giflib
-make
+
+# Modify the Makefile to work on macOS
+sed -i '' 's/-Wno-format-truncation//g' Makefile
+sed -i '' 's/-fPIC//g' Makefile
+sed -i '' 's/-Wl,-soname -Wl,libgif.so.$(LIBMAJOR)//g' Makefile
+
+# Build static library only
+make libgif.a
+
+# Copy the static library and header to the prefix
 cp libgif.a "$PREFIX/lib"
 cp gif_lib.h "$PREFIX/include"
 
@@ -91,9 +136,189 @@ mkdir -p $BASEDIR/opencv
 tar -xzf $SRCDIR/opencv-3.2.0.tar.gz -C $BASEDIR/opencv --strip-components 1
 cd $BASEDIR/opencv
 patch -p1 < $SRCDIR/0001-export-exif-orientation.patch
+
+# Fix CMake configuration issues
+sed -i '' 's/cmake_policy(SET CMP0026 OLD)/cmake_policy(SET CMP0026 NEW)/' CMakeLists.txt
+sed -i '' 's/cmake_policy(SET CMP0022 OLD)/cmake_policy(SET CMP0022 NEW)/' CMakeLists.txt
+sed -i '' 's/cmake_policy(SET CMP0020 OLD)/cmake_policy(SET CMP0020 NEW)/' CMakeLists.txt
+
+# Add CMP0022 policy to the main CMakeLists.txt
+echo "cmake_policy(SET CMP0022 NEW)" >> CMakeLists.txt
+
+# Disable Python detection
+sed -i '' 's/include(cmake\/OpenCVDetectPython.cmake)/#include(cmake\/OpenCVDetectPython.cmake)/' CMakeLists.txt
+
+# Fix OpenCVCompilerOptions.cmake
+cat > cmake/OpenCVCompilerOptions.cmake << EOL
+if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC OR CV_CLANG OR MINGW)
+  set(ENABLE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
+endif()
+
+set(OPENCV_EXTRA_FLAGS "")
+set(OPENCV_EXTRA_C_FLAGS "")
+set(OPENCV_EXTRA_CXX_FLAGS "")
+set(OPENCV_EXTRA_FLAGS_RELEASE "")
+set(OPENCV_EXTRA_FLAGS_DEBUG "")
+set(OPENCV_EXTRA_EXE_LINKER_FLAGS "")
+set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "")
+set(OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG "")
+
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+  set(ENABLE_NEON OFF)
+  set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -arch arm64")
+  set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} -arch arm64")
+endif()
+EOL
+
+# Create opencv.pc.in file
+mkdir -p cmake/templates
+cat > cmake/templates/opencv.pc.in << EOL
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: OpenCV
+Description: Open Source Computer Vision Library
+Version: @OPENCV_VERSION@
+Libs: -L\${libdir} @OPENCV_PC_LIBS@
+Libs.private: @OPENCV_PC_LIBS_PRIVATE@
+Cflags: -I\${includedir}
+EOL
+
+# Update highgui CMakeLists.txt
+cat > modules/highgui/CMakeLists.txt << EOL
+set(the_description "High-level GUI")
+
+set(OPENCV_HIGHGUI_DEPS opencv_core opencv_imgproc opencv_imgcodecs)
+ocv_add_module(highgui ${OPENCV_HIGHGUI_DEPS})
+
+ocv_module_include_directories()
+ocv_glob_module_sources()
+
+ocv_create_module()
+
+ocv_add_accuracy_tests()
+ocv_add_perf_tests()
+EOL
+
+# Fix OpenCVGenPkgconfig.cmake
+cat > cmake/OpenCVGenPkgconfig.cmake << EOL
+# Generate .pc file
+set(prefix      "\${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir      "\${exec_prefix}/lib")
+set(includedir  "\${prefix}/include")
+
+set(OPENCV_PC_LIBS "")
+foreach(lib \${OPENCV_MODULES_PUBLIC})
+  if(TARGET \${lib})
+    set(OPENCV_PC_LIBS "\${OPENCV_PC_LIBS} -l\${lib}")
+  endif()
+endforeach()
+
+if(BUILD_SHARED_LIBS)
+  set(OPENCV_PC_LIBS_PRIVATE "")
+else()
+  set(OPENCV_PC_LIBS_PRIVATE \${OPENCV_EXTRA_COMPONENTS})
+endif()
+
+configure_file("\${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv.pc.in"
+               "\${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY)
+
+install(FILES "\${CMAKE_BINARY_DIR}/unix-install/opencv.pc" DESTINATION "\${OPENCV_LIB_INSTALL_PATH}/pkgconfig")
+EOL
+
+# Update imgcodecs CMakeLists.txt
+cat > modules/imgcodecs/CMakeLists.txt << EOL
+set(the_description "Image I/O")
+ocv_define_module(imgcodecs opencv_core OPTIONAL opencv_imgproc WRAP java python)
+
+set(OPENCV_IMGCODECS_LIBRARIES "")
+
+if(HAVE_JPEG)
+  list(APPEND OPENCV_IMGCODECS_LIBRARIES ${JPEG_LIBRARIES})
+endif()
+
+if(HAVE_WEBP)
+  list(APPEND OPENCV_IMGCODECS_LIBRARIES ${WEBP_LIBRARIES})
+endif()
+
+if(HAVE_PNG)
+  list(APPEND OPENCV_IMGCODECS_LIBRARIES ${PNG_LIBRARIES})
+endif()
+
+if(HAVE_TIFF)
+  list(APPEND OPENCV_IMGCODECS_LIBRARIES ${TIFF_LIBRARIES})
+endif()
+
+if(HAVE_JASPER)
+  list(APPEND OPENCV_IMGCODECS_LIBRARIES ${JASPER_LIBRARIES})
+endif()
+
+if(HAVE_GDCM)
+  list(APPEND OPENCV_IMGCODECS_LIBRARIES ${GDCM_LIBRARIES})
+endif()
+
+target_link_libraries(opencv_imgcodecs PRIVATE ${OPENCV_IMGCODECS_LIBRARIES})
+EOL
+
 mkdir -p $BUILDDIR/opencv
 cd $BUILDDIR/opencv
-cmake $BASEDIR/opencv -DWITH_JPEG=ON -DWITH_PNG=ON -DWITH_WEBP=ON -DWITH_JASPER=OFF -DWITH_TIFF=OFF -DWITH_OPENEXR=OFF -DWITH_OPENCL=OFF -DWITH_LAPACK=OFF -DBUILD_JPEG=OFF -DBUILD_PNG=OFF -DBUILD_ZLIB=OFF -DENABLE_SSE41=ON -DENABLE_SSE42=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_opencv_photo=OFF -DBUILD_opencv_video=OFF -DBUILD_opencv_videoio=OFF -DBUILD_opencv_highgui=OFF -DBUILD_opencv_ml=off -DBUILD_opencv_flann=off -DCMAKE_LIBRARY_PATH=$PREFIX/LIB -DCMAKE_INCLUDE_PATH=$PREFIX/INCLUDE -DCMAKE_INSTALL_PREFIX=$PREFIX
+cmake $BASEDIR/opencv \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
+    -DCMAKE_C_FLAGS="-arch arm64 -I$PREFIX/include" \
+    -DCMAKE_CXX_FLAGS="-arch arm64 -I$PREFIX/include" \
+    -DWITH_JPEG=ON \
+    -DJPEG_INCLUDE_DIR=$PREFIX/include \
+    -DJPEG_LIBRARY=$PREFIX/lib/libjpeg.a \
+    -DWITH_PNG=ON \
+    -DPNG_PNG_INCLUDE_DIR=$PREFIX/include \
+    -DPNG_LIBRARY=$PREFIX/lib/libpng.a \
+    -DWITH_WEBP=ON \
+    -DWEBP_INCLUDE_DIR=$PREFIX/include \
+    -DWEBP_LIBRARY=$PREFIX/lib/libwebp.a \
+    -DWITH_JASPER=OFF \
+    -DWITH_TIFF=OFF \
+    -DWITH_OPENEXR=OFF \
+    -DWITH_OPENCL=OFF \
+    -DWITH_LAPACK=OFF \
+    -DBUILD_JPEG=OFF \
+    -DBUILD_PNG=OFF \
+    -DBUILD_ZLIB=OFF \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DBUILD_DOCS=OFF \
+    -DBUILD_PERF_TESTS=OFF \
+    -DBUILD_TESTS=OFF \
+    -DBUILD_opencv_photo=OFF \
+    -DBUILD_opencv_video=OFF \
+    -DBUILD_opencv_videoio=OFF \
+    -DBUILD_opencv_highgui=OFF \
+    -DBUILD_opencv_ml=OFF \
+    -DBUILD_opencv_flann=OFF \
+    -DBUILD_opencv_java=OFF \
+    -DBUILD_opencv_python=OFF \
+    -DOPENCV_FP16_DISABLE=ON \
+    -DCMAKE_LIBRARY_PATH=$PREFIX/lib \
+    -DCMAKE_INCLUDE_PATH=$PREFIX/include \
+    -DCMAKE_INSTALL_PREFIX=$PREFIX \
+    -DWITH_AVFOUNDATION=OFF \
+    -DWITH_COCOA=OFF \
+    -DWITH_QUICKTIME=OFF \
+    -DBUILD_APPLE_FRAMEWORK=OFF \
+    -DWITH_IOS=OFF \
+    -DWITH_APPLE_VISION=OFF \
+    -DWITH_COREIMAGE=OFF \
+    -DWITH_CAROTENE=OFF \
+    -DWITH_VIDEOTOOLBOX=ON
+
+# Remove iOS-specific build files
+sed -i '' "s|;$BASEDIR/opencv/modules/imgcodecs/include/opencv2/imgcodecs/ios.h||" $BASEDIR/build/opencv/CMakeCache.txt
+rm -f $BASEDIR/opencv/modules/imgcodecs/src/ios_conversions.mm
+sed -i '' "\|$BUILDDIR/opencv/modules/imgcodecs/src/ios_conversions\.mm;|d" $BUILDDIR/opencv/modules/imgcodecs/Makefile
+
+
 make opencv_core opencv_imgproc opencv_imgcodecs
 make install
 
@@ -112,7 +337,7 @@ mkdir -p $BASEDIR/ffmpeg
 tar -xjf $SRCDIR/ffmpeg-5.1.1.tar.bz2 -C $BASEDIR/ffmpeg --strip-components 1
 mkdir -p $BUILDDIR/ffmpeg
 cd $BUILDDIR/ffmpeg
-$BASEDIR/ffmpeg/configure --prefix=$PREFIX --disable-doc --disable-programs --disable-everything --enable-demuxer=mov --enable-demuxer=matroska --enable-demuxer=aac --enable-demuxer=flac --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=mpeg4 --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=vp9 --enable-decoder=vp8 --enable-decoder=flac --enable-decoder=mp3 --enable-decoder=aac --enable-decoder=vorbis --disable-iconv
+$BASEDIR/ffmpeg/configure --prefix=$PREFIX --disable-doc --disable-programs --disable-everything --enable-demuxer=mov --enable-demuxer=matroska --enable-demuxer=aac --enable-demuxer=flac --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=mpeg4 --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=vp9 --enable-decoder=vp8 --enable-decoder=flac --enable-decoder=mp3 --enable-decoder=aac --enable-decoder=vorbis --disable-iconv --arch=arm64 --enable-cross-compile --target-os=darwin
 make
 make install
 
@@ -122,3 +347,4 @@ make install
 # We use a `find -exec` with a separate file because POSIX sh
 # is that much more limited than bash.
 find "$PREFIX" -type l -exec "${BASEDIR}/copy-symlink-target.sh" {} \;
+echo "Done!"
diff --git a/deps/osx/include/bzlib.h b/deps/osx/include/bzlib.h
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.8 of 13 July 2019
+   Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

diff --git a/deps/osx/include/gif_lib.h b/deps/osx/include/gif_lib.h
@@ -2,6 +2,8 @@
 
 gif_lib.h - service library for decoding and encoding GIF images
 
+SPDX-License-Identifier: MIT
+
 *****************************************************************************/
 
 #ifndef _GIF_LIB_H_
@@ -12,8 +14,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GIFLIB_MAJOR 5
-#define GIFLIB_MINOR 1
-#define GIFLIB_RELEASE 4
+#define GIFLIB_MINOR 2
+#define GIFLIB_RELEASE 1
 
 #define GIF_ERROR   0
 #define GIF_OK      1
@@ -58,7 +60,7 @@ typedef struct ExtensionBlock {
 #define COMMENT_EXT_FUNC_CODE     0xfe    /* comment */
 #define GRAPHICS_EXT_FUNC_CODE    0xf9    /* graphics control (GIF89) */
 #define PLAINTEXT_EXT_FUNC_CODE   0x01    /* plaintext */
-#define APPLICATION_EXT_FUNC_CODE 0xff    /* application block */
+#define APPLICATION_EXT_FUNC_CODE 0xff    /* application block (GIF89) */
 } ExtensionBlock;
 
 typedef struct SavedImage {
@@ -204,25 +206,16 @@ int DGifGetImageHeader(GifFileType *GifFile);
 int DGifGetImageDesc(GifFileType *GifFile);
 int DGifGetLine(GifFileType *GifFile, GifPixelType *GifLine, int GifLineLen);
 int DGifGetPixel(GifFileType *GifFile, GifPixelType GifPixel);
-int DGifGetComment(GifFileType *GifFile, char *GifComment);
 int DGifGetExtension(GifFileType *GifFile, int *GifExtCode,
                      GifByteType **GifExtension);
 int DGifGetExtensionNext(GifFileType *GifFile, GifByteType **GifExtension);
 int DGifGetCode(GifFileType *GifFile, int *GifCodeSize,
                 GifByteType **GifCodeBlock);
 int DGifGetCodeNext(GifFileType *GifFile, GifByteType **GifCodeBlock);
 int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
+const char *DGifGetGifVersion(GifFileType *GifFile);
 
 
-/******************************************************************************
- Color table quantization (deprecated)
-******************************************************************************/
-int GifQuantizeBuffer(unsigned int Width, unsigned int Height,
-                   int *ColorMapSize, GifByteType * RedInput,
-                   GifByteType * GreenInput, GifByteType * BlueInput,
-                   GifByteType * OutputBuffer,
-                   GifColorType * OutputColorMap);
-
 /******************************************************************************
  Error handling and reporting.
 ******************************************************************************/
@@ -245,9 +238,6 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
                                      GifPixelType ColorTransIn2[]);
 extern int GifBitSize(int n);
 
-extern void *
-reallocarray(void *optr, size_t nmemb, size_t size);
-
 /******************************************************************************
  Support for the in-core structures allocation (slurp mode).              
 ******************************************************************************/