[gimp] build: use libjxl package from MSYS2

[Daniel Novomeský <dnovomesky src gnome org>]

commit e519e1a02c51c52ef24b6e3bdb183a78b8dcc520
Author: Daniel Novomeský <dnovomesky gmail com>
Date:   Thu Mar 3 19:38:29 2022 +0100

    build: use libjxl package from MSYS2

 build/windows/gitlab-ci/build-deps-crossroad.sh | 23 +------------
 build/windows/gitlab-ci/build-deps-msys2.sh     | 44 -------------------------
 build/windows/gitlab-ci/build-gimp-msys2.sh     |  1 +
 build/windows/gitlab-ci/package-gimp-msys2.sh   |  1 +
 4 files changed, 3 insertions(+), 66 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-crossroad.sh b/build/windows/gitlab-ci/build-deps-crossroad.sh
index 85ea4dd74b..bc80248163 100644
--- a/build/windows/gitlab-ci/build-deps-crossroad.sh
+++ b/build/windows/gitlab-ci/build-deps-crossroad.sh
@@ -35,6 +35,7 @@ crossroad install appstream-glib              \
                   ghostscript                 \
                   iso-codes                   \
                   libheif                     \
+                  libjxl                      \
                   $LIBMNG                     \
                   libmypaint mypaint-brushes  \
                   libwebp                     \
@@ -49,28 +50,6 @@ if [ $? -ne 0 ]; then
 fi
 
 if [ "x$CROSSROAD_PLATFORM" = "xw64" ]; then
-    # build libjxl (not available in MSYS2 yet)
-    crossroad install brotli && \
-    git clone --depth=1 --branch v0.6.x --recursive https://github.com/libjxl/libjxl.git libjxl && cd libjxl 
&& \
-    mkdir _build && cd _build && \
-    crossroad cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DJPEGXL_ENABLE_PLUGINS=OFF -DBUILD_TESTING=OFF 
-DJPEGXL_WARNINGS_AS_ERRORS=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF 
-DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_SKCMS=ON 
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON -DJPEGXL_FORCE_SYSTEM_HWY=OFF -DJPEGXL_ENABLE_JNI=OFF 
-DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DCMAKE_CXX_FLAGS="-DHWY_COMPILE_ONLY_SCALAR" .. && \
-    ninja && ninja install || exit 1
-
-    # move DLLs into correct location
-    if [ -f ${CROSSROAD_PREFIX}/lib/libjxl.dll ]; then
-      mv --target-directory=${CROSSROAD_PREFIX}/bin ${CROSSROAD_PREFIX}/lib/libjxl.dll
-    fi
-
-    if [ -f ${CROSSROAD_PREFIX}/lib/libjxl_threads.dll ]; then
-      mv --target-directory=${CROSSROAD_PREFIX}/bin ${CROSSROAD_PREFIX}/lib/libjxl_threads.dll
-    fi
-
-    # install image/jxl mime type
-    mkdir -p ${CROSSROAD_PREFIX}/share/mime/packages
-    cp --target-directory=${CROSSROAD_PREFIX}/share/mime/packages ../plugins/mime/image-jxl.xml
-
-    cd ../..
-
     # Generate the loaders.cache file for GUI image support.
     # Note: this is mostly for distribution so I initially wanted to
     # have these in "win64-nightly" job but "win32-nightly" also
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 1244423d9d..83115f691a 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -92,47 +92,3 @@ meson -Dprefix="${GIMP_PREFIX}" -Ddocs=false \
 ninja
 ninja install
 cd ../..
-
-## libjxl ##
-pacman --noconfirm -S --needed \
-    mingw-w64-$MSYS2_ARCH-brotli  \
-    mingw-w64-$MSYS2_ARCH-cmake
-
-git clone --depth=${GIT_DEPTH} --branch v0.6.1 --recursive https://github.com/libjxl/libjxl.git _libjxl
-
-mkdir _libjxl/_build
-cd _libjxl/_build
-cmake -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=${GIMP_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DJPEGXL_ENABLE_PLUGINS=OFF \
-    -DBUILD_TESTING=OFF \
-    -DJPEGXL_WARNINGS_AS_ERRORS=OFF \
-    -DJPEGXL_ENABLE_SJPEG=OFF \
-    -DJPEGXL_ENABLE_BENCHMARK=OFF \
-    -DJPEGXL_ENABLE_EXAMPLES=OFF \
-    -DJPEGXL_ENABLE_MANPAGES=OFF \
-    -DJPEGXL_ENABLE_SKCMS=ON \
-    -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
-    -DJPEGXL_FORCE_SYSTEM_HWY=OFF \
-    -DJPEGXL_ENABLE_JNI=OFF \
-    -DJPEGXL_ENABLE_TCMALLOC=OFF \
-    -DJPEGXL_ENABLE_TOOLS=OFF \
-    -DCMAKE_CXX_FLAGS="-DHWY_COMPILE_ONLY_SCALAR" ..
-ninja
-ninja install
-
-# move DLLs into correct location
-if [ -f ${GIMP_PREFIX}/lib/libjxl.dll ]; then
-  mv --target-directory=${GIMP_PREFIX}/bin ${GIMP_PREFIX}/lib/libjxl.dll
-fi
-
-if [ -f ${GIMP_PREFIX}/lib/libjxl_threads.dll ]; then
-  mv --target-directory=${GIMP_PREFIX}/bin ${GIMP_PREFIX}/lib/libjxl_threads.dll
-fi
-
-# install image/jxl mime type
-mkdir -p ${GIMP_PREFIX}/share/mime/packages
-cp --target-directory=${GIMP_PREFIX}/share/mime/packages ../plugins/mime/image-jxl.xml
-
-cd ../..
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 5ee7bece90..47c6c854f0 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -47,6 +47,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-lensfun \
     mingw-w64-$MSYS2_ARCH-libarchive \
     mingw-w64-$MSYS2_ARCH-libheif \
+    mingw-w64-$MSYS2_ARCH-libjxl \
     mingw-w64-$MSYS2_ARCH-libmypaint \
     mingw-w64-$MSYS2_ARCH-libspiro \
     mingw-w64-$MSYS2_ARCH-libwebp \
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index e192186c18..588b868b93 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -46,6 +46,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-lensfun \
     mingw-w64-$MSYS2_ARCH-libarchive \
     mingw-w64-$MSYS2_ARCH-libheif \
+    mingw-w64-$MSYS2_ARCH-libjxl \
     mingw-w64-$MSYS2_ARCH-libmypaint \
     mingw-w64-$MSYS2_ARCH-libspiro \
     mingw-w64-$MSYS2_ARCH-libwebp \