copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Changes to conanfile.py, and flatpak build works again

Browse source
This commit is contained in:
Yousef Khadadeh 2025-11-14 16:37:49 +03:00
parent 124203def3
commit 78a2b5918b
7 changed files with 83 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

69
conanfile.py
View file

@ -9,47 +9,52 @@ class CompressorRecipe(ConanFile):
if self.settings.os == "Emscripten":
self.requires("skia/142.20250802.0", options = {
"enable_svg": True,
"use_freetype":True,
"use_system_freetype":True,
"use_freetype": True,
"use_system_freetype": True,
"use_expat": True,
"use_harfbuzz": True,
"use_system_harfbuzz":True,
"use_conan_harfbuzz":False,
"use_system_harfbuzz": True,
"use_conan_harfbuzz": False,
"use_system_icu": True,
"use_conan_icu": True,
"enable_skshaper": True,
"canvaskit_enable_alias_font" : False,
"canvaskit_enable_canvas_bindings" : False,
"canvaskit_enable_effects_deserialization" : False,
"canvaskit_enable_embedded_font" : False,
"canvaskit_enable_font" : False,
"canvaskit_enable_matrix_helper" : False,
"canvaskit_enable_pathops" : False,
"canvaskit_enable_rt_shader" : False,
"canvaskit_enable_skp_serialization" : False,
"canvaskit_enable_sksl_trace" : False,
"canvaskit_enable_webgpu " : False,
"canvaskit_enable_webgl " : False
"canvaskit_enable_alias_font": False,
"canvaskit_enable_canvas_bindings": False,
"canvaskit_enable_effects_deserialization": False,
"canvaskit_enable_embedded_font": False,
"canvaskit_enable_font": False,
"canvaskit_enable_matrix_helper": False,
"canvaskit_enable_pathops": False,
"canvaskit_enable_rt_shader": False,
"canvaskit_enable_skp_serialization": False,
"canvaskit_enable_sksl_trace": False,
"canvaskit_enable_webgpu": False,
"canvaskit_enable_webgl": False,
"use_system_libwebp": False, # There's a problem compiling libwebp with emscripten in conan
"use_conan_libwebp": False
})
else:
self.requires("skia/142.20250802.0", options = {
"use_system_expat":False,
"use_system_freetype":True,
"use_conan_freetype":True,
"use_system_harfbuzz":False,
"use_system_icu":False,
"use_system_libjpeg_turbo":False,
"use_system_libpng":False,
"use_system_libwebp":False,
"use_system_zlib":False,
"use_system_expat": False,
"use_freetype": True,
"use_system_freetype": True,
"use_conan_freetype": True,
"use_system_harfbuzz": True,
"use_conan_harfbuzz": True,
"use_system_icu": True,
"use_conan_icu": True,
"use_system_libjpeg_turbo": False,
"use_system_libpng": False,
"use_system_libwebp": False,
"use_system_zlib": False,
"enable_svg": True,
"enable_skottie": False,
"enable_bentleyottmann": True, # for some reason, setting this to False results in an error when creating the project
"use_freetype": True
"enable_bentleyottmann": True # for some reason, setting this to False results in an error when creating the project
})
self.requires("harfbuzz/11.4.1")
if self.settings.os == "Linux":
self.requires("sdl/3.2.24", options = {
self.requires("sdl/3.2.26", options = {
"wayland": False,
"pulseaudio": False,
"alsa": False,
@ -58,17 +63,17 @@ class CompressorRecipe(ConanFile):
"opengles": False
})
else:
self.requires("sdl/3.2.24")
self.requires("sdl/3.2.26")
if self.settings.os != "Emscripten" and self.settings.os != "Macos":
self.requires("onetbb/2022.0.0")
if self.settings.os != "Emscripten":
self.requires("libdatachannel/0.23.1")
self.requires("libcurl/8.15.0")
self.requires("libcurl/8.16.0")
self.requires("zstd/1.5.7")
self.requires("icu/[>=77.1]")
self.requires("icu/77.1")
def build_requirements(self):
self.tool_requires("cmake/3.27.0")