Add brotli and libjxl

Author: DarthSim

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+### Added
+- Add brotli 1.1.0.
+- Add libjxl 0.11.1.
+
 ## [3.12.0] - 2024-10-24
 ### Changed
 - Update Go to 1.23.2.

build-deps.sh

@@ -36,6 +36,20 @@ cmake \
   ..
 ninja install/strip
 
+print_build_stage brotli $BROTLI_VERSION
+cd $DEPS_SRC/brotli
+mkdir _build
+cd _build
+CFLAGS="${CFLAGS} -O3" \
+cmake \
+  -G"Ninja" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=$TARGET_PATH \
+  -DBUILD_SHARED_LIBS=TRUE \
+  -DBROTLI_DISABLE_TESTS=TRUE \
+  ..
+ninja install/strip
+
 print_build_stage ffi $FFI_VERSION
 cd $DEPS_SRC/ffi
 ./configure \
@@ -158,6 +172,32 @@ cmake \
   ..
 ninja install/strip
 
+print_build_stage libjxl $LIBJXL_VERSION
+cd $DEPS_SRC/libjxl
+mkdir _build
+cd _build
+cmake \
+  -G"Ninja" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=$TARGET_PATH \
+  -DJPEGXL_STATIC=FALSE \
+  -DBUILD_TESTING=OFF \
+  -DJPEGXL_ENABLE_FUZZERS=FALSE \
+  -DJPEGXL_ENABLE_DEVTOOLS=FALSE \
+  -DJPEGXL_ENABLE_TOOLS=FALSE \
+  -DJPEGXL_ENABLE_JPEGLI=FALSE \
+  -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=FALSE \
+  -DJPEGXL_ENABLE_DOXYGEN=FALSE \
+  -DJPEGXL_ENABLE_MANPAGES=FALSE \
+  -DJPEGXL_ENABLE_BENCHMARK=FALSE \
+  -DJPEGXL_ENABLE_EXAMPLES=FALSE \
+  -DJPEGXL_BUNDLE_LIBPNG=FALSE \
+  -DJPEGXL_ENABLE_JNI=FALSE \
+  -DJPEGXL_ENABLE_SKCMS=FALSE \
+  -DJPEGXL_ENABLE_SJPEG=FALSE \
+  ..
+ninja install/strip
+
 print_build_stage libpng $LIBPNG_VERSION
 cd $DEPS_SRC/libpng
 ./configure \

check-versions.sh

@@ -40,6 +40,7 @@ check_version_github() {
 
 check_version "GOLANG" $GOLANG_VERSION "1227"
 check_version_github "ZLIB" $ZLIB_VERSION "zlib-ng/zlib-ng"
+check_version "BROTLI" $BROTLI_VERSION "15235"
 check_version "FFI" "$FFI_VERSION" "1611"
 check_version "GLIB" $GLIB_VERSION "10024"
 check_version "HIGHWAY" $HIGHWAY_VERSION "205809"
@@ -49,6 +50,7 @@ check_version "LIBXML2" $LIBXML2_VERSION "1783"
 check_version "LIBEXIF" $LIBEXIF_VERSION "1607"
 check_version "LCMS2" $LCMS2_VERSION "9815"
 check_version "LIBJPEGTURBO" $LIBJPEGTURBO_VERSION "1648"
+check_version "LIBJXL" $LIBJXL_VERSION "232764"
 check_version "LIBPNG" $LIBPNG_VERSION "15294"
 check_version "LIBSPNG" $LIBSPNG_VERSION "24289"
 check_version "LIBWEBP" $LIBWEBP_VERSION "1761"

download-deps.sh

@@ -28,6 +28,12 @@ cd $DEPS_SRC/zlib
 curl -Lks https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_VERSION}.tar.gz \
   | tar -xzC . --strip-components=1
 
+print_download_stage brotli $BROTLI_VERSION
+mkdir $DEPS_SRC/brotli
+cd $DEPS_SRC/brotli
+curl -Lks https://github.com/google/brotli/archive/refs/tags/v$BROTLI_VERSION.tar.gz \
+  | tar -xzC . --strip-components=1
+
 print_download_stage ffi $FFI_VERSION
 mkdir $DEPS_SRC/ffi
 cd $DEPS_SRC/ffi
@@ -82,6 +88,12 @@ cd $DEPS_SRC/libjpeg-turbo
 curl -Ls https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$LIBJPEGTURBO_VERSION.tar.gz \
   | tar -xzC . --strip-components=1
 
+print_download_stage libjxl $LIBJXL_VERSION
+mkdir $DEPS_SRC/libjxl
+cd $DEPS_SRC/libjxl
+curl -Ls https://github.com/libjxl/libjxl/archive/refs/tags/v$LIBJXL_VERSION.tar.gz \
+  | tar -xzC . --strip-components=1
+
 print_download_stage libpng $LIBPNG_VERSION
 mkdir $DEPS_SRC/libpng
 cd $DEPS_SRC/libpng

versions.sh

@@ -1,5 +1,6 @@
 export GOLANG_VERSION=1.23.2
 export ZLIB_VERSION=2.2.2
+export BROTLI_VERSION=1.1.0
 export FFI_VERSION=3.4.6
 export GLIB_VERSION=2.82.2
 export HIGHWAY_VERSION=1.2.0
@@ -9,6 +10,7 @@ export LIBXML2_VERSION=2.13.4
 export LIBEXIF_VERSION=0.6.24
 export LCMS2_VERSION=2.16
 export LIBJPEGTURBO_VERSION=3.0.4
+export LIBJXL_VERSION=0.11.1
 export LIBPNG_VERSION=1.6.37
 export LIBSPNG_VERSION=0.7.4
 export LIBWEBP_VERSION=1.4.0