From 11a96a3abb868270dda71e4937832ad78ef9adbc Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Wed, 12 May 2021 04:57:05 +0800
Subject: [draco] Fix build error in gcc 11 (#17736)

* [draco] Fix build error in gcc 11

* Update version files

* Format manifest

* Re update versions/d-/draco.json
---
 ports/draco/CONTROL                        |  4 ----
 ports/draco/fix-build-error-in-gcc11.patch | 12 ++++++++++++
 ports/draco/portfile.cmake                 |  3 ++-
 ports/draco/vcpkg.json                     |  7 +++++++
 versions/baseline.json                     |  2 +-
 versions/d-/draco.json                     |  5 +++++
 6 files changed, 27 insertions(+), 6 deletions(-)
 delete mode 100644 ports/draco/CONTROL
 create mode 100644 ports/draco/fix-build-error-in-gcc11.patch
 create mode 100644 ports/draco/vcpkg.json

diff --git a/ports/draco/CONTROL b/ports/draco/CONTROL
deleted file mode 100644
index 4bfe82e85..000000000
--- a/ports/draco/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: draco
-Version: 1.3.6
-Homepage: https://github.com/google/draco
-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.
diff --git a/ports/draco/fix-build-error-in-gcc11.patch b/ports/draco/fix-build-error-in-gcc11.patch
new file mode 100644
index 000000000..d1e5536d7
--- /dev/null
+++ b/ports/draco/fix-build-error-in-gcc11.patch
@@ -0,0 +1,12 @@
+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/portfile.cmake b/ports/draco/portfile.cmake
index ae72d0041..2d2f7eee1 100644
--- a/ports/draco/portfile.cmake
+++ b/ports/draco/portfile.cmake
@@ -8,7 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-compile-error-uwp.patch
-		fix-uwperror.patch
+        fix-uwperror.patch
+        fix-build-error-in-gcc11.patch # Remove this patch in next release 
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json
new file mode 100644
index 000000000..4a78edff6
--- /dev/null
+++ b/ports/draco/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "draco",
+  "version": "1.3.6",
+  "port-version": 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 e98d58e8d..5a0426fed 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1714,7 +1714,7 @@
     },
     "draco": {
       "baseline": "1.3.6",
-      "port-version": 0
+      "port-version": 1
     },
     "drlibs": {
       "baseline": "2019-08-12",
diff --git a/versions/d-/draco.json b/versions/d-/draco.json
index 4486003a3..7bd67d302 100644
--- a/versions/d-/draco.json
+++ b/versions/d-/draco.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3690271c81d83c2016d5710acaa76a94d6d78b8",
+      "version": "1.3.6",
+      "port-version": 1
+    },
     {
       "git-tree": "14563e699abc99cebdcd2b4e54b76e91c05d96be",
       "version-string": "1.3.6",
-- 
cgit v1.2.3