From f53d9799c3c5212486e57ea82c95dda33b6a0e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 27 Jan 2021 14:24:07 -0800
Subject: [vcpkg baseline][osgearth] Fix and add dependency tinyxml (#15900)

* [osgearth] Fix and add dependency tinyxml

* update version record
---
 ports/osgearth/fix-tinyxml.patch | 15 +++++++++++++++
 ports/osgearth/portfile.cmake    |  4 ++++
 ports/osgearth/vcpkg.json        |  5 +++--
 versions/baseline.json           |  2 +-
 versions/o-/osgearth.json        |  5 +++++
 5 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 ports/osgearth/fix-tinyxml.patch

diff --git a/ports/osgearth/fix-tinyxml.patch b/ports/osgearth/fix-tinyxml.patch
new file mode 100644
index 000000000..9f9a6d96f
--- /dev/null
+++ b/ports/osgearth/fix-tinyxml.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c78bd16..bf31091 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -193,7 +193,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
+ # TinyXML is an XML parsing library
+ SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
+ IF (WITH_EXTERNAL_TINYXML)
+-    find_package(TinyXML REQUIRED)
++    find_package(tinyxml CONFIG REQUIRED)
++    set(TINYXML_FOUND 1)
++    set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
+ ENDIF (WITH_EXTERNAL_TINYXML)
+ 
+ # postfix settings for various configs
diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake
index 57d42b523..816aa50e3 100644
--- a/ports/osgearth/portfile.cmake
+++ b/ports/osgearth/portfile.cmake
@@ -15,8 +15,12 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         make-all-find-packages-required.patch
+        fix-tinyxml.patch
 )
 
+# Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002
+file(REMOVE ${SOURCE_PATH}/src/osgEarth/tinyxml.h)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json
index 7d7a22015..aef74120b 100644
--- a/ports/osgearth/vcpkg.json
+++ b/ports/osgearth/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "osgearth",
   "version": "3.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.",
   "homepage": "https://github.com/gwaldron/osgearth",
   "supports": "!(x86 | wasm32) & !staticcrt",
@@ -20,6 +20,7 @@
       ]
     },
     "protobuf",
-    "sqlite3"
+    "sqlite3",
+    "tinyxml"
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 9ddbe7a29..f7f252c0a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4370,7 +4370,7 @@
     },
     "osgearth": {
       "baseline": "3.1",
-      "port-version": 1
+      "port-version": 2
     },
     "osi": {
       "baseline": "0.108.6",
diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json
index 13b6b3fec..674e0b0ab 100644
--- a/versions/o-/osgearth.json
+++ b/versions/o-/osgearth.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9355b8ad52fcf4998fe4c262f29a4e01fa83b9fa",
+      "version": "3.1",
+      "port-version": 2
+    },
     {
       "git-tree": "d194c647fcf69fe345c13ae7b6da3451e4bbddb6",
       "version": "3.1",
-- 
cgit v1.2.3