The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[assimp] Update the version to 5.0.0 (#8370)

Browse Source
This commit is contained in:
NancyLi1013 2019-09-27 11:17:08 -07:00 committed by Curtis J Bezault
parent 2f11e0732a
commit 39ae95f5a9
5 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/assimp/dont-overwrite-prefix-path.patch
View File

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d781d1f..0d64d50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,6 @@ if (WIN32)
endif()
IF(MSVC)
- set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
OPTION( ASSIMP_INSTALL_PDB
"Install MSVC debug files."
ON

13
ports/assimp/fix-static-build-error.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcafb64..6c3d03e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,7 @@ ELSEIF(MSVC)
IF(MSVC12)
ADD_COMPILE_OPTIONS(/wd4351)
ENDIF()
- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi")
+# SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi")
ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
IF(NOT HUNTER_ENABLED)
SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}")

7
ports/assimp/portfile.cmake
View File

@ -3,13 +3,12 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO assimp/assimp REPO assimp/assimp
REF v4.1.0 REF v5.0.0
SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
HEAD_REF master HEAD_REF master
PATCHES PATCHES
dont-overwrite-prefix-path.patch
uninitialized-variable.patch uninitialized-variable.patch
remove-useless-path.patch fix-static-build-error.patch
) )
file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)

12
ports/assimp/remove-useless-path.patch
View File

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a20cee..4fcb8dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,6 @@ if (WIN32)
endif()
IF(MSVC)
- SET (CMAKE_PREFIX_PATH "D:\\libs\\devil")
OPTION( ASSIMP_INSTALL_PDB
"Install MSVC debug files."
ON

16
ports/assimp/uninitialized-variable.patch
View File

@ -1,13 +1,13 @@
diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h
index 916fb1f..a7bc178 100644 index 2c27a94..8390dfd 100644
--- a/contrib/zip/src/miniz.h --- a/contrib/zip/src/miniz.h
+++ b/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 @@ -5944,7 +5944,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
#ifndef MINIZ_NO_STDIO const char *pSrc_filename, const void *pComment,
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_uint16 comment_size, mz_uint level_and_flags,
{ mz_uint32 ext_attributes) {
- mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes; - 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_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_uint16 method = 0, dos_time = 0, dos_date = 0;
mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0, comp_size = 0; time_t file_modified_time;
size_t archive_name_size; mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0,