Merge pull request #67351 from akien-mga/thorvg-0.8.2-cleanup-includes

thorvg: Sync with 0.8.2, cleanup SCsub and fix includes
godotengine · Oct 13, 2022 · 01ae26d · 01ae26d
2 parents 6ad5637 + 99b4507
commit 01ae26d
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 3,324 deletions.
diff --git a/modules/svg/SCsub b/modules/svg/SCsub
@@ -11,6 +11,16 @@ thirdparty_obj = []
 
 thirdparty_dir = "#thirdparty/thorvg/"
 thirdparty_sources = [
+    "src/lib/sw_engine/tvgSwFill.cpp",
+    "src/lib/sw_engine/tvgSwImage.cpp",
+    "src/lib/sw_engine/tvgSwMath.cpp",
+    "src/lib/sw_engine/tvgSwMemPool.cpp",
+    "src/lib/sw_engine/tvgSwRaster.cpp",
+    "src/lib/sw_engine/tvgSwRenderer.cpp",
+    "src/lib/sw_engine/tvgSwRle.cpp",
+    "src/lib/sw_engine/tvgSwShape.cpp",
+    "src/lib/sw_engine/tvgSwStroke.cpp",
+    "src/lib/tvgAccessor.cpp",
     "src/lib/tvgBezier.cpp",
     "src/lib/tvgCanvas.cpp",
     "src/lib/tvgFill.cpp",
@@ -28,27 +38,18 @@ thirdparty_sources = [
     "src/lib/tvgShape.cpp",
     "src/lib/tvgSwCanvas.cpp",
     "src/lib/tvgTaskScheduler.cpp",
+    "src/loaders/external_png/tvgPngLoader.cpp",
+    "src/loaders/jpg/tvgJpgd.cpp",
+    "src/loaders/jpg/tvgJpgLoader.cpp",
     "src/loaders/raw/tvgRawLoader.cpp",
-    "src/loaders/svg/tvgXmlParser.cpp",
-    "src/loaders/svg/tvgSvgUtil.cpp",
-    "src/loaders/svg/tvgSvgSceneBuilder.cpp",
-    "src/loaders/svg/tvgSvgPath.cpp",
-    "src/loaders/svg/tvgSvgLoader.cpp",
     "src/loaders/svg/tvgSvgCssStyle.cpp",
+    "src/loaders/svg/tvgSvgLoader.cpp",
+    "src/loaders/svg/tvgSvgPath.cpp",
+    "src/loaders/svg/tvgSvgSceneBuilder.cpp",
+    "src/loaders/svg/tvgSvgUtil.cpp",
+    "src/loaders/svg/tvgXmlParser.cpp",
     "src/loaders/tvg/tvgTvgBinInterpreter.cpp",
     "src/loaders/tvg/tvgTvgLoader.cpp",
-    "src/loaders/jpg/tvgJpgLoader.cpp",
-    "src/loaders/jpg/tvgJpgd.cpp",
-    "src/loaders/external_png/tvgPngLoader.cpp",
-    "src/lib/sw_engine/tvgSwFill.cpp",
-    "src/lib/sw_engine/tvgSwImage.cpp",
-    "src/lib/sw_engine/tvgSwMath.cpp",
-    "src/lib/sw_engine/tvgSwMemPool.cpp",
-    "src/lib/sw_engine/tvgSwRaster.cpp",
-    "src/lib/sw_engine/tvgSwRenderer.cpp",
-    "src/lib/sw_engine/tvgSwRle.cpp",
-    "src/lib/sw_engine/tvgSwShape.cpp",
-    "src/lib/sw_engine/tvgSwStroke.cpp",
     "src/savers/tvg/tvgTvgSaver.cpp",
 ]
 
@@ -62,14 +63,18 @@ env_thirdparty.Prepend(
     CPPPATH=[
         thirdparty_dir + "src/lib",
         thirdparty_dir + "src/lib/sw_engine",
+        thirdparty_dir + "src/loaders/external_png",
+        thirdparty_dir + "src/loaders/jpg",
         thirdparty_dir + "src/loaders/raw",
         thirdparty_dir + "src/loaders/svg",
-        thirdparty_dir + "src/loaders/jpg",
-        thirdparty_dir + "src/loaders/png",
         thirdparty_dir + "src/loaders/tvg",
         thirdparty_dir + "src/savers/tvg",
     ]
 )
+# Also requires libpng headers
+if env["builtin_libpng"]:
+    env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"])
+
 env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 env.modules_sources += thirdparty_obj
 

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -656,7 +656,7 @@ instead of `miniz.h` as an external dependency.
 ## thorvg
 
 - Upstream: https://github.com/Samsung/thorvg
-- Version: 0.8.1 (c4ccb1078f4390ec749ab8e05ba7e9e35f81285f, 2022)
+- Version: 0.8.2 (496796f1e5e85bd5fbba36dae987edb1b3945592, 2022)
 - License: MIT
 
 Files extracted from upstream source:

diff --git a/thirdparty/thorvg/inc/config.h b/thirdparty/thorvg/inc/config.h
@@ -13,5 +13,5 @@
 
 #define THORVG_JPG_LOADER_SUPPORT 1
 
-#define THORVG_VERSION_STRING "0.8.1"
+#define THORVG_VERSION_STRING "0.8.2"
 #endif
diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwCommon.h b/thirdparty/thorvg/src/lib/sw_engine/tvgSwCommon.h
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2020 - 2022 Samsung Electronics Co., Ltd. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwFill.cpp b/thirdparty/thorvg/src/lib/sw_engine/tvgSwFill.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2020 - 2022 Samsung Electronics Co., Ltd. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwMath.cpp b/thirdparty/thorvg/src/lib/sw_engine/tvgSwMath.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2020 - 2022 Samsung Electronics Co., Ltd. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRaster.cpp b/thirdparty/thorvg/src/lib/sw_engine/tvgSwRaster.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2020 - 2022 Samsung Electronics Co., Ltd. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,8 +22,8 @@
 
 #ifdef _WIN32
     #include <malloc.h>
-#elif defined(__FreeBSD__)
-    #include <stdlib.h>
+#elif __FreeBSD__
+    #include<stdlib.h>
 #else
     #include <alloca.h>
 #endif

diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwStroke.cpp b/thirdparty/thorvg/src/lib/sw_engine/tvgSwStroke.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2020 - 2022 Samsung Electronics Co., Ltd. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp b/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp
diff --git a/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.h b/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.h