Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(WASM): add -Dfile=false flag for thorvg wasm builds to resolve runtime errors related to missing filesystem operations #267

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −7
Open

fix(WASM): add -Dfile=false flag for thorvg wasm builds to resolve runtime errors related to missing filesystem operations #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57e06c8
fix(WASM): add -Dfile=false flag for thorvg wasm builds to resolve ru…
theashraf Dec 2, 2024
3f79ad2
chore: update emsdk 3.1.73
theashraf Dec 2, 2024
0aa9362
fix: provide the -Dfile for local arch build
theashraf Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ WASM_BUILD := $(BUILD)/$(WASM)

EMSDK := emsdk
EMSDK_DIR := $(PROJECT_DIR)/$(DEPS_MODULES_DIR)/$(EMSDK)
EMSDK_VERSION := 3.1.71
EMSDK_VERSION := 3.1.73
EMSDK_ENV := emsdk_env.sh

UNIFFI_BINDGEN_CPP := uniffi-bindgen-cpp
Expand Down Expand Up @@ -329,6 +329,7 @@ define SETUP_MESON
-Dthreads=false \
-Dstatic=$(STATIC) \
-Dextra=$(EXTRA) \
-Dfile=$(FILE) \
$(CROSS_FILE) "$(THORVG_DEP_SOURCE_DIR)" "$(THORVG_DEP_BUILD_DIR)"
endef

Expand Down Expand Up @@ -615,13 +616,14 @@ endef

define NEW_THORVG_BUILD
# Setup meson for thorvg
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): export PKG_CONFIG_PATH := $(PWD)/$$($1_DEPS_LIB_DIR)/pkgconfig:$(PWD)/$$($1_DEPS_LIB64_DIR)/pkgconfig
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): export PKG_CONFIG_PATH := $(PWD)/$$($1_DEPS_LIB_DIR)/pkgconfig:$(PWD)/$$($1_DEPS_LIB64_DIR)
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): THORVG_DEP_SOURCE_DIR := $(DEPS_MODULES_DIR)/$(THORVG)
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): THORVG_DEP_BUILD_DIR := $$($1_THORVG_DEP_BUILD_DIR)
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): CROSS_FILE := --cross-file $$($1_THORVG_DEP_BUILD_DIR)/../$(MESON_CROSS_FILE)
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): LOG := false
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): STATIC := $3
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): EXTRA := $4
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): FILE := $5
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_THORVG_DEP_BUILD_DIR)/../$(MESON_CROSS_FILE)
$(if $(filter $3,false),
$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(LIBJPEG_TURBO_LIB)
Expand All @@ -643,7 +645,7 @@ $(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,LIBPNG_LIB,$(LIBPNG),$$($1_LIBPNG_DEP_B
$(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,ZLIB,$(ZLIB),$$($1_ZLIB_DEP_BUILD_DIR),$(ZLIB_LIB)))
$(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,WEBP,$(WEBP),$$($1_WEBP_DEP_BUILD_DIR),$(WEBP_LIB)))
$(eval $(call NEW_ANDROID_CROSS_FILE,$1))
$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions"))
$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions",true))
endef

define NEW_APPLE_DEPS_BUILD
Expand All @@ -652,12 +654,12 @@ $(eval $(call NEW_APPLE_CMAKE_BUILD,$1,LIBPNG_LIB,$(LIBPNG),$$($1_LIBPNG_DEP_BUI
$(eval $(call NEW_APPLE_CMAKE_BUILD,$1,ZLIB,$(ZLIB),$$($1_ZLIB_DEP_BUILD_DIR),$(ZLIB_LIB)))
$(eval $(call NEW_APPLE_CMAKE_BUILD,$1,WEBP,$(WEBP),$$($1_WEBP_DEP_BUILD_DIR),$(WEBP_LIB)))
$(eval $(call NEW_APPLE_CROSS_FILE,$1))
$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions"))
$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions",true))
endef

define NEW_WASM_DEPS_BUILD
$(eval $(call NEW_WASM_CROSS_FILE,$1,$$($1_THORVG_DEP_BUILD_DIR)/..,windows))
$(eval $(call NEW_THORVG_BUILD,$1,false,true,"lottie_expressions"))
$(eval $(call NEW_THORVG_BUILD,$1,false,true,"lottie_expressions",false))
endef

define NEW_ANDROID_BUILD
Expand Down Expand Up @@ -823,6 +825,7 @@ $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): THORVG_DEP_BUILD_DIR := $(TH
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): LOG := false
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): STATIC := false
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): EXTRA := lottie_expressions
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): FILE := true
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(LIBJPEG_TURBO_LIB)
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(LIBPNG_LIB)
$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(ZLIB_LIB)
Expand Down
2 changes: 1 addition & 1 deletion deps/modules/emsdk
Open in desktop
Submodule emsdk updated 3 files
+5 −0 .github/workflows/create-release.yml
+14 −0 bazel/revisions.bzl
+5 −1 emscripten-releases-tags.json
2 changes: 1 addition & 1 deletion deps/modules/thorvg
Open in desktop
Submodule thorvg updated 15 files
+6 −0 meson.build
+5 −0 meson_options.txt
+4 −0 src/loaders/external_jpg/tvgJpgLoader.cpp
+4 −0 src/loaders/external_png/tvgPngLoader.cpp
+4 −0 src/loaders/external_webp/tvgWebpLoader.cpp
+4 −0 src/loaders/jpg/tvgJpgLoader.cpp
+4 −0 src/loaders/lottie/tvgLottieLoader.cpp
+4 −0 src/loaders/png/tvgPngLoader.cpp
+4 −0 src/loaders/svg/tvgSvgLoader.cpp
+13 −1 src/loaders/ttf/tvgTtfLoader.cpp
+4 −0 src/loaders/webp/tvgWebpLoader.cpp
+1 −1 src/renderer/gl_engine/tvgGlGeometry.cpp
+4 −0 src/renderer/tvgLoader.cpp
+5 −0 src/renderer/tvgPicture.cpp
+10 −1 src/renderer/tvgText.cpp
3 changes: 3 additions & 0 deletions dotlottie-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// hint: this is a workaround as the generated code from uniffi has empty lines after doc comments
#![allow(clippy::empty_line_after_doc_comments)]

pub use dotlottie_rs::*;

mod ffi;
Expand Down
Loading