diff options
| author | Jiri Appl <jiria@microsoft.com> | 2018-10-25 11:47:58 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 11:47:58 -0700 |
| commit | 3d2b540173ff5ce8debf8c9802aca4cfadd3efe1 (patch) | |
| tree | 0ff88a116d3533e89b016a78e025ff0bd0d2ca96 /ports/osgearth | |
| parent | 97e9d96715c6d1ad3501b47c02f76f92c1221a99 (diff) | |
| download | vcpkg-3d2b540173ff5ce8debf8c9802aca4cfadd3efe1.tar.gz vcpkg-3d2b540173ff5ce8debf8c9802aca4cfadd3efe1.zip | |
Enable Windows ARM32 build of OpenSSL LTS (#4525)
* Enable Windows ARM32 build of OpenSSL
* [openssl-windows] Bump control version
* [vtk] Fix hardcoded install paths
* [osgearth] Backport VS2017u8 fix
Diffstat (limited to 'ports/osgearth')
| -rw-r--r-- | ports/osgearth/CONTROL | 2 | ||||
| -rw-r--r-- | ports/osgearth/portfile.cmake | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index c409a35a9..5a8255a2a 100644 --- a/ports/osgearth/CONTROL +++ b/ports/osgearth/CONTROL @@ -1,4 +1,4 @@ Source: osgearth -Version: 2.9-1 +Version: 2.9-2 Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping. Build-Depends: osg diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 3c6a55a26..77320a2e1 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -16,12 +16,20 @@ if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1) endif() string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OSG_PLUGINS_SUBDIR}") +vcpkg_download_distfile( + VS2017PATCH + URLS "https://github.com/remoe/osgearth/commit/f7081cc4f9991c955c6a0ef7b7b50e48360d14fd.diff" + FILENAME "osgearth-f7081cc4f9991c955c6a0ef7b7b50e48360d14fd.patch" + SHA512 eadb47a5713c00c05add8627e5cad22844db041da34081d59104151a1a1e2d5ac9552909d67171bfc0449a3e4d2930dd3a7914d3ec7ef7ff1015574e9c9a6105 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth REF d1884d819d4a43de32b7ca1ded655c73964bed17 SHA512 525ad4ce8bcbd7d73a2ed66e7fbcd9d302582276f26dda1ef2baa3828da5c1e302ba81aac95d0a0632c7395cbcd072d2b19d084ba641c1ba92872d42bb6f769c HEAD_REF master + PATCHES ${VS2017PATCH} ) vcpkg_configure_cmake( |