diff options
| author | Mark Garcia <markwynngarcia@outlook.com> | 2017-12-13 19:38:33 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-12-13 03:38:33 -0800 |
| commit | 621d9afe7b8225ce3607b599413dd60cc93c94e9 (patch) | |
| tree | 9bca4921e225658b3f09301c5bf3cfd0685a1c14 | |
| parent | d88563cd095b9aaad81d57f1c0a254d7e17cf859 (diff) | |
| download | vcpkg-621d9afe7b8225ce3607b599413dd60cc93c94e9.tar.gz vcpkg-621d9afe7b8225ce3607b599413dd60cc93c94e9.zip | |
Upgrade assimp to v4.1.0 (#2364)
* [assimp] Update to v4.1.0 and remove code patch which is fixed in new version
* [assimp] Fix vcpkg_fixup_cmake_targets argument
* [assimp] Fix formatting
| -rw-r--r-- | ports/assimp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/assimp/const-compare-worditerator.patch | 15 | ||||
| -rw-r--r-- | ports/assimp/portfile.cmake | 7 |
3 files changed, 4 insertions, 20 deletions
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index f6e6eaaff..b63cca6ed 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,4 +1,4 @@ Source: assimp -Version: 4.0.1-3 +Version: 4.1.0 Description: The Open Asset import library Build-Depends: zlib diff --git a/ports/assimp/const-compare-worditerator.patch b/ports/assimp/const-compare-worditerator.patch deleted file mode 100644 index 9b892ed82..000000000 --- a/ports/assimp/const-compare-worditerator.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/code/X3DImporter.cpp b/code/X3DImporter.cpp -index 1117735..669f46f 100644 ---- a/code/X3DImporter.cpp -+++ b/code/X3DImporter.cpp -@@ -95,8 +95,8 @@ struct WordIterator: public std::iterator<std::input_iterator_tag, const char*> - end_ = other.end_; - return *this; - } -- bool operator==(WordIterator &other) const { return start_ == other.start_; } -- bool operator!=(WordIterator &other) const { return start_ != other.start_; } -+ bool operator==(const WordIterator &other) const { return start_ == other.start_; } -+ bool operator!=(const WordIterator &other) const { return start_ != other.start_; } - WordIterator &operator++() { - start_ += strcspn(start_, whitespace); - start_ += strspn(start_, whitespace); diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 583738e16..618ce160f 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -3,15 +3,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF v4.0.1 - SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb + REF v4.1.0 + SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a HEAD_REF master ) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch" "${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch" ) @@ -30,7 +29,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.0") +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.1") vcpkg_copy_pdbs() |