fix: zlib renaming worked, fixing jpeg arch symbols - removed all ref…

…erences to webp

Makefile

@@ -112,7 +112,7 @@ THORVG := thorvg
 LIBJPEG_TURBO := libjpeg-turbo
 LIBPNG := libpng
 ZLIB := zlib
-WEBP := libwebp
+# WEBP := libwebp
 
 # External dependency artifacts
 MESON_CROSS_FILE := cross.txt
@@ -128,7 +128,7 @@ CMAKE_CACHE := CMakeCache.txt
 LIBPNG_LIB := libpng.a
 LIBJPEG_TURBO_LIB := libturbojpeg.a
 ZLIB_LIB := libz.a
-WEBP_LIB := libwebp.a
+# WEBP_LIB := libwebp.a
 
 # Release artifacts will be placed in this directory
 RELEASE := release
@@ -186,7 +186,7 @@ THORVG_LOCAL_ARCH_BUILD_DIR := $(LOCAL_ARCH_BUILD_DIR)/$(THORVG)/build
 LIBJPEG_TURBO_LOCAL_ARCH_BUILD_DIR := $(LOCAL_ARCH_BUILD_DIR)/$(LIBJPEG_TURBO)/build
 LIBPNG_LOCAL_ARCH_BUILD_DIR := $(LOCAL_ARCH_BUILD_DIR)/$(LIBPNG)/build
 ZLIB_LOCAL_ARCH_BUILD_DIR := $(LOCAL_ARCH_BUILD_DIR)/$(ZLIB)/build
-WEBP_LOCAL_ARCH_BUILD_DIR := $(LOCAL_ARCH_BUILD_DIR)/$(WEBP)/build
+# WEBP_LOCAL_ARCH_BUILD_DIR := $(LOCAL_ARCH_BUILD_DIR)/$(WEBP)/build
 
 # Other build flags for dependencies
 ZLIB_LDFLAGS := -Wl,--undefined-version
@@ -323,7 +323,7 @@ define SETUP_MESON
 	meson setup \
 		--prefix=/ \
 		--backend=ninja \
-		-Dloaders="lottie, png, jpg, webp" \
+		-Dloaders="lottie, png, jpg" \
 		-Ddefault_library=static \
 		-Dbindings=capi \
 		-Dlog=false \
@@ -514,7 +514,7 @@ $2_THORVG_DEP_BUILD_DIR := $$($2_DEPS_BUILD_DIR)/$(THORVG)
 $2_LIBJPEG_TURBO_DEP_BUILD_DIR := $$($2_DEPS_BUILD_DIR)/$(LIBJPEG_TURBO)
 $2_LIBPNG_DEP_BUILD_DIR := $$($2_DEPS_BUILD_DIR)/$(LIBPNG)
 $2_ZLIB_DEP_BUILD_DIR := $$($2_DEPS_BUILD_DIR)/$(ZLIB)
-$2_WEBP_DEP_BUILD_DIR := $$($2_DEPS_BUILD_DIR)/$(WEBP)
+# $2_WEBP_DEP_BUILD_DIR := $$($2_DEPS_BUILD_DIR)/$(WEBP)
 
 $2_DEPS_ARTIFACTS_DIR := $(DEPS_ARTIFACTS_DIR)/$1/usr
 $2_DEPS_INCLUDE_DIR := $$($2_DEPS_ARTIFACTS_DIR)/include
@@ -668,7 +668,7 @@ $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_THORVG_DEP_BUILD_DIR)/../
 $(if $(filter $3,false),
 $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(LIBJPEG_TURBO_LIB)
 $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(LIBPNG_LIB)
-$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(WEBP_LIB)
+# $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(WEBP_LIB)
 $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(ZLIB_LIB),)
 	$$(SETUP_MESON)
 
@@ -683,7 +683,7 @@ define NEW_ANDROID_DEPS_BUILD
 $(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,LIBJPEG_TURBO,$(LIBJPEG_TURBO),$$($1_LIBJPEG_TURBO_DEP_BUILD_DIR),$(LIBJPEG_TURBO_LIB)))
 $(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,LIBPNG_LIB,$(LIBPNG),$$($1_LIBPNG_DEP_BUILD_DIR),$(LIBPNG_LIB)))
 $(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_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"))
 endef
@@ -692,7 +692,7 @@ define NEW_APPLE_DEPS_BUILD
 $(eval $(call NEW_APPLE_CMAKE_BUILD,$1,LIBJPEG_TURBO,$(LIBJPEG_TURBO),$$($1_LIBJPEG_TURBO_DEP_BUILD_DIR),$(LIBJPEG_TURBO_LIB)))
 $(eval $(call NEW_APPLE_CMAKE_BUILD,$1,LIBPNG_LIB,$(LIBPNG),$$($1_LIBPNG_DEP_BUILD_DIR),$(LIBPNG_LIB)))
 $(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_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"))
 endef
@@ -871,7 +871,7 @@ endef
 $(eval $(call NEW_LOCAL_ARCH_CMAKE_BUILD,LIBJPEG_TURBO,$(LIBJPEG_TURBO),$(LIBJPEG_TURBO_LIB)))
 $(eval $(call NEW_LOCAL_ARCH_CMAKE_BUILD,LIBPNG,$(LIBPNG),$(LIBPNG_LIB)))
 $(eval $(call NEW_LOCAL_ARCH_CMAKE_BUILD,ZLIB,$(ZLIB),$(ZLIB_LIB)))
-$(eval $(call NEW_LOCAL_ARCH_CMAKE_BUILD,WEBP,$(WEBP),$(WEBP_LIB)))
+# $(eval $(call NEW_LOCAL_ARCH_CMAKE_BUILD,WEBP,$(WEBP),$(WEBP_LIB)))
 
 # Setup meson for thorvg local arch build
 $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): export PKG_CONFIG_PATH := $(PWD)/$(LOCAL_ARCH_LIB_DIR)/pkgconfig:$(PWD)/$(LOCAL_ARCH_LIB64_DIR)
@@ -883,9 +883,10 @@ $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): EXTRA := lottie_expressions
 $(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)
-$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(WEBP_LIB)
 	$(SETUP_MESON)
 
+# $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(WEBP_LIB)
+
 # Build thorvg local arch
 $(LOCAL_ARCH_LIB_DIR)/$(THORVG_LIB): DEP_BUILD_DIR := $(THORVG_LOCAL_ARCH_BUILD_DIR)
 $(LOCAL_ARCH_LIB_DIR)/$(THORVG_LIB): ARTIFACTS_DIR := ../../../../artifacts/$(LOCAL_ARCH)/usr