[draco] Update to 1.4.1 (#20352)

* Update draco to 1.4.1

* Update CI baseline

* add vcpkg_fixup_pkgconfig function

* update version

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>

6 files changed, 19 insertions, 47 deletions

diff --git a/ports/draco/fix-build-error-in-gcc11.patch b/ports/draco/fix-build-error-in-gcc11.patch
deleted file mode 100644
index 94f24ff6d..000000000
--- a/ports/draco/fix-build-error-in-gcc11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/draco/core/hash_utils.h b/src/draco/core/hash_utils.h
-index dd910d0..aa61523 100644
---- a/src/draco/core/hash_utils.h
-+++ b/src/draco/core/hash_utils.h
-@@ -17,10 +17,9 @@
- 
- #include <stdint.h>
- 
-+#include <cstddef>
- #include <functional>
- 
--// TODO(fgalligan): Move this to core.
--
- namespace draco {
- 
- template <typename T1, typename T2>
-diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
-index 3c302b9..adca2ac 100644
---- a/src/draco/io/parser_utils.cc
-+++ b/src/draco/io/parser_utils.cc
-@@ -18,6 +18,7 @@
- #include <cctype>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- 
- namespace draco {
- namespace parser {
diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch
index b098fd715..63f672d81 100644
--- a/ports/draco/fix-compile-error-uwp.patch
+++ b/ports/draco/fix-compile-error-uwp.patch
@@ -2,7 +2,7 @@ diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
 index 6e42a58..3c302b9 100644
 --- a/src/draco/io/parser_utils.cc
 +++ b/src/draco/io/parser_utils.cc
-@@ -160,7 +160,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
+@@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
    if (!ParseUnsignedInt(buffer, &v)) {
      return false;
    }
@@ -17,14 +17,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 7e79da7..c4d9880 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -153,6 +153,10 @@ if(ENABLE_EXTRA_SPEED)
-   endif()
- endif()
+@@ -70,6 +70,10 @@ draco_set_build_definitions()
+ draco_set_cxx_flags()
+ draco_generate_features_h()
  
 +if (MSVC)
 +  add_compile_options(/wd4996)
 +endif()
 +
- # Generate a version file containing repository info.
- include(FindGit)
- find_package(Git)
+ # Draco source file listing variables.
+ list(APPEND draco_attributes_sources
+             "${draco_src_root}/attributes/attribute_octahedron_transform.cc"
diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake
index 2d2f7eee1..201f73cca 100644
--- a/ports/draco/portfile.cmake
+++ b/ports/draco/portfile.cmake
@@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/draco
-    REF 83b0922745981a35be16e2907bdbb749ebf2bf43 # 1.3.6
-    SHA512 29b270d749c5c0efcf791aaae7e33e2ae4404103ad8849d73aaca71492a3780d2fcaec01ec225da886bce2ab20ec14b8cf2d9e0976810cdaee557f97b3b0d9b8
+    REF 1.4.1
+    SHA512 55B8AF74552987220FB23580F6B167E4610A1341BC36117B6D235C05E126A79981F93787ACB90210127DC779B3134A1D9CC8D6697B1286459F233BF660B890BC
     HEAD_REF master
     PATCHES
         fix-compile-error-uwp.patch
         fix-uwperror.patch
-        fix-build-error-in-gcc11.patch # Remove this patch in next release 
 )
 
 vcpkg_configure_cmake(
@@ -19,8 +18,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/draco/cmake)
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake)
+vcpkg_fixup_pkgconfig()
 # Install tools and plugins
 file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe")
 if(TOOLS)
@@ -29,10 +28,7 @@ if(TOOLS)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/draco)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/draco)
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json
index 68a63f721..171493214 100644
--- a/ports/draco/vcpkg.json
+++ b/ports/draco/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "draco",
-  "version": "1.3.6",
-  "port-version": 2,
+  "version": "1.4.1",
   "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.",
   "homepage": "https://github.com/google/draco"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index a815078e4..38f12cf85 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1861,8 +1861,8 @@
       "port-version": 1
     },
     "draco": {
-      "baseline": "1.3.6",
-      "port-version": 2
+      "baseline": "1.4.1",
+      "port-version": 0
     },
     "drlibs": {
       "baseline": "2019-08-12",
diff --git a/versions/d-/draco.json b/versions/d-/draco.json
index 2367a5473..2ac33f2df 100644
--- a/versions/d-/draco.json
+++ b/versions/d-/draco.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3289b6aa2981d3fb169f35ca384608b514210401",
+      "version": "1.4.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "d306b49fab537cd9980ce5de0c994372a1300777",
       "version": "1.3.6",
       "port-version": 2