diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..e8e63f0 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1725435714 +commit: 805ed64ff6380a7813ecab1474879bc2f84a519eeda6b4974e69ec85e36d5751 +url: https://src.opensuse.org/jengelh/libjxl +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..9a8c01c --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81712f13ede9f7fdfdca8dad21a2ce21dfc01134b2db43c6013e312bee234094 +size 256 diff --git a/libjxl.changes b/libjxl.changes index ad97a95..4a3551a 100644 --- a/libjxl.changes +++ b/libjxl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 30 11:16:35 UTC 2024 - Cliff Zhao + +- Update libjxl.spec: + Add compiler condition to fix SLE-15-SP7 ppc64le build env. + (bsc#1229831) + ------------------------------------------------------------------- Sat Jun 29 03:56:34 UTC 2024 - Jan Engelhardt diff --git a/libjxl.spec b/libjxl.spec index ee8ae7c..8791b26 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -1,5 +1,5 @@ # -# spec file for package libjxl +# spec file for package libjxl-gtk # # Copyright (c) 2024 SUSE LLC # @@ -53,6 +53,9 @@ BuildRequires: pkgconfig(libhwy) >= 1.0.7 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libwebp) +%if 0%{?sle_version} == 150700 +BuildRequires: gcc10-c++ +%endif %{?suse_build_hwcaps_libs} %if %{with gtk} Provides: bundled(skcms) = 0 @@ -117,6 +120,11 @@ for example, on file-browsers. mv skcms third_party/ %build +%if 0%{?sle_version} == 150700 +export CC=gcc-10 +export CXX=g++-10 +%endif + %cmake -DJPEGXL_FORCE_SYSTEM_HWY=ON -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ -DJPEGXL_FORCE_SYSTEM_LCMS2=OFF -DBUILD_TESTING=OFF \ %if %{with gtk}