From c21792bd0439726822baff4070920eb53c0cf8e7 Mon Sep 17 00:00:00 2001 From: Ankur Verma <31362771+ankurverma85@users.noreply.github.com> Date: Wed, 9 Jun 2021 15:27:43 -0700 Subject: [osgearth] Fix undefined references due to openjp2 and xml2 (#17993) * Fix osgearth * Fix linking * Update version files Co-authored-by: Ankur Verma Co-authored-by: NancyLi1013 --- ports/osgearth/fix-dependency-osg.patch | 2 +- ports/osgearth/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/osgearth.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/osgearth/fix-dependency-osg.patch b/ports/osgearth/fix-dependency-osg.patch index b6d00a06f..18489b1c8 100644 --- 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 index 1a84d6aa8..c71392131 100644 --- 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 index c7b02cbb3..3e9ee5e47 100644 --- 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 index c074ed279..1857c201a 100644 --- 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", -- cgit v1.2.3