[osgearth] Fix undefined references due to openjp2 and xml2 (#17993)

* Fix osgearth * Fix linking * Update version files Co-authored-by: Ankur Verma <ankurv@microsoft.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
microsoft · Jun 9, 2021 · c21792b · c21792b
1 parent be56553
commit c21792b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ports/osgearth/fix-dependency-osg.patch b/ports/osgearth/fix-dependency-osg.patch
@@ -25,7 +25,7 @@ index b7dff11..d1ec2ff 100644
 +    if (UNIX)
 +        list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread)
 +        # Due to Linux Linker dependency issues these need to included again
-+        set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio)
++        set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio openjp2 xml2)
 +    else(UNIX)
 +        set(DEPEND_LIB_LIST cfitsio)
 +    endif()

diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "osgearth",
   "version": "3.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.",
   "homepage": "https://github.com/gwaldron/osgearth",
   "supports": "!(x86 | wasm32)",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4662,7 +4662,7 @@
     },
     "osgearth": {
       "baseline": "3.1",
-      "port-version": 3
+      "port-version": 4
     },
     "osi": {
       "baseline": "0.108.6",

diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d12ff3ef1419ab8813b430101fb6dbcc96861671",
+      "version": "3.1",
+      "port-version": 4
+    },
     {
       "git-tree": "d2483eb1bb083bdcf0b4de24f0f8c0d77825dc56",
       "version": "3.1",