[gimp] build: fix libjxl compilation

[Daniel Novomeský <dnovomesky src gnome org>]

commit 271d6a0bd8464097917e27477790f81a39c3a497
Author: Daniel Novomeský <dnovomesky gmail com>
Date:   Thu Feb 24 07:34:58 2022 +0100

    build: fix libjxl compilation

 build/windows/gitlab-ci/build-deps-crossroad.sh | 4 ++--
 build/windows/gitlab-ci/build-deps-msys2.sh     | 3 +--
 build/windows/gitlab-ci/build-gimp-msys2.sh     | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-crossroad.sh b/build/windows/gitlab-ci/build-deps-crossroad.sh
index 4b906c102c..85ea4dd74b 100644
--- a/build/windows/gitlab-ci/build-deps-crossroad.sh
+++ b/build/windows/gitlab-ci/build-deps-crossroad.sh
@@ -50,10 +50,10 @@ fi
 
 if [ "x$CROSSROAD_PLATFORM" = "xw64" ]; then
     # build libjxl (not available in MSYS2 yet)
-    crossroad install brotli highway && \
+    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=ON -DJPEGXL_ENABLE_JNI=OFF 
-DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DCMAKE_CXX_FLAGS="-DHWY_COMPILE_ONLY_SCALAR" .. && \
+    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
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 45c4fbdf07..1244423d9d 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -96,7 +96,6 @@ cd ../..
 ## libjxl ##
 pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-brotli  \
-    mingw-w64-$MSYS2_ARCH-highway \
     mingw-w64-$MSYS2_ARCH-cmake
 
 git clone --depth=${GIT_DEPTH} --branch v0.6.1 --recursive https://github.com/libjxl/libjxl.git _libjxl
@@ -115,7 +114,7 @@ cmake -G Ninja \
     -DJPEGXL_ENABLE_MANPAGES=OFF \
     -DJPEGXL_ENABLE_SKCMS=ON \
     -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
-    -DJPEGXL_FORCE_SYSTEM_HWY=ON \
+    -DJPEGXL_FORCE_SYSTEM_HWY=OFF \
     -DJPEGXL_ENABLE_JNI=OFF \
     -DJPEGXL_ENABLE_TCMALLOC=OFF \
     -DJPEGXL_ENABLE_TOOLS=OFF \
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index dad001e898..5ee7bece90 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -40,7 +40,6 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-graphviz \
     mingw-w64-$MSYS2_ARCH-gtk3 \
     mingw-w64-$MSYS2_ARCH-headers-git \
-    mingw-w64-$MSYS2_ARCH-highway \
     mingw-w64-$MSYS2_ARCH-iso-codes \
     mingw-w64-$MSYS2_ARCH-json-c \
     mingw-w64-$MSYS2_ARCH-json-glib \