Upgrade assimp to v4.1.0 (microsoft#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
bali2u · Dec 13, 2017 · 621d9af · 621d9af
1 parent d88563c
commit 621d9af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git 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
diff --git 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()