Skip to content

[osgearth] update to latest to fix build issue with latest geos #13385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Billy O'Neal (BillyONeal) merged 7 commits into from
Oct 2, 2020
Merged

[osgearth] update to latest to fix build issue with latest geos #13385

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac1e6be
[osg] Enable osg check on baseline
Sep 4, 2020
c1bbe50
Update portfile.cmake
ankurvdev Sep 6, 2020
0c6bc23
Updated sha
ankurvdev Sep 7, 2020
c9b533b
Updated port version
ankurvdev Sep 7, 2020
babef6d
Merge pull request #1 from JackBoosY/dev/jack/re-enable-osg-check
ankurvdev Sep 7, 2020
e16a6d5
Update portfile.cmake
ankurvdev Sep 16, 2020
abc3fe3
Update portfile.cmake
ankurvdev Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/osg/CONTROL
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 ef631e0933390ca33b727392392efea2400e60a6 #version 3.0
SHA512 df17c12ef0f9833c3a601aac7ffe8a6600a06d85865300a282aba6aacec6edd4d14ace86ae11b68c45dbbef3851436eff30b3fd7eee8696e8752cd22886c092b
HEAD_REF master
PATCHES
RocksDB.patch
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
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