3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[assimp] Update to 5.4.2 (#39708)

Browse Source 
Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
MonicaLiu 2024-07-08 07:18:04 -07:00 committed by GitHub
parent de0f76b12c
commit 97477828c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ports/assimp/build_fixes.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31c5e66..250d499 100644 index 718a251..21d253f 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -291,9 +291,9 @@ ELSEIF(MSVC) @@ -291,9 +291,9 @@ ELSEIF(MSVC)
@ -33,7 +33,7 @@ index 31c5e66..250d499 100644
set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in") set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in")
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::")
@@ -471,14 +471,14 @@ ENDIF() @@ -473,14 +473,14 @@ ENDIF()
# Search for external dependencies, and build them from source if not found # Search for external dependencies, and build them from source if not found
# Search for zlib # Search for zlib
@ -52,8 +52,8 @@ index 31c5e66..250d499 100644
+ set(ASSIMP_BUILD_MINIZIP OFF) + set(ASSIMP_BUILD_MINIZIP OFF)
ELSE() ELSE()
# If the zlib is already found outside, add an export in case assimpTargets can't find it. # If the zlib is already found outside, add an export in case assimpTargets can't find it.
IF( ZLIB_FOUND ) IF( ZLIB_FOUND AND ASSIMP_INSTALL)
@@ -523,12 +523,12 @@ ELSE() @@ -525,12 +525,12 @@ ELSE()
ENDIF() ENDIF()
IF( NOT IOS ) IF( NOT IOS )
@ -202,10 +202,10 @@ index d7f512c..94275f1 100644
#include <memory> #include <memory>
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 0a7be62..88550e3 100644 index f4c2936..979e688 100644
--- a/code/CMakeLists.txt --- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt +++ b/code/CMakeLists.txt
@@ -906,8 +906,8 @@ SET( Extra_SRCS @@ -922,8 +922,8 @@ SET( Extra_SRCS
SOURCE_GROUP( Extra FILES ${Extra_SRCS}) SOURCE_GROUP( Extra FILES ${Extra_SRCS})
# pugixml # pugixml
@ -216,7 +216,7 @@ index 0a7be62..88550e3 100644
find_package(pugixml CONFIG REQUIRED) find_package(pugixml CONFIG REQUIRED)
ELSE() ELSE()
SET( Pugixml_SRCS SET( Pugixml_SRCS
@@ -919,30 +919,30 @@ ELSE() @@ -935,30 +935,30 @@ ELSE()
ENDIF() ENDIF()
# utf8 # utf8
@ -256,7 +256,7 @@ index 0a7be62..88550e3 100644
SET( Poly2Tri_SRCS SET( Poly2Tri_SRCS
../contrib/poly2tri/poly2tri/common/shapes.cc ../contrib/poly2tri/poly2tri/common/shapes.cc
../contrib/poly2tri/poly2tri/common/shapes.h ../contrib/poly2tri/poly2tri/common/shapes.h
@@ -957,12 +957,12 @@ ENDIF() @@ -973,12 +973,12 @@ ENDIF()
../contrib/poly2tri/poly2tri/sweep/sweep_context.h ../contrib/poly2tri/poly2tri/sweep/sweep_context.h
) )
SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS})
@ -273,7 +273,7 @@ index 0a7be62..88550e3 100644
ELSE() ELSE()
SET( unzip_SRCS SET( unzip_SRCS
../contrib/unzip/crypt.h ../contrib/unzip/crypt.h
@@ -977,9 +977,9 @@ ENDIF() @@ -993,9 +993,9 @@ ENDIF()
# zip (https://github.com/kuba--/zip) # zip (https://github.com/kuba--/zip)
separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED})
IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST)
@ -286,7 +286,7 @@ index 0a7be62..88550e3 100644
ELSE() ELSE()
SET( ziplib_SRCS SET( ziplib_SRCS
../contrib/zip/src/miniz.h ../contrib/zip/src/miniz.h
@@ -999,7 +999,7 @@ IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) @@ -1015,7 +1015,7 @@ IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST)
ENDIF() ENDIF()
# openddlparser # openddlparser
@ -295,7 +295,7 @@ index 0a7be62..88550e3 100644
hunter_add_package(openddlparser) hunter_add_package(openddlparser)
find_package(openddlparser CONFIG REQUIRED) find_package(openddlparser CONFIG REQUIRED)
ELSE() ELSE()
@@ -1022,7 +1022,7 @@ ELSE() @@ -1038,7 +1038,7 @@ ELSE()
ENDIF() ENDIF()
# Open3DGC # Open3DGC
@ -304,7 +304,7 @@ index 0a7be62..88550e3 100644
# Nothing to do, not available in Hunter yet. # Nothing to do, not available in Hunter yet.
ELSE() ELSE()
SET ( open3dgc_SRCS SET ( open3dgc_SRCS
@@ -1057,6 +1057,7 @@ ELSE() @@ -1073,6 +1073,7 @@ ELSE()
../contrib/Open3DGC/o3dgcVector.inl ../contrib/Open3DGC/o3dgcVector.inl
) )
SOURCE_GROUP( Contrib\\open3dgc FILES ${open3dgc_SRCS}) SOURCE_GROUP( Contrib\\open3dgc FILES ${open3dgc_SRCS})
@ -312,7 +312,7 @@ index 0a7be62..88550e3 100644
ENDIF() ENDIF()
# Check dependencies for glTF importer with Open3DGC-compression. # Check dependencies for glTF importer with Open3DGC-compression.
@@ -1065,7 +1066,7 @@ ENDIF() @@ -1081,7 +1082,7 @@ ENDIF()
IF (NOT WIN32) IF (NOT WIN32)
FIND_PACKAGE(RT QUIET) FIND_PACKAGE(RT QUIET)
ENDIF () ENDIF ()
@ -321,7 +321,7 @@ index 0a7be62..88550e3 100644
SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 )
ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 ) ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 )
ELSE () ELSE ()
@@ -1075,9 +1076,10 @@ ELSE () @@ -1091,9 +1092,10 @@ ELSE ()
ENDIF () ENDIF ()
# RapidJSON # RapidJSON
@ -334,7 +334,7 @@ index 0a7be62..88550e3 100644
ELSE() ELSE()
INCLUDE_DIRECTORIES("../contrib/rapidjson/include") INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
@@ -1088,9 +1090,9 @@ ELSE() @@ -1104,9 +1106,9 @@ ELSE()
ENDIF() ENDIF()
# stb # stb
@ -347,7 +347,7 @@ index 0a7be62..88550e3 100644
ELSE() ELSE()
SET( stb_SRCS SET( stb_SRCS
../contrib/stb/stb_image.h ../contrib/stb/stb_image.h
@@ -1112,7 +1114,7 @@ IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI @@ -1128,7 +1130,7 @@ IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
endif () endif ()
@ -356,7 +356,7 @@ index 0a7be62..88550e3 100644
if (UNZIP_FOUND) if (UNZIP_FOUND)
SET (unzip_compile_SRCS "") SET (unzip_compile_SRCS "")
else () else ()
@@ -1164,7 +1166,7 @@ SET( assimp_src @@ -1180,7 +1182,7 @@ SET( assimp_src
) )
ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD )
@ -365,7 +365,7 @@ index 0a7be62..88550e3 100644
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${IRRXML_INCLUDE_DIR} ${IRRXML_INCLUDE_DIR}
../contrib/openddlparser/include ../contrib/openddlparser/include
@@ -1266,45 +1268,48 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC @@ -1282,45 +1284,48 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
$<INSTALL_INTERFACE:${ASSIMP_INCLUDE_INSTALL_DIR}> $<INSTALL_INTERFACE:${ASSIMP_INCLUDE_INSTALL_DIR}>
@ -403,8 +403,7 @@ index 0a7be62..88550e3 100644
endif() endif()
if (ASSIMP_BUILD_DRACO) if (ASSIMP_BUILD_DRACO)
- target_link_libraries(assimp PUBLIC ${draco_LIBRARIES}) target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
+ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
endif() endif()
ELSE() ELSE()
- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) - TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
@ -432,7 +431,7 @@ index 0a7be62..88550e3 100644
ENDIF () ENDIF ()
if( MSVC ) if( MSVC )
@@ -1345,13 +1350,13 @@ if (MINGW) @@ -1361,13 +1366,13 @@ if (MINGW)
ARCHIVE_OUTPUT_NAME assimp ARCHIVE_OUTPUT_NAME assimp
) )
if (NOT BUILD_SHARED_LIBS) if (NOT BUILD_SHARED_LIBS)
@ -448,7 +447,7 @@ index 0a7be62..88550e3 100644
endif() endif()
SET_TARGET_PROPERTIES( assimp PROPERTIES SET_TARGET_PROPERTIES( assimp PROPERTIES
@@ -1381,14 +1386,14 @@ ENDIF() @@ -1397,14 +1402,14 @@ ENDIF()
# Build against external unzip, or add ../contrib/unzip so # Build against external unzip, or add ../contrib/unzip so
# assimp can #include "unzip.h" # assimp can #include "unzip.h"
@ -466,7 +465,7 @@ index 0a7be62..88550e3 100644
endif() endif()
else () else ()
INCLUDE_DIRECTORIES("../") INCLUDE_DIRECTORIES("../")
@@ -1397,7 +1402,7 @@ ENDIF() @@ -1413,7 +1418,7 @@ ENDIF()
# Add RT-extension library for glTF importer with Open3DGC-compression. # Add RT-extension library for glTF importer with Open3DGC-compression.
IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
@ -474,7 +473,7 @@ index 0a7be62..88550e3 100644
+ TARGET_LINK_LIBRARIES(assimp PRIVATE rt) + TARGET_LINK_LIBRARIES(assimp PRIVATE rt)
ENDIF () ENDIF ()
IF(ASSIMP_INSTALL)
diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp
index 3a4c7c3..f247927 100644 index 3a4c7c3..f247927 100644
--- a/code/Common/BaseImporter.cpp --- a/code/Common/BaseImporter.cpp

2
ports/assimp/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO assimp/assimp REPO assimp/assimp
REF "v${VERSION}" REF "v${VERSION}"
SHA512 6b0e410160c9f60923283be5d948e60b3b8c7819a7e75c9e39608d72202c1c715c048bd615e33d14544394c63efa6ad01cd3eda4c997ebe5a8c6e15ae18d4715 SHA512 4bfcc3a1b5a0cf3f382560564cac67088e13c62500c3c77dcef03811e67debe72ff318f5ed145b204d5017b56cb4293f3fe14b4060ca193813cef42b12eebe9d
HEAD_REF master HEAD_REF master
PATCHES PATCHES
build_fixes.patch build_fixes.patch

3
ports/assimp/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "assimp", "name": "assimp",
"version": "5.4.0", "version": "5.4.2",
"port-version": 1,
"description": "The Open Asset import library", "description": "The Open Asset import library",
"homepage": "https://github.com/assimp/assimp", "homepage": "https://github.com/assimp/assimp",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

5
versions/a-/assimp.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "205e4ca24e9ba331c232e326707c7b84e78c0720",
"version": "5.4.2",
"port-version": 0
},
{ {
"git-tree": "f39bd3d7276cff6e379ad68b3b83e5992fa4d2b2", "git-tree": "f39bd3d7276cff6e379ad68b3b83e5992fa4d2b2",
"version": "5.4.0", "version": "5.4.0",

4
versions/baseline.json
View File

@ -277,8 +277,8 @@
"port-version": 1 "port-version": 1
}, },
"assimp": { "assimp": {
"baseline": "5.4.0", "baseline": "5.4.2",
"port-version": 1 "port-version": 0
}, },
"astr": { "astr": {
"baseline": "0.2.1", "baseline": "0.2.1",