resolve merge conflicts

4 files changed, 18 insertions, 20 deletions

diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
index f6e6eaaff..a2cb8e780 100644
--- a/ports/assimp/CONTROL
+++ b/ports/assimp/CONTROL
@@ -1,4 +1,4 @@
 Source: assimp
-Version: 4.0.1-3
+Version: 4.1.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
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..6d4a7ec1d 100644
--- a/ports/assimp/portfile.cmake
+++ b/ports/assimp/portfile.cmake
@@ -3,16 +3,16 @@ 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"
+        "${CMAKE_CURRENT_LIST_DIR}/uninitialized-variable.patch"
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)
@@ -30,7 +30,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()
 
diff --git a/ports/assimp/uninitialized-variable.patch b/ports/assimp/uninitialized-variable.patch
new file mode 100644
index 000000000..f7b51c143
--- /dev/null
+++ b/ports/assimp/uninitialized-variable.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h
+index 916fb1f..a7bc178 100644
+--- a/contrib/zip/src/miniz.h
++++ b/contrib/zip/src/miniz.h
+@@ -4420,7 +4420,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
+ #ifndef MINIZ_NO_STDIO
+ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
+ {
+-  mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
++  mz_uint uncomp_crc32 = MZ_CRC32_INIT, level = 0, num_alignment_padding_bytes;
+   mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
+   mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0, comp_size = 0;
+   size_t archive_name_size;