From 403d11330c2bd28dd96039a090845af43e487730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= Date: Thu, 29 Sep 2022 13:43:01 +0200 Subject: [PATCH] flatpak: minor fixes in libde265 and libjxl modules don't build unnecessary tools from libde265 libjxl uses existing BROTLI library instead of bundled one --- build/flatpak/org.gimp.GIMP-nightly.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build/flatpak/org.gimp.GIMP-nightly.json b/build/flatpak/org.gimp.GIMP-nightly.json index 9d15b0f1c6..2416736e81 100644 --- a/build/flatpak/org.gimp.GIMP-nightly.json +++ b/build/flatpak/org.gimp.GIMP-nightly.json @@ -505,6 +505,8 @@ { "name": "libde265", "config-opts": [ + "--disable-dec265", + "--disable-encoder", "--disable-sherlock265" ], "cleanup": [ @@ -636,18 +638,19 @@ { "name": "libjxl", "config-opts": [ - "-DJPEGXL_ENABLE_PLUGINS=OFF", "-DBUILD_TESTING=OFF", - "-DJPEGXL_WARNINGS_AS_ERRORS=OFF", - "-DJPEGXL_ENABLE_SJPEG=OFF", "-DJPEGXL_ENABLE_BENCHMARK=OFF", "-DJPEGXL_ENABLE_DOXYGEN=OFF", "-DJPEGXL_ENABLE_EXAMPLES=OFF", - "-DJPEGXL_ENABLE_MANPAGES=OFF", - "-DJPEGXL_ENABLE_SKCMS=ON", "-DJPEGXL_ENABLE_JNI=OFF", + "-DJPEGXL_ENABLE_MANPAGES=OFF", + "-DJPEGXL_ENABLE_PLUGINS=OFF", + "-DJPEGXL_ENABLE_SJPEG=OFF", + "-DJPEGXL_ENABLE_SKCMS=ON", "-DJPEGXL_ENABLE_TCMALLOC=OFF", - "-DJPEGXL_ENABLE_TOOLS=OFF" + "-DJPEGXL_ENABLE_TOOLS=OFF", + "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON", + "-DJPEGXL_WARNINGS_AS_ERRORS=OFF" ], "buildsystem": "cmake-ninja", "builddir": true,