libjxl: Bump to 0.8.0

packages/libjxl/build.sh

@@ -2,18 +2,20 @@ TERMUX_PKG_HOMEPAGE=https://jpegxl.info/
 TERMUX_PKG_DESCRIPTION="JPEG XL image format reference implementation"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.7.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=0.8.0
 TERMUX_PKG_SRCURL=https://github.com/libjxl/libjxl/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e
+TERMUX_PKG_SHA256=6b4c140c1738acbed6b7d22858e0526373f0e9938e3f6c0a6b8943189195aad1
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="brotli, libc++"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DJPEGXL_FORCE_SYSTEM_BROTLI=True"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DJPEGXL_ENABLE_JNI=False
+-DJPEGXL_FORCE_SYSTEM_BROTLI=True
+"
 
 termux_step_post_get_source() {
 	# Do not forget to bump revision of reverse dependencies and rebuild them
 	# after RELEASE / SOVERSION is changed.
-	local _SOVERSION=0.7
+	local _SOVERSION=0.8
 
 	for a in MAJOR SO_MINOR; do
 		local _${a}=$(sed -En 's/^set\(JPEGXL_'"${a}"'_VERSION\s+([0-9]+).*/\1/p' \

packages/libjxl/cmake_fixes.patch

@@ -7,7 +7,7 @@ index 1ff120c99..6e577ceb6 100644
      ../third_party/dirent.cc
    )
 -  target_link_libraries(benchmark_xl Threads::Threads)
-+  target_link_libraries(benchmark_xl Threads::Threads -landroid-spawn)
++  target_link_libraries(benchmark_xl Threads::Threads -landroid-glob -landroid-spawn)
    if(MINGW)
    # MINGW doesn't support glob.h.
    target_compile_definitions(benchmark_xl PRIVATE "-DHAS_GLOB=0")

packages/libjxl/fix-pkgconfig-file.patch

@@ -0,0 +1,20 @@
+--- a/third_party/highway/libhwy-test.pc.in
++++ b/third_party/highway/libhwy-test.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: libhwy-test
+--- a/third_party/highway/libhwy.pc.in
++++ b/third_party/highway/libhwy.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: libhwy

packages/libjxl/libjxl-progs.subpackage.sh

@@ -1,3 +1,3 @@
 TERMUX_SUBPKG_DESCRIPTION="Programs for manipulating JPEG XL files"
 TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/"
-TERMUX_SUBPKG_DEPENDS="giflib, libjpeg-turbo, libpng, libwebp, libandroid-spawn"
+TERMUX_SUBPKG_DEPENDS="giflib, libandroid-glob, libandroid-spawn, libjpeg-turbo, libpng, libwebp"

packages/libjxl/use-libandroid-glob-and-spawn.patch

@@ -0,0 +1,33 @@
+--- a/tools/benchmark/benchmark_codec_jpeg.cc
++++ b/tools/benchmark/benchmark_codec_jpeg.cc
+@@ -82,7 +82,7 @@
+ // Not supported on Windows due to Linux-specific functions.
+ // Not supported in Android NDK before API 28.
+ #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && \
+-    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28)
++    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28 || defined(__TERMUX__))
+       const std::string basename = GetBaseName(filename);
+       TemporaryFile in_file(basename, "pnm");
+       TemporaryFile encoded_file(basename, "jpg");
+--- a/tools/benchmark/benchmark_file_io.cc
++++ b/tools/benchmark/benchmark_file_io.cc
+@@ -22,7 +22,7 @@
+ // <glob.h> is included in previous APIs but glob() function is not defined
+ // until API 28.
+ #if __has_include(<glob.h>) && \
+-    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28)
++    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28 || defined(__TERMUX__))
+ #undef HAS_GLOB
+ #define HAS_GLOB 1
+ #endif  // __has_include(<glob.h>)
+--- a/tools/benchmark/benchmark_utils.cc
++++ b/tools/benchmark/benchmark_utils.cc
+@@ -10,7 +10,7 @@
+ // Not supported on Windows due to Linux-specific functions.
+ // Not supported in Android NDK before API 28.
+ #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && \
+-    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28)
++    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28 || defined(__TERMUX__))
+ 
+ #include <libgen.h>
+ #include <spawn.h>