aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorankurverma85 <31362771+ankurverma85@users.noreply.github.com>2020-10-01 21:32:32 -0700
committerGitHub <noreply@github.com>2020-10-01 21:32:32 -0700
commitacd2f59e931172f46706ef8ac2fc9b21f71fba85 (patch)
tree29a781277d710ae1c437186d2a9964f189aca52a
parentcabe5d0b7b0f2741bad9cb2926f89e37a9ecf2b4 (diff)
downloadvcpkg-acd2f59e931172f46706ef8ac2fc9b21f71fba85.tar.gz
vcpkg-acd2f59e931172f46706ef8ac2fc9b21f71fba85.zip
[osgearth] update to latest to fix build issue with latest geos (#13385)
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
-rw-r--r--ports/osg/CONTROL1
-rw-r--r--ports/osgearth/CONTROL1
-rw-r--r--ports/osgearth/portfile.cmake4
-rw-r--r--scripts/ci.baseline.txt2
4 files changed, 4 insertions, 4 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
index 6a7d856da..95e839688 100644
--- a/ports/osg/CONTROL
+++ b/ports/osg/CONTROL
@@ -1,5 +1,6 @@
Source: osg
Version: 3.6.5
+Port-Version: 1
Homepage: https://github.com/openscenegraph/OpenSceneGraph
Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit.
Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx)
diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL
index 3585c467e..781ae1bd4 100644
--- a/ports/osgearth/CONTROL
+++ b/ports/osgearth/CONTROL
@@ -1,5 +1,6 @@
Source: osgearth
Version: 3.0
+Port-Version: 1
Homepage: https://github.com/gwaldron/osgearth
Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.
Build-Depends: osg[plugins]
diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake
index 3be639cb4..5dc210912 100644
--- a/ports/osgearth/portfile.cmake
+++ b/ports/osgearth/portfile.cmake
@@ -10,8 +10,8 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OS
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gwaldron/osgearth
- REF 90ad04f281cbc87ffc45bed847ebaaecb188e593 #version 3.0
- SHA512 d1d59ae65cb4ef8a71e01b42411029e61bef20e2fd6d95b81c091d7d32b8c30f96d3156d7fd28e177ca83fd74ed113b9e31bf5ef360757524beb7cec7ced4996
+ REF dc73ac92b19fff1427414cfb981b6018c0ed88a1 #version 3.0
+ SHA512 86c287a75946b902c05897d3952c9ff201853599d52023c7b2c850f2253b7e738c4b54ac7ae947bf0909b3aaf074bdb1472f4e92c59cd919458933a72fd13b80
HEAD_REF master
PATCHES
RocksDB.patch
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e98a277ee..230b9b392 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1276,8 +1276,6 @@ opusfile:arm-uwp=fail
opusfile:x64-uwp=fail
orocos-kdl:arm-uwp=fail
orocos-kdl:x64-uwp=fail
-osg:x86-windows=skip
-osg:x64-windows=skip
osgearth:x64-osx=fail
osgearth:x64-linux=fail
osgearth:x64-windows-static=fail