Skip to content

Commit

Permalink
[osgearth] update to latest to fix build issue with latest geos (#13385)
Browse files Browse the repository at this point in the history
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
  • Loading branch information
ankurvdev and JackBoosY committed Oct 2, 2020
1 parent cabe5d0 commit acd2f59
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions ports/osg/CONTROL
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 1 addition & 0 deletions ports/osgearth/CONTROL
Original file line number Diff line number Diff line change
@@ -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]
4 changes: 2 additions & 2 deletions ports/osgearth/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit acd2f59

Please sign in to comment.