[meta-oe][PATCH 076/109] libjxl: upgrade 0.11.2 -> 0.12.0

Khem Raj <[email protected]>
Newsgroups org.openembedded.lists.openembedded-devel
Message-ID <[email protected]>
Point release. Dropped 0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch:
its actual fix (the CMAKE_SYSTEM_PROCESSOR MATCHES "riscv" guard around
-mrelax-all) is already present upstream in 0.12.0's CMakeLists.txt; only the
CONTRIBUTORS name-credit hunk was left, not worth carrying as a patch on its own.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <[email protected]>
---
 ...use-mrelax-all-with-clang-on-RISCV64.patch | 56 -------------------
 .../{libjxl_0.11.2.bb => libjxl_0.12.0.bb}    |  3 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch
 rename meta-oe/recipes-multimedia/libjxl/{libjxl_0.11.2.bb => libjxl_0.12.0.bb} (94%)

diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch b/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch
deleted file mode 100644
index 287dfc8ca8..0000000000
--- a/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0cf439c243dfdb6eee6133ee87172235a42e59c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 14 Sep 2024 22:04:06 +0000
-Subject: [PATCH] cmake: Do not use -mrelax-all with clang on RISCV64
-
-This option causes clang 19+ to crash on riscv64
-
-For RISC-V -mrelax-all causes the assembler stage to convert
-all conditional branches into
-
-  bcc reg, reg, tmplabel
-  jmp target
-tmplabel:
-
-Unconditional jmp can reach targets a lot further than a conditional branch.
-Unfortunately, jmp also has a limited range so sometimes needs to be
-converted to an indirect jump which requires a scratch register.
-We do all branch relaxation early for RISC-V during the compilation
-stage so we can allocate the scratch register.
-
-If the assembler also does branch relaxation it will increase the size
-of the function and may cause unconditional jmps to go out of range.
-If this happens, linking will fail.
-
-Upstream-Status: Submitted [https://github.com/libjxl/libjxl/pull/3826]
-Signed-off-by: Khem Raj <[email protected]>
----
- CMakeLists.txt | 2 +-
- CONTRIBUTORS   | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b2ccb57..39bee096 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -335,7 +335,7 @@ else ()
- 
-   # Machine flags.
-   add_compile_options(-funwind-tables)
--  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "riscv")
-     add_compile_options("SHELL:-Xclang -mrelax-all")
-   endif()
-   if (CXX_CONSTRUCTOR_ALIASES_SUPPORTED)
-diff --git a/CONTRIBUTORS b/CONTRIBUTORS
-index 848096f9..a88c6157 100644
---- a/CONTRIBUTORS
-+++ b/CONTRIBUTORS
-@@ -10,6 +10,7 @@ Iulia-Maria Comșa
- Jan Wassenberg
- Jon Sneyers
- Jyrki Alakuijala
-+Khem Raj
- Krzysztof Potempa
- Lode Vandevenne
- Luca Versari
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.12.0.bb
similarity index 94%
rename from meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb
rename to meta-oe/recipes-multimedia/libjxl/libjxl_0.12.0.bb
index f73fd314c2..7422282e4c 100644
--- a/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb
+++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.12.0.bb
@@ -9,10 +9,9 @@ inherit cmake pkgconfig mime
 DEPENDS = "highway brotli"
 
 SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1;tag=v${PV} \
-           file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \
            "
 
-SRCREV = "332feb17d17311c748445f7ee75c4fb55cc38530"
+SRCREV = "a7a9c787341cf703dede03c2009fa460cae5e5df"
 
 EXTRA_OECMAKE = " \
 	-DCMAKE_BUILD_TYPE=Release \
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.