From 6cec5c0dbf26ce11922ce18ab309d6109586d578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 21 May 2021 15:39:04 +0800 Subject: [draco] Fix build failure on gcc 11 (#18001) * [draco] Fix build failure on gcc 11 * update version record --- ports/draco/fix-build-error-in-gcc11.patch | 16 ++++++++++++++++ ports/draco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ports/draco/fix-build-error-in-gcc11.patch b/ports/draco/fix-build-error-in-gcc11.patch index d1e5536d7..94f24ff6d 100644 --- a/ports/draco/fix-build-error-in-gcc11.patch +++ b/ports/draco/fix-build-error-in-gcc11.patch @@ -1,3 +1,19 @@ +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 + ++#include + #include + +-// TODO(fgalligan): Move this to core. +- + namespace draco { + + template 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 diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 4a78edff6..68a63f721 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,7 +1,7 @@ { "name": "draco", "version": "1.3.6", - "port-version": 1, + "port-version": 2, "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 6c470abd3..6663a8ceb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1726,7 +1726,7 @@ }, "draco": { "baseline": "1.3.6", - "port-version": 1 + "port-version": 2 }, "drlibs": { "baseline": "2019-08-12", diff --git a/versions/d-/draco.json b/versions/d-/draco.json index 7bd67d302..2367a5473 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d306b49fab537cd9980ce5de0c994372a1300777", + "version": "1.3.6", + "port-version": 2 + }, { "git-tree": "c3690271c81d83c2016d5710acaa76a94d6d78b8", "version": "1.3.6", -- cgit v1.2.3