From 5a10163c44526b5d42a67480ce7a692a36948761 Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Thu, 25 Mar 2021 13:28:42 -0700 Subject: [osgearth] Fix x64-windows-static-md (#15375) * osgearth:x64-windows-static-md fixes * Try to build for x64-windows-static-md * Fix builds * Indent and combine blocks * overwrite version * merge with master and update version * revert incorrect version changes * [osgearth] Improve portfile.cmake, add feature tools * update version record * disable fontconfig on windows * update version * [osgearth] Fix dependencies * [osgearth] Re-fix dependencies * [osgearth] Fix the sequence of linking osg * [osgearth] Fix dependency osg * update version record * Fix osgearth:x64-linux * x64-windows-static-md fixes * Fix x64-linux * Build fixes * Update x-add-version Co-authored-by: ankurv Co-authored-by: JackBoosY --- versions/baseline.json | 4 ++-- versions/o-/osg.json | 5 +++++ versions/o-/osgearth.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'versions') diff --git a/versions/baseline.json b/versions/baseline.json index 4411252b3..fee501f25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4494,7 +4494,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 6 + "port-version": 7 }, "osg-qt": { "baseline": "Qt4", @@ -4502,7 +4502,7 @@ }, "osgearth": { "baseline": "3.1", - "port-version": 2 + "port-version": 3 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 973c0de20..3a40b3ef9 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41c640888000654e84d2bf227b42973cc1ba15c9", + "version-string": "3.6.5", + "port-version": 7 + }, { "git-tree": "9b787269fae66af2447354c4e76ce0883c8d93b9", "version-string": "3.6.5", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 674e0b0ab..c074ed279 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2483eb1bb083bdcf0b4de24f0f8c0d77825dc56", + "version": "3.1", + "port-version": 3 + }, { "git-tree": "9355b8ad52fcf4998fe4c262f29a4e01fa83b9fa", "version": "3.1", -- cgit v1.2.3