diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-24 02:55:25 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-24 02:55:25 -0700 |
| commit | a3e607c8f1b759fee75ef5dd7b420ef7df48da1a (patch) | |
| tree | fd5b9080c973896ddb7174aeebb666e1c09d0204 | |
| parent | bed70f54bc2dd7181a54bbbb94d2fe3a1a0b35cc (diff) | |
| download | vcpkg-a3e607c8f1b759fee75ef5dd7b420ef7df48da1a.tar.gz vcpkg-a3e607c8f1b759fee75ef5dd7b420ef7df48da1a.zip | |
[assimp] Fix non-const-accepting WordIterator::operator!=
| -rw-r--r-- | ports/assimp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/assimp/const-compare-worditerator.patch | 15 | ||||
| -rw-r--r-- | ports/assimp/portfile.cmake | 5 |
3 files changed, 21 insertions, 1 deletions
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index 2e2b88692..9e036df33 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,4 +1,4 @@ Source: assimp -Version: 4.0.0 +Version: 4.0.0-1 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 new file mode 100644 index 000000000..9b892ed82 --- /dev/null +++ b/ports/assimp/const-compare-worditerator.patch @@ -0,0 +1,15 @@ +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 0da9cc2a8..14564e65a 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -8,6 +8,11 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DASSIMP_BUILD_TESTS=False |