From aedcfa31f6a2bd9a35c0e9f12d3924189d2f6a0d Mon Sep 17 00:00:00 2001
From: suda-morris <362953310@qq.com>
Date: Thu, 6 Jun 2024 23:03:32 +0800
Subject: [PATCH 1/2] change(thorvg): sync with upstream v0.13.8

thorvg: sync with upstream v0.13.8
---
 thorvg/idf_component.yml | 2 +-
 thorvg/sbom_thorvg.yml   | 4 ++--
 thorvg/thorvg            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/thorvg/idf_component.yml b/thorvg/idf_component.yml
index 087f2e08cb..80f75dbef8 100644
--- 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
index 7c84922087..11aa3c715e 100644
--- 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
index 20f82982b0..30aa742b26 160000
--- a/thorvg/thorvg
+++ b/thorvg/thorvg
@@ -1 +1 @@
-Subproject commit 20f82982b096425800e1f7d40f1c17a5c17baac2
+Subproject commit 30aa742b26e35e170f927c8e5ebdaa68dea6f48f

From a48e8d1a140adcdd0f695db63d219295f2e961b8 Mon Sep 17 00:00:00 2001
From: morris <maoshengrong@espressif.com>
Date: Fri, 14 Jun 2024 11:34:09 +0800
Subject: [PATCH 2/2] fix(thorvg): build static library without -fPIC

ESP-IDF only use static library, and the thorvg library won't be linked
into a dynamic library
---
 thorvg/CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/thorvg/CMakeLists.txt b/thorvg/CMakeLists.txt
index 7601839f6e..424d0564b5 100644
--- 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})