From d718e8df45b8983331f069d32c7ba5a1e072ea2f Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Mon, 15 Dec 2025 19:13:28 +0100
Subject: [PATCH] libultrahdr: temporarily build from latest commit

Allows building with GCC 15.
---
 build/posix.sh           | 10 +++-------
 check-latest-versions.sh |  2 +-
 versions.properties      |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build/posix.sh b/build/posix.sh
index 3f85b36b..bc80a3b7 100755
--- a/build/posix.sh
+++ b/build/posix.sh
@@ -358,14 +358,10 @@ CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=r
 meson install -C _build --tag devel
 
 mkdir ${DEPS}/uhdr
-$CURL https://github.com/google/libultrahdr/archive/v${VERSION_UHDR}.tar.gz | tar xzC ${DEPS}/uhdr --strip-components=1
+$CURL https://github.com/google/libultrahdr/archive/${VERSION_UHDR}.tar.gz | tar xzC ${DEPS}/uhdr --strip-components=1
 cd ${DEPS}/uhdr
-# [PATCH] improper use of clamp macro
-$CURL https://github.com/google/libultrahdr/commit/5ed39d67cd31d254e84ebf76b03d4b7bcc12e2f7.patch | patch -p1
-# [PATCH] Add ppc64le and s390x to recognized architectures
-$CURL https://github.com/google/libultrahdr/pull/376.patch | patch -p1
-# Avoid architecture-specific compile flags
-sed -i'.bak' '/add_compile_options(-[mf]/d' CMakeLists.txt
+# [PATCH] Remove platform and architecture detection logic
+$CURL https://github.com/google/libultrahdr/pull/383.patch | patch -p1
 # Ensure install targets are enabled when cross-compiling
 sed -i'.bak' 's/CMAKE_CROSSCOMPILING AND UHDR_ENABLE_INSTALL/FALSE/' CMakeLists.txt
 CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \
diff --git a/check-latest-versions.sh b/check-latest-versions.sh
index 37e92c93..750d67bc 100755
--- a/check-latest-versions.sh
+++ b/check-latest-versions.sh
@@ -51,7 +51,7 @@ version_latest "png" "$VERSION_PNG" "1705"
 version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl"
 version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable"
 version_latest "tiff" "$VERSION_TIFF" "1738"
-version_latest "uhdr" "$VERSION_UHDR" "375187"
+#version_latest "uhdr" "$VERSION_UHDR" "375187" # use commit SHA until next tagged release
 version_latest "vips" "$VERSION_VIPS" "5097"
 version_latest "webp" "$VERSION_WEBP" "1761"
 version_latest "xml2" "$VERSION_XML2" "1783"
diff --git a/versions.properties b/versions.properties
index a3163d3b..e116927d 100644
--- a/versions.properties
+++ b/versions.properties
@@ -21,7 +21,7 @@ VERSION_PNG=1.6.54
 VERSION_PROXY_LIBINTL=0.5
 VERSION_RSVG=2.61.90
 VERSION_TIFF=4.7.1
-VERSION_UHDR=1.4.0
+VERSION_UHDR=8cbc983
 VERSION_VIPS=8.18.0
 VERSION_WEBP=1.6.0
 VERSION_XML2=2.15.1