From e58efc314d8dbec22df7c595ec6e3d62fdc0f639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= Date: Fri, 4 Nov 2022 12:12:37 +0100 Subject: [PATCH] flatpak: change recipe for libjxl --- build/flatpak/org.gimp.GIMP-nightly.json | 32 ++++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/build/flatpak/org.gimp.GIMP-nightly.json b/build/flatpak/org.gimp.GIMP-nightly.json index e758211583..2a05895152 100644 --- a/build/flatpak/org.gimp.GIMP-nightly.json +++ b/build/flatpak/org.gimp.GIMP-nightly.json @@ -646,20 +646,42 @@ "-DJPEGXL_ENABLE_MANPAGES=OFF", "-DJPEGXL_ENABLE_PLUGINS=OFF", "-DJPEGXL_ENABLE_SJPEG=OFF", - "-DJPEGXL_ENABLE_SKCMS=ON", + "-DJPEGXL_ENABLE_SKCMS=OFF", "-DJPEGXL_ENABLE_TCMALLOC=OFF", "-DJPEGXL_ENABLE_TOOLS=OFF", "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON", + "-DJPEGXL_FORCE_SYSTEM_HWY=ON", + "-DJPEGXL_FORCE_SYSTEM_LCMS2=ON", "-DJPEGXL_WARNINGS_AS_ERRORS=OFF" ], "buildsystem": "cmake-ninja", "builddir": true, + "modules": [ + { + "name": "libhwy", + "config-opts": [ + "-DBUILD_TESTING=OFF", + "-DBUILD_SHARED_LIBS=OFF", + "-DHWY_ENABLE_EXAMPLES=OFF", + "-DHWY_ENABLE_TESTS=OFF", + "-DHWY_FORCE_STATIC_LIBS=ON" + ], + "buildsystem": "cmake-ninja", + "builddir": true, + "sources": [ + { + "type": "archive", + "url": "https://github.com/google/highway/archive/refs/tags/1.0.2.tar.gz", + "sha256": "e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db" + } + ] + } + ], "sources": [ { - "type": "git", - "url": "https://github.com/libjxl/libjxl.git", - "tag": "v0.7.0", - "commit": "f95da131cf7c7ccd4da256356fde2fec1fa23bb5" + "type": "archive", + "url": "https://github.com/libjxl/libjxl/archive/refs/tags/v0.7.0.tar.gz", + "sha256": "3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e" } ] },