diff options
| author | David Ludwig <dludwig@pobox.com> | 2018-09-04 19:20:46 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-09-04 16:20:46 -0700 |
| commit | d68cc287f994bc6505473a8264018f5abf5a5183 (patch) | |
| tree | a7407df945add857ef2a568c473a9ab06f45e235 /ports/openmesh | |
| parent | 6af7c99555a03235994bc6dfe495ad07369088c6 (diff) | |
| download | vcpkg-d68cc287f994bc6505473a8264018f5abf5a5183.tar.gz vcpkg-d68cc287f994bc6505473a8264018f5abf5a5183.zip | |
[GraphicsMagick] bug-fix: image files won't load (#4215)
* [GraphicsMagick] bug-fix: image files won't load
GM (GraphicsMagick) was failing to load image files, notably PNG or JPEG
images, as it was being compiled with support for 'GraphicsMagick
Modules'. These are files with names specific to GM, and of the format,
'IM_*.dll'. vcpkg's install process was not setting these up. This
patch makes sure that when GM is built, it embed's GM's own
image-loading code into graphicsmagick.dll.
* [vcpkg_extract_source_archive_ex] Add PATCHES argument
* [openmesh] Use direct download instead of gitlab
* [blaze] Use PATCHES argument
* [graphicsmagick] Use vcpkg_extract_source_archive_ex
Diffstat (limited to 'ports/openmesh')
| -rw-r--r-- | ports/openmesh/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openmesh/portfile.cmake | 30 |
2 files changed, 13 insertions, 19 deletions
diff --git a/ports/openmesh/CONTROL b/ports/openmesh/CONTROL index b803484eb..cf502b2a2 100644 --- a/ports/openmesh/CONTROL +++ b/ports/openmesh/CONTROL @@ -1,3 +1,3 @@ Source: openmesh
-Version: 6.3
+Version: 7.0
Description: A generic and efficient polygon mesh data structure
diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake index 26c167adb..7bfacfe0e 100644 --- a/ports/openmesh/portfile.cmake +++ b/ports/openmesh/portfile.cmake @@ -1,24 +1,18 @@ -# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
include(vcpkg_common_functions)
-vcpkg_from_gitlab(
+set(VERSION 7.0)
+
+# Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz"
+ FILENAME "OpenMesh-${VERSION}.tar.gz"
+ SHA512 29280c8fe7208d39bd923c4d0444a24463e36b95402e6a75f42adc27bc1b261df9113442f69e1001dc1a8b1198488069ffb049742dcf6eac6ac1ecf4f216fad8
+)
+
+vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
- GITLAB_URL "https://graphics.rwth-aachen.de:9000"
- REPO "OpenMesh/OpenMesh"
- REF "OpenMesh-7.0"
- HEAD_REF "master"
- SHA512 "70e414088c094199af31a8694fb91fa5f9b574b3cc86b30b3fb64d938e6a218f9f38d857c559f958276b01ec9263ef71cd4039444e50a8cb38e820243aac7956"
+ ARCHIVE "${ARCHIVE}"
+ REF "${VERSION}"
)
vcpkg_configure_cmake(
|