Update skia version, and start work on getting harfbuzz shaper working
This commit is contained in:
parent
79d768e8f6
commit
525da85f51
12 changed files with 117 additions and 36 deletions
|
|
@ -34,4 +34,24 @@ sources:
|
|||
"134.20250327.0":
|
||||
url:
|
||||
- "https://github.com/google/skia/archive/aefbd9403c1b3032ad4cd0281ef312ed262c7125.zip"
|
||||
sha256: "e10c67a96828b9f36364e2459cdee3e3b381a3875ff78db2b30e7b6fe69509bb"
|
||||
sha256: "e10c67a96828b9f36364e2459cdee3e3b381a3875ff78db2b30e7b6fe69509bb"
|
||||
"135.20250607.0":
|
||||
url:
|
||||
- "https://github.com/google/skia/archive/f90131803d70d767bca2f86f12494d55662bdc60.zip"
|
||||
sha256: "20a1bc403f4a7f6571e59da851e341d5674b644b8b6ae6b9758d3684d3044f62"
|
||||
"136.20250607.0":
|
||||
url:
|
||||
- "https://github.com/google/skia/archive/bcce46ca33b67cc302dd53927a63013b8f53bf73.zip"
|
||||
sha256: "f053d8c6fd8a1a9560b81f973ddddd2ffdba50e6a0318a4207a659acc5ebe156"
|
||||
"137.20250607.0":
|
||||
url:
|
||||
- "https://github.com/google/skia/archive/0dfd95a49aed617f242c8b06dd5b255d1cb07776.zip"
|
||||
sha256: "34869886d3ec540cb05c330b34a471126b24131aaff0aa69a1bf4f161d4211f3"
|
||||
"138.20250708.0":
|
||||
url:
|
||||
- "https://github.com/google/skia/archive/a46d5732d9fca93eaec23e502e2eef814b707e6b.zip"
|
||||
sha256: "ef11a5de527636d4278a38b110f290679bf4169653720ff68cb4e148027fec22"
|
||||
"142.20250802.0":
|
||||
url:
|
||||
- "https://github.com/google/skia/archive/f4ed99d2443962782cf5f8b4dd27179f131e7cbe.zip"
|
||||
sha256: "2e00dcdb54942c1da7b2f6cfd9fef8c4899115206d940931f6c040bac08b6b79"
|
||||
|
|
|
|||
|
|
@ -413,10 +413,10 @@ class ConanSkia(ConanFile):
|
|||
self.tool_requires("ninja/[>=1.11.0]")
|
||||
|
||||
if self.options.use_harfbuzz and self.options.use_system_harfbuzz and self.options.use_conan_harfbuzz:
|
||||
self.requires("harfbuzz/[>=7.3.0]", options = {"with_subset":True, "with_glib":False})
|
||||
self.requires("harfbuzz/10.4.0", options = {"with_subset":True, "with_glib":False})
|
||||
|
||||
if self.options.use_freetype and self.options.use_system_freetype and self.options.use_conan_freetype:
|
||||
self.requires("freetype/[>=2.11.1]")
|
||||
self.requires("freetype/2.13.2")
|
||||
|
||||
if self.options.use_fontconfig and self.options.use_conan_fontconfig:
|
||||
self.requires("fontconfig/[>=2.14.2]")
|
||||
|
|
@ -629,6 +629,27 @@ class ConanSkia(ConanFile):
|
|||
else:
|
||||
raise RuntimeError("Unexpected settings.arch")
|
||||
|
||||
if self.settings.os == "Emscripten":
|
||||
args += f"skia_canvaskit_enable_alias_font = false\n"
|
||||
args += f"skia_canvaskit_enable_bidi = false\n"
|
||||
args += f"skia_canvaskit_enable_canvas_bindings = false\n"
|
||||
args += f"skia_canvaskit_enable_debugger = false\n"
|
||||
args += f"skia_canvaskit_enable_effects_deserialization = false\n"
|
||||
args += f"skia_canvaskit_enable_embedded_font = false\n"
|
||||
args += f"skia_canvaskit_enable_font = false\n"
|
||||
args += f"skia_canvaskit_enable_matrix_helper = false\n"
|
||||
args += f"skia_canvaskit_enable_paragraph = false\n"
|
||||
args += f"skia_canvaskit_enable_pathops = false\n"
|
||||
args += f"skia_canvaskit_enable_rt_shader = false\n"
|
||||
args += f"skia_canvaskit_enable_skp_serialization = false\n"
|
||||
args += f"skia_canvaskit_enable_sksl_trace = false\n"
|
||||
args += f"skia_canvaskit_enable_webgl = false\n"
|
||||
args += f"skia_canvaskit_enable_webgpu = false\n"
|
||||
args += f"skia_canvaskit_force_tracing = false\n"
|
||||
args += f"skia_canvaskit_include_viewer = false\n"
|
||||
args += f"skia_canvaskit_legacy_draw_vertices_blend_mode = false\n"
|
||||
args += f"skia_canvaskit_profile_build = false\n"
|
||||
|
||||
cflags = []
|
||||
ldflags = []
|
||||
asmflags = []
|
||||
|
|
@ -706,7 +727,7 @@ class ConanSkia(ConanFile):
|
|||
else:
|
||||
self.run("bin/gn gen out/conan")
|
||||
|
||||
self.run("ninja -C out/conan")
|
||||
self.run("ninja -C out/conan skia svg skresources skcms skunicode skshaper skparagraph skottie bentleyottmann")
|
||||
|
||||
def package(self):
|
||||
source_folder_include = join(self.source_folder, "include")
|
||||
|
|
@ -751,9 +772,9 @@ class ConanSkia(ConanFile):
|
|||
else:
|
||||
copy(self, "*.a", build_folder_out, package_folder_lib, keep_path=False)
|
||||
|
||||
if self.settings.os == "Emscripten" and self.settings.arch == "wasm":
|
||||
copy(self, "canvaskit.js", build_folder_out, package_folder_bin)
|
||||
copy(self, "canvaskit.wasm", build_folder_out, package_folder_bin)
|
||||
#if self.settings.os == "Emscripten" and self.settings.arch == "wasm":
|
||||
# copy(self, "canvaskit.js", build_folder_out, package_folder_bin)
|
||||
# copy(self, "canvaskit.wasm", build_folder_out, package_folder_bin)
|
||||
|
||||
def package_info(self):
|
||||
|
||||
|
|
@ -897,9 +918,10 @@ class ConanSkia(ConanFile):
|
|||
self.cpp_info.system_libs += ["gdi32"]
|
||||
|
||||
# component: pathkit
|
||||
# not in program's build, so it'll be commented for now
|
||||
|
||||
if not self.options.shared:
|
||||
self.cpp_info.libs += ["pathkit"]
|
||||
#if not self.options.shared:
|
||||
# self.cpp_info.libs += ["pathkit"]
|
||||
|
||||
# component: skcms
|
||||
|
||||
|
|
@ -963,5 +985,3 @@ class ConanSkia(ConanFile):
|
|||
if self.options.enable_bentleyottmann:
|
||||
if not (self.settings.os == "Windows" and self.options.shared):
|
||||
self.cpp_info.libs += ["bentleyottmann"]
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue