Merge pull request #339 from suda-morris/bugfix/build_thorvg_no_pic

fix(thorvg): build static library without -fPIC
espressif · Jun 14, 2024 · 64ba4fe · 64ba4fe
2 parents 46213e9 + a48e8d1
commit 64ba4fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/thorvg/CMakeLists.txt b/thorvg/CMakeLists.txt
@@ -80,7 +80,7 @@ endif()
 
 file(APPEND ${TVG_CROSS_CFG} "
 [host_machine]
-system = 'freertos'
+system = 'android'
 cpu_family = '${CMAKE_SYSTEM}'
 cpu = 'esp'
 endian = 'little'
@@ -94,14 +94,15 @@ ExternalProject_Add(${TVG_LIB}_target
     --cross-file ${TVG_CROSS_CFG}
     -Dbindings=capi
     -Dextra=
-    -Ddefault_library=static
-    -Dthreads=false
+    -Ddefault_library=static # build static library
+    -Db_staticpic=false # no -fPIC
+    -Dthreads=true # allow multi-threading
     BUILD_COMMAND ninja -C ${TVG_BUILD_DIR}
     INSTALL_COMMAND ""
     BUILD_BYPRODUCTS ${TVG_BUILD_DIR}/src/${TVG_LIB}.a
 )
 
-add_prebuilt_library(${TVG_LIB} ${TVG_BUILD_DIR}/src/${TVG_LIB}.a PRIV_REQUIRES esp_rom)
+add_prebuilt_library(${TVG_LIB} ${TVG_BUILD_DIR}/src/${TVG_LIB}.a PRIV_REQUIRES pthread)
 add_dependencies(${TVG_LIB} ${TVG_LIB}_target)
 
 target_link_libraries(${COMPONENT_LIB} INTERFACE ${TVG_LIB})
diff --git a/thorvg/idf_component.yml b/thorvg/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.13.6~1"
+version: "0.13.8"
 description: "ThorVG is an open-source graphics library designed for creating vector-based scenes and animations"
 url: https://github.com/espressif/idf-extra-components/tree/master/thorvg
 repository: "https://github.com/espressif/idf-extra-components.git"

diff --git a/thorvg/sbom_thorvg.yml b/thorvg/sbom_thorvg.yml
@@ -1,7 +1,7 @@
 name: thorvg
-version: 0.13.6
+version: 0.13.8
 cpe: cpe:2.3:a:thorvg:thorvg:{}:*:*:*:*:*:*:*
 supplier: 'Organization: thorvg <https://github.com/thorvg/thorvg>'
 description: ThorVG is an open-source graphics library designed for creating vector-based scenes and animations.
 url: https://github.com/thorvg/thorvg
-hash: 20f82982b096425800e1f7d40f1c17a5c17baac2
+hash: 30aa742b26e35e170f927c8e5ebdaa68dea6f48f
diff --git a/thorvg/thorvg b/thorvg/thorvg
+2 −0		examples/MaskingMethods.cpp
+36 −12		inc/thorvg.h
+1 −1		meson.build
+4 −13		src/bindings/capi/thorvg_capi.h
+0 −1		src/bindings/capi/tvgCapi.cpp
+2 −0		src/common/tvgLock.h
+13 −12		src/loaders/lottie/tvgLottieBuilder.cpp
+1 −1		src/loaders/lottie/tvgLottieLoader.h
+5 −25		src/loaders/lottie/tvgLottieModel.cpp
+9 −0		src/loaders/lottie/tvgLottieModel.h
+5 −7		src/loaders/lottie/tvgLottieParser.cpp
+123 −40		src/loaders/svg/tvgSvgLoader.cpp
+18 −2		src/loaders/svg/tvgSvgLoaderCommon.h
+77 −8		src/loaders/svg/tvgSvgSceneBuilder.cpp
+0 −12		src/renderer/sw_engine/tvgSwCommon.h
+21 −28		src/renderer/sw_engine/tvgSwRasterTexmap.h
+1 −2		src/renderer/sw_engine/tvgSwRenderer.cpp
+2 −5		src/renderer/sw_engine/tvgSwRle.cpp
+103 −95		src/renderer/sw_engine/tvgSwShape.cpp
+12 −0		src/renderer/tvgCommon.h
+53 −25		src/renderer/tvgPaint.cpp
+1 −1		src/renderer/tvgRender.h
+22 −13		src/renderer/tvgShape.cpp
+40 −23		src/renderer/tvgShape.h
+2 −0		src/renderer/tvgTaskScheduler.h
+1 −1		test/capi/capiShape.cpp
+1 −1		test/testShape.cpp