Merge pull request #86846 from capnm/240105_thorvg_from_v0.11.6_to_v0…

….12.0 ThorVG: update from v0.11.6 to v0.12.0
godotengine · Jan 8, 2024 · 01f8ce6 · 01f8ce6
2 parents 9bacd02 + e090b11
commit 01f8ce6
Show file tree

Hide file tree

Showing 94 changed files with 1,513 additions and 715 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -483,7 +483,7 @@ License: Expat
 
 Files: ./thirdparty/thorvg/
 Comment: ThorVG
-Copyright: 2020-2023, The ThorVG Project
+Copyright: 2020-2024, The ThorVG Project
 License: Expat
 
 Files: ./thirdparty/tinyexr/

diff --git a/modules/svg/SCsub b/modules/svg/SCsub
@@ -43,6 +43,8 @@ thirdparty_sources = [
     "src/renderer/tvgShape.cpp",
     "src/renderer/tvgSwCanvas.cpp",
     "src/renderer/tvgTaskScheduler.cpp",
+    "src/renderer/tvgText.cpp",
+    # "src/renderer/tvgWgCanvas.cpp",
     # renderer sw_engine
     "src/renderer/sw_engine/tvgSwFill.cpp",
     "src/renderer/sw_engine/tvgSwImage.cpp",

diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct
@@ -74,6 +74,8 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
         "src/renderer/tvgShape.cpp",
         "src/renderer/tvgSwCanvas.cpp",
         "src/renderer/tvgTaskScheduler.cpp",
+        "src/renderer/tvgText.cpp",
+        # "src/renderer/tvgWgCanvas.cpp",
         # renderer sw_engine
         "src/renderer/sw_engine/tvgSwFill.cpp",
         "src/renderer/sw_engine/tvgSwImage.cpp",

diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct
@@ -69,6 +69,8 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
         "src/renderer/tvgShape.cpp",
         "src/renderer/tvgSwCanvas.cpp",
         "src/renderer/tvgTaskScheduler.cpp",
+        "src/renderer/tvgText.cpp",
+        # "src/renderer/tvgWgCanvas.cpp",
         # renderer sw_engine
         "src/renderer/sw_engine/tvgSwFill.cpp",
         "src/renderer/sw_engine/tvgSwImage.cpp",

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -861,7 +861,7 @@ instead of `miniz.h` as an external dependency.
 ## thorvg
 
 - Upstream: https://github.com/thorvg/thorvg
-- Version: 0.11.6 (3dba4f12f8f05f86acbc51096ca3a15f5d96bc06, 2023)
+- Version: 0.12.0 (25ea242d3867ed66807714f5a52d080984d3c8cc, 2024)
 - License: MIT
 
 Files extracted from upstream source:

diff --git a/thirdparty/thorvg/AUTHORS b/thirdparty/thorvg/AUTHORS
@@ -23,3 +23,5 @@ Rafał Mikrut <[email protected]>
 Martin Capitanio <[email protected]>
 RuiwenTang <[email protected]>
 YouJin Lee <[email protected]>
+SergeyLebedkin <[email protected]>
+Jinny You <[email protected]>
diff --git a/thirdparty/thorvg/LICENSE b/thirdparty/thorvg/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 - 2023 notice for the ThorVG Project (see AUTHORS)
+Copyright (c) 2020 - 2024 notice for the ThorVG Project (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/thirdparty/thorvg/inc/config.h b/thirdparty/thorvg/inc/config.h
@@ -9,5 +9,5 @@
 // For internal debugging:
 //#define THORVG_LOG_ENABLED
 
-#define THORVG_VERSION_STRING "0.11.6"
+#define THORVG_VERSION_STRING "0.12.0"
 #endif