From c92dff3b667df4b981e3113e72f44a396c187a4c Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 12 Aug 2025 15:20:05 +0800 Subject: [PATCH] Add patch to fix build err in aarch64 --- fix-build-err-in-arm.patch | 23 +++++++++++++++++++++++ jpegxl.spec | 15 ++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 fix-build-err-in-arm.patch diff --git a/fix-build-err-in-arm.patch b/fix-build-err-in-arm.patch new file mode 100644 index 0000000..d43088d --- /dev/null +++ b/fix-build-err-in-arm.patch @@ -0,0 +1,23 @@ +From 9634967e18ac248fe2ae05a2239ce4538cebc39e Mon Sep 17 00:00:00 2001 +From: hasinoff +Date: Tue, 1 Nov 2022 20:42:44 -0700 +Subject: [PATCH] Update fast_dct-inl.h + +Add missing std include +--- + lib/jxl/fast_dct-inl.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/jxl/fast_dct-inl.h b/lib/jxl/fast_dct-inl.h +index defdfcd12d9..d2453b0e102 100644 +--- a/lib/jxl/fast_dct-inl.h ++++ b/lib/jxl/fast_dct-inl.h +@@ -10,6 +10,8 @@ + #define LIB_JXL_FAST_DCT_INL_H_ + #endif + ++#include ++ + #include + #include + diff --git a/jpegxl.spec b/jpegxl.spec index 412f238..85dcb98 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %global sover 0.7 %bcond_with gimp_plugin @@ -26,6 +26,8 @@ Source0: %vcs/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: https://github.com/libjxl/libjxl/commit/873890998bb151ba54a865cdbd61df22af29774c.patch # Ssimulacra 2 Patch1: https://github.com/libjxl/libjxl/commit/795b363120bbcfdbb2e2e4fa85146ac6d385137d.patch +# https://github.com/libjxl/libjxl/pull/1857/commits/9634967e18ac248fe2ae05a2239ce4538cebc39e +Patch2: fix-build-err-in-arm.patch # git clone https://github.com/libjxl/libjxl # cd libjxl/ @@ -173,11 +175,9 @@ rm -v %{buildroot}%{_libdir}/*.a %{_bindir}/jxlinfo %{_mandir}/man1/cjxl.1* %{_mandir}/man1/djxl.1* -%ifnarch riscv64 %{abidir}/cjxl-option.list %{abidir}/djxl-option.list %{abidir}/jxlinfo-option.list -%endif %files -n libjxl-devtools %{_bindir}/fuzzer_corpus @@ -201,7 +201,9 @@ rm -v %{buildroot}%{_libdir}/*.a %{abidir}/render_hlg-option.list %{abidir}/texture_to_cube-option.list %{abidir}/tone_map-option.list +%ifnarch riscv64 %{abidir}/xyb_range-option.list +%endif %files doc %doc doc/*.md @@ -239,8 +241,11 @@ rm -v %{buildroot}%{_libdir}/*.a %endif %changelog -* Tue May 06 2025 Shangtong Guo - 0.8.1-2 +* Tue Aug 12 2025 mgb01105731 - 0.7.0-3 +- Add patch to fix build err in aarch64 + +* Tue May 06 2025 Shangtong Guo - 0.7.0-2 - adapt for riscv64 -* Thu Mar 23 2023 Yuanhong Peng - 0.8.1-1 +* Thu Mar 23 2023 Yuanhong Peng - 0.7.0-1 - Init from upstream -- Gitee