libjxl: bump to 0.9.0

packages/libjxl/build.sh

@@ -2,10 +2,9 @@ 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.8.2"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION="0.9.0"
 TERMUX_PKG_SRCURL=https://github.com/libjxl/libjxl/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420
+TERMUX_PKG_SHA256=d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="brotli, libc++"
 TERMUX_PKG_NO_STATICSPLIT=true
@@ -17,7 +16,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 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.8
+	local _SOVERSION=0.9
 
 	for a in MAJOR SO_MINOR; do
 		local _${a}=$(sed -En 's/^set\(JPEGXL_'"${a}"'_VERSION\s+([0-9]+).*/\1/p' \
@@ -31,5 +30,7 @@ termux_step_post_get_source() {
 		termux_error_exit "SOVERSION guard check failed."
 	fi
 
+	patch -p1 < $TERMUX_PKG_BUILDER_DIR/fix-deps.diff
+
 	./deps.sh
 }

packages/libjxl/cmake_fixes.patch

@@ -1,5 +1,3 @@
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 1ff120c99..6e577ceb6 100644
 --- a/tools/CMakeLists.txt
 +++ b/tools/CMakeLists.txt
 @@ -210,7 +210,7 @@ if(${JPEGXL_ENABLE_BENCHMARK})
@@ -11,26 +9,24 @@ index 1ff120c99..6e577ceb6 100644
    if(MINGW)
    # MINGW doesn't support glob.h.
    target_compile_definitions(benchmark_xl PRIVATE "-DHAS_GLOB=0")
-diff --git a/third_party/sjpeg/CMakeLists.txt b/third_party/sjpeg/CMakeLists.txt
-index 5b0048265..ab385a117 100644
 --- a/third_party/sjpeg/CMakeLists.txt
 +++ b/third_party/sjpeg/CMakeLists.txt
-@@ -18,20 +18,8 @@ set(PROJECT_VERSION 0.1)
- 
+@@ -44,20 +44,7 @@
  ################################################################################
  # Android only.
+ 
 -if(ANDROID)
--  include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
--  add_library(cpufeatures STATIC
--              ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
+-  include_directories(${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures)
+-  add_library(cpufeatures-sjpeg
+-    STATIC ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures/cpu-features.c
 -  )
--  target_link_libraries(cpufeatures dl)
--  set(SJPEG_DEP_LIBRARIES ${SJPEG_DEP_LIBRARIES} cpufeatures)
+-  target_link_libraries(cpufeatures-sjpeg dl)
+-  set(SJPEG_DEP_LIBRARIES ${SJPEG_DEP_LIBRARIES} cpufeatures-sjpeg)
 -  set(SJPEG_DEP_INCLUDE_DIRS ${SJPEG_DEP_INCLUDE_DIRS}
--      ${ANDROID_NDK}/sources/android/cpufeatures
+-      ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures
 -  )
 -endif()
- 
+-
  ## Check for SIMD extensions.
 -include(${CMAKE_CURRENT_LIST_DIR}/cmake/cpu.cmake)
  

packages/libjxl/fix-deps.diff

@@ -0,0 +1,25 @@
+From 0cc36c33d35b3612987932d06217395306b43c5c Mon Sep 17 00:00:00 2001
+From: Sami Boukortt <sboukortt@google.com>
+Date: Sat, 23 Dec 2023 11:25:14 +0100
+Subject: [PATCH] Fix deps.sh (#3071)
+
+All / and - should be substituted.
+
+Fixes #3070.
+---
+ deps.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps.sh b/deps.sh
+index 78987c30204..cc41e238bca 100755
+--- a/deps.sh
++++ b/deps.sh
+@@ -27,7 +27,7 @@ download_github() {
+   local project="$2"
+ 
+   local varname=`echo "$path" | tr '[:lower:]' '[:upper:]'`
+-  varname="${varname/[\/-]/_}"
++  varname="${varname//[\/-]/_}"
+   local sha
+   eval "sha=\${${varname}}"
+