add jxl support to libvips

Author: johnnynotsolucky

.github/workflows/ci.yml

@@ -25,32 +25,6 @@ jobs:
         include:
           - os: 'ubuntu-24.04'
             platform: 'linux-x64'
-          - os: 'ubuntu-24.04'
-            platform: 'linux-armv6'
-          - os: 'ubuntu-24.04'
-            platform: 'linuxmusl-x64'
-          - os: 'ubuntu-24.04'
-            platform: 'linux-ppc64le'
-          - os: 'ubuntu-24.04'
-            platform: 'linux-riscv64'
-          - os: 'ubuntu-24.04'
-            platform: 'linux-s390x'
-          - os: 'ubuntu-24.04'
-            platform: 'dev-wasm32'
-          - os: 'ubuntu-24.04'
-            platform: 'win32-ia32'
-          - os: 'ubuntu-24.04'
-            platform: 'win32-x64'
-          - os: 'ubuntu-24.04'
-            platform: 'win32-arm64v8'
-          - os: 'macos-13'
-            platform: 'darwin-x64'
-          - os: 'macos-14'
-            platform: 'darwin-arm64v8'
-          - os: 'ubuntu-24.04-arm'
-            platform: 'linux-arm64v8'
-          - os: 'ubuntu-24.04-arm'
-            platform: 'linuxmusl-arm64v8'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,39 +42,4 @@ jobs:
           path: '*.tar.gz'
           compression-level: 0
           retention-days: 1
-          if-no-files-found: error
-  populate-and-publish-npm-workspace:
-    permissions:
-      contents: write
-      id-token: write
-    needs: build
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-      - name: Populate npm workspace
-        run: ./populate-npm-workspace.sh
-      - name: Create npm workspace tarball
-        run: tar -vcaf npm-workspace.tar.xz -C npm .
-      - name: Generate release notes
-        run: ./generate-release-notes.sh
-      - name: Create GitHub release for tag
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: npm-workspace.tar.xz
-          artifactContentType: application/x-xz
-          bodyFile: release-notes.md
-          prerelease: ${{ contains(github.ref, '-rc') }}
-          makeLatest: ${{ !contains(github.ref, '-rc') }}
-      - name: Publish npm packages
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: cd npm && npm publish --workspaces --tag=${{ contains(github.ref, '-rc') && 'next' || 'latest' }}
+          if-no-files-found: error

build.sh

@@ -92,7 +92,7 @@ done
 for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-arm64v8 linuxmusl-arm64v8 linux-ppc64le linux-riscv64 linux-s390x; do
   if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then
     echo "Building $flavour..."
-    docker build --pull -t vips-dev-$flavour platforms/$flavour
+    docker build --pull --progress=plain -t vips-dev-$flavour platforms/$flavour
     docker run --rm -v $PWD:/packaging vips-dev-$flavour sh -c "/packaging/build/posix.sh"
   fi
 done

build/posix.sh

@@ -165,7 +165,7 @@ mkdir ${DEPS}/lcms
 $CURL https://github.com/mm2/Little-CMS/releases/download/lcms${VERSION_LCMS}/lcms2-${VERSION_LCMS}.tar.gz | tar xzC ${DEPS}/lcms --strip-components=1
 cd ${DEPS}/lcms
 CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \
-  -Dtests=disabled 
+  -Dtests=disabled
 meson install -C _build --tag devel
 
 mkdir ${DEPS}/aom
@@ -305,6 +305,44 @@ sed -i'.bak' "/^Libs:/s/$/ -lfreetype/" ${TARGET}/lib/pkgconfig/harfbuzz.pc
 
 build_freetype -Dharfbuzz=enabled
 
+mkdir ${DEPS}/brotli
+$CURL https://github.com/google/brotli/archive/refs/tags/v${VERSION_BROTLI}.tar.gz | tar xzC ${DEPS}/brotli --strip-components=1
+cd ${DEPS}/brotli
+CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \
+  -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib \
+  -DBUILD_SHARED_LIBS=FALSE \
+  -DCMAKE_BUILD_TYPE=Release
+make install
+
+mkdir ${DEPS}/lcms2
+$CURL https://github.com/mm2/Little-CMS/archive/refs/tags/lcms${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1
+cd ${DEPS}/lcms2
+# Disable utils
+sed -i'.bak' "/subdir('util')/d" meson.build
+meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON}
+meson install -C _build --tag devel
+
+mkdir ${DEPS}/libjxl
+$CURL https://github.com/libjxl/libjxl/archive/refs/tags/v${VERSION_LIBJXL}.tar.gz | tar xzC ${DEPS}/libjxl --strip-components=1
+cd ${DEPS}/libjxl
+./deps.sh
+mkdir -p build
+cd build
+CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \
+  -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib \
+  -DBUILD_SHARED_LIBS=FALSE \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DJPEGXL_ENABLE_FUZZERS=FALSE \
+  -DJPEGXL_ENABLE_MANPAGES=FALSE \
+  -DJPEGXL_ENABLE_BENCHMARK=FALSE \
+  -DJPEGXL_ENABLE_EXAMPLES=FALSE \
+  -DJPEGXL_ENABLE_SKCMS=FALSE \
+  -DBUILD_TESTING=OFF \
+  ..
+#CFLAGS="${CFLAGS} -O3" cmake --build . -- -j$(nproc)
+#make -j$(nproc)
+make install/strip
+
 mkdir ${DEPS}/pixman
 $CURL https://cairographics.org/releases/pixman-${VERSION_PIXMAN}.tar.gz | tar xzC ${DEPS}/pixman --strip-components=1
 cd ${DEPS}/pixman
@@ -387,7 +425,7 @@ fi
 # Disable building man pages, gettext po files, tools, and (fuzz-)tests
 sed -i'.bak' "/subdir('man')/{N;N;N;N;d;}" meson.build
 CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" meson setup _build --default-library=shared --buildtype=release --strip --prefix=${TARGET} ${MESON} \
-  -Ddeprecated=false -Dexamples=false -Dintrospection=disabled -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled -Djpeg-xl=disabled \
+  -Ddeprecated=false -Dexamples=false -Dintrospection=disabled -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled \
   ${WITHOUT_HIGHWAY:+-Dhighway=disabled} -Dorc=disabled -Dmagick=disabled -Dmatio=disabled -Dnifti=disabled -Dopenexr=disabled \
   -Dopenjpeg=disabled -Dopenslide=disabled -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled \
   -Dppm=false -Danalyze=false -Dradiance=false \
@@ -473,6 +511,8 @@ printf "{\n\
   \"webp\": \"${VERSION_WEBP}\",\n\
   \"xml2\": \"${VERSION_XML2}\",\n\
   \"zlib-ng\": \"${VERSION_ZLIB_NG}\"\n\
+  \"libjx\": \"${VERSION_LIBJXL}\"\n\
+
 }" >versions.json
 
 # Add third-party notices

versions.properties

@@ -6,7 +6,7 @@ VERSION_EXIF=0.6.25
 VERSION_EXPAT=2.7.1
 VERSION_FFI=3.5.2
 VERSION_FONTCONFIG=2.17.1
-VERSION_FREETYPE=2.14.0
+VERSION_FREETYPE=2.14.1
 VERSION_FRIBIDI=1.0.16
 VERSION_GLIB=2.86.0
 VERSION_HARFBUZZ=11.4.5
@@ -19,10 +19,13 @@ VERSION_PANGO=1.57.0
 VERSION_PIXMAN=0.46.4
 VERSION_PNG=1.6.50
 VERSION_PROXY_LIBINTL=0.5
-VERSION_RSVG=2.61.0
+VERSION_RSVG=2.61.1
 VERSION_SPNG=0.7.4
 VERSION_TIFF=4.7.0
 VERSION_VIPS=8.17.1
 VERSION_WEBP=1.6.0
-VERSION_XML2=2.14.5
+VERSION_XML2=2.14.6
 VERSION_ZLIB_NG=2.2.5
+VERSION_BROTLI=1.1.0
+VERSION_LCMS2=2.17
+VERSION_LIBJXL=0.11.1