From ac1e6bec46fbe4ddfa0bfe808af66342efe87cca Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 3 Sep 2020 22:53:29 -0700 Subject: [PATCH 1/6] [osg] Enable osg check on baseline --- ports/osg/CONTROL | 1 + scripts/ci.baseline.txt | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 6a7d856da9c853..95e83968866da1 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/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index edae436084e069..ac5897c611c114 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1288,8 +1288,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 From c1bbe50b2e3d25a1b93be4a46aab499cb196f65b Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Sun, 6 Sep 2020 12:44:10 -0700 Subject: [PATCH 2/6] Update portfile.cmake --- ports/osgearth/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 3be639cb46b314..3fcd8d7c942fbc 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -10,7 +10,7 @@ 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 + REF ef631e0933390ca33b727392392efea2400e60a6 #version 3.0 SHA512 d1d59ae65cb4ef8a71e01b42411029e61bef20e2fd6d95b81c091d7d32b8c30f96d3156d7fd28e177ca83fd74ed113b9e31bf5ef360757524beb7cec7ced4996 HEAD_REF master PATCHES From 0c6bc2364a7ef9c11c27ba116dc345b6a68e85ac Mon Sep 17 00:00:00 2001 From: Ankur Verma Date: Sun, 6 Sep 2020 23:43:18 -0700 Subject: [PATCH 3/6] Updated sha --- ports/osgearth/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 3fcd8d7c942fbc..f385126ce92003 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth REF ef631e0933390ca33b727392392efea2400e60a6 #version 3.0 - SHA512 d1d59ae65cb4ef8a71e01b42411029e61bef20e2fd6d95b81c091d7d32b8c30f96d3156d7fd28e177ca83fd74ed113b9e31bf5ef360757524beb7cec7ced4996 + SHA512 df17c12ef0f9833c3a601aac7ffe8a6600a06d85865300a282aba6aacec6edd4d14ace86ae11b68c45dbbef3851436eff30b3fd7eee8696e8752cd22886c092b HEAD_REF master PATCHES RocksDB.patch From c9b533b460e06414a6480a43f417b1375cdbb720 Mon Sep 17 00:00:00 2001 From: Ankur Verma Date: Sun, 6 Sep 2020 23:45:14 -0700 Subject: [PATCH 4/6] Updated port version --- ports/osgearth/CONTROL | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index 3585c467e3f041..781ae1bd45c0ef 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] From e16a6d506fe5bcd141b36016d81bc74475b722d4 Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Wed, 16 Sep 2020 11:37:18 -0700 Subject: [PATCH 5/6] Update portfile.cmake --- ports/osgearth/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index f385126ce92003..fb324de5367cce 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -10,7 +10,7 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF ef631e0933390ca33b727392392efea2400e60a6 #version 3.0 + REF dc73ac92b19fff1427414cfb981b6018c0ed88a1 #version 3.0 SHA512 df17c12ef0f9833c3a601aac7ffe8a6600a06d85865300a282aba6aacec6edd4d14ace86ae11b68c45dbbef3851436eff30b3fd7eee8696e8752cd22886c092b HEAD_REF master PATCHES From abc3fe3dbc114695af8f4b292550e3f3fa129715 Mon Sep 17 00:00:00 2001 From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> Date: Wed, 16 Sep 2020 12:07:33 -0700 Subject: [PATCH 6/6] Update portfile.cmake --- ports/osgearth/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index fb324de5367cce..5dc2109122bd88 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth REF dc73ac92b19fff1427414cfb981b6018c0ed88a1 #version 3.0 - SHA512 df17c12ef0f9833c3a601aac7ffe8a6600a06d85865300a282aba6aacec6edd4d14ace86ae11b68c45dbbef3851436eff30b3fd7eee8696e8752cd22886c092b + SHA512 86c287a75946b902c05897d3952c9ff201853599d52023c7b2c850f2253b7e738c4b54ac7ae947bf0909b3aaf074bdb1472f4e92c59cd919458933a72fd13b80 HEAD_REF master PATCHES RocksDB.patch