diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/alembic | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/alembic')
| -rw-r--r-- | ports/alembic/CONTROL | 2 | ||||
| -rw-r--r-- | ports/alembic/fix-C1083.patch | 49 | ||||
| -rw-r--r-- | ports/alembic/portfile.cmake | 18 |
3 files changed, 56 insertions, 13 deletions
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 59a6580ba..f828892df 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,4 +1,4 @@ Source: alembic -Version: 1.7.10 +Version: 1.7.11 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/ diff --git a/ports/alembic/fix-C1083.patch b/ports/alembic/fix-C1083.patch new file mode 100644 index 000000000..15de9f514 --- /dev/null +++ b/ports/alembic/fix-C1083.patch @@ -0,0 +1,49 @@ +diff --git a/lib/Alembic/Abc/Foundation.h b/lib/Alembic/Abc/Foundation.h
+index 9760c49..fbab6a0 100644
+--- a/lib/Alembic/Abc/Foundation.h
++++ b/lib/Alembic/Abc/Foundation.h
+@@ -40,11 +40,11 @@
+ #include <Alembic/AbcCoreAbstract/All.h>
+ #include <Alembic/Util/All.h>
+
+-#include <ImathVec.h>
+-#include <ImathBox.h>
+-#include <ImathMatrix.h>
+-#include <ImathQuat.h>
+-#include <ImathColor.h>
++#include <OpenEXR/ImathVec.h>
++#include <OpenEXR/ImathBox.h>
++#include <OpenEXR/ImathMatrix.h>
++#include <OpenEXR/ImathQuat.h>
++#include <OpenEXR/ImathColor.h>
+
+ #include <iostream>
+ #include <string>
+diff --git a/lib/Alembic/AbcGeom/Foundation.h b/lib/Alembic/AbcGeom/Foundation.h
+index 301efc3..2bb0f6b 100644
+--- a/lib/Alembic/AbcGeom/Foundation.h
++++ b/lib/Alembic/AbcGeom/Foundation.h
+@@ -39,8 +39,8 @@
+
+ #include <Alembic/Abc/All.h>
+
+-#include <ImathMatrixAlgo.h>
+-#include <ImathEuler.h>
++#include <OpenEXR/ImathMatrixAlgo.h>
++#include <OpenEXR/ImathEuler.h>
+
+
+ namespace Alembic {
+diff --git a/lib/Alembic/Util/Foundation.h b/lib/Alembic/Util/Foundation.h
+index d7f40dd..a41bb97 100644
+--- a/lib/Alembic/Util/Foundation.h
++++ b/lib/Alembic/Util/Foundation.h
+@@ -63,7 +63,7 @@
+
+ #include <memory>
+
+-#include <half.h>
++#include <OpenEXR/half.h>
+
+ #include <iomanip>
+ #include <iostream>
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 1f01136b3..9e97ac89d 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -7,24 +7,18 @@ if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(STATUS "Alembic does not support static linkage. Building dynamically.") - set(VCPKG_LIBRARY_LINKAGE dynamic) -endif() +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic - REF 1.7.10 - SHA512 e98ffaedb98dbc5c53fe9703d3063bb118d32c83c47e3af04c8fc96237034b02fe0fc2c628ca82bdd0e0ef17d9375f4f48e0022ce33380b9ad91970539611ced + REF 1.7.11 + SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch - ${CMAKE_CURRENT_LIST_DIR}/bypass-findhdf5.patch + fix-hdf5link.patch + bypass-findhdf5.patch + fix-C1083.patch ) vcpkg_configure_cmake( |