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

Use EGL instead of GLX, and remove duplicate font names

Browse source
This commit is contained in:
Yousef Khadadeh 2025-11-15 17:03:14 +03:00
parent 5e8016b504
commit e4efb2e78d
5 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
conan/conan-skia/recipes/skia/all/conanfile.py
View file

@ -81,6 +81,7 @@ class ConanSkia(ConanFile):
"use_fontconfig" : [True, False],
"use_fonthost_mac" : [True, False],
"use_perfetto" : [True, False],
"use_egl": [True, False],
# backend toggles
"enable_ganesh" : [True, False],
"enable_graphite" : [True, False],
@ -162,6 +163,7 @@ class ConanSkia(ConanFile):
"use_wuffs" : True,
"use_libavif" : False,
"use_libjxl_decode" : False,
"use_egl": False,
# backend toggles
"enable_ganesh" : True,
"enable_graphite" : False,
@ -268,6 +270,10 @@ class ConanSkia(ConanFile):
if self.options.use_x11 == None:
enabled = (os == "Linux")
self.options.use_x11 = enabled
if self.options.use_egl == None:
enabled = (os == "Linux")
self.options.use_egl = enabled
if self.options.use_fontconfig == None:
enabled = (os == "Linux")
@ -647,6 +653,16 @@ class ConanSkia(ConanFile):
args += f"skia_canvaskit_legacy_draw_vertices_blend_mode = false\n"
args += f"skia_canvaskit_profile_build = false\n"
if self.settings.os == "Linux" and self.options.use_egl == True:
args += f"skia_use_egl = true\n"
else:
args += f"skia_use_egl = false\n"
if self.settings.os == "Linux" and self.options.use_x11 == True:
args += f"skia_use_x11 = true\n"
else:
args += f"skia_use_x11 = false\n"
cflags = []
ldflags = []
asmflags = []