extra/libjxl: Remove from blacklist and disable SSE2

2 files changed, 13 insertions, 5 deletions

diff --git a/blacklist/i686/libjxl/libjxl b/blacklist/i686/libjxl/libjxl
deleted file mode 100644
index f0d788f3..00000000
--- a/blacklist/i686/libjxl/libjxl
+++ /dev/null
@@ -1 +0,0 @@
-Too hard to enable non-SSE2 version
diff --git a/extra/libjxl/PKGBUILD b/extra/libjxl/PKGBUILD
index 29fb0241..9785a119 100644
--- a/extra/libjxl/PKGBUILD
+++ b/extra/libjxl/PKGBUILD
@@ -12,9 +12,18 @@ if [ "${CARCH}" = "i486" ]; then
   makedepends=(${makedepends[@]//gimp/})
 fi
 
-# blacklisted on i486 and i686 as I don't really know how to switch
-# off SSE2 in this mess. It builds on i686 in a chroot on AMD64 but
-# wrongly tests positive for SSE2.
+# Disable SSE2
+if [ "$CARCH" = 'i486' -o "$CARCH" = 'i686' ]; then
+  eval "$(
+    declare -f build | \
+      sed 's/-DCMAKE_BUILD_TYPE/-DSJPEG_ENABLE_SIMD=OFF -DCMAKE_BUILD_TYPE/'
+  )"
+
+  eval "$(
+    declare -f prepare | \
+      sed '$ d' | sed '$ a sed -i s/HWY_SSSE3/HWY_SSSE3\\|HWY_SSE2\\|HWY_SSE4/ "${srcdir}/libjxl/CMakeLists.txt";}'
+  )"
+fi
 
-# they fail in various waus
+# they fail in various ways
 unset check