diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-libs/assimp/files | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'media-libs/assimp/files')
5 files changed, 397 insertions, 0 deletions
diff --git a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch new file mode 100644 index 000000000000..134edc7d7da1 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch @@ -0,0 +1,239 @@ +From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@fh-aachen.de> +Date: Tue, 31 Mar 2020 21:30:07 +0200 +Subject: [PATCH] use GNUInstallDirs where possible + +Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and +disable redefining FHS-mandated install locations via user-editable +ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary, +Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables. +--- + CMakeLists.txt | 36 ++++++++++++++++++++++------------ + assimp.pc.in | 6 ++---- + assimpTargets-debug.cmake.in | 20 +++++++++---------- + assimpTargets-release.cmake.in | 18 ++++++++--------- + assimpTargets.cmake.in | 15 +------------- + 5 files changed, 45 insertions(+), 50 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcafb649f5..c23c0df33e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M + SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) + SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") + +-IF( UNIX ) +- # Use GNUInstallDirs for Unix predefined directories +- INCLUDE(GNUInstallDirs) +-ENDIF( UNIX ) +- + # Grouped compiler settings + IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) + IF(NOT HUNTER_ENABLED) +@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" ) + ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) + +-# Cache these to allow the user to override them manually. +-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING +- "Path the built library files are installed to." ) +-SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING +- "Path the header files are installed to." ) +-SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING +- "Path the tool executables are installed to." ) +- + get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) + + IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug")) +@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED) + ) + ELSE(HUNTER_ENABLED) + # cmake configuration files ++ ++ IF( UNIX ) ++ # Use GNUInstallDirs for Unix predefined directories ++ INCLUDE(GNUInstallDirs) ++ ++ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) ++ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) ++ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) ++ ELSE( UNIX ) ++ # Cache these to allow the user to override them on non-Unix platforms ++ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING ++ "Path the built library files are installed to." ) ++ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING ++ "Path the header files are installed to." ) ++ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING ++ "Path the tool executables are installed to." ) ++ ++ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR}) ++ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}) ++ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR}) ++ ENDIF( UNIX ) ++ ++ + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) + IF (is_multi_config) +diff --git a/assimp.pc.in b/assimp.pc.in +index c659e19f2c..555a3a1d3b 100644 +--- a/assimp.pc.in ++++ b/assimp.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@/ +-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @CMAKE_PROJECT_NAME@ + Description: Import various well-known 3D model formats in an uniform manner. +diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in +index 1ebe2a6081..f5034c9349 100644 +--- a/assimpTargets-debug.cmake.in ++++ b/assimpTargets-debug.cmake.in +@@ -42,22 +42,22 @@ if(MSVC) + # Import target "assimp::assimp" for configuration "Debug" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}" +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ++ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") + + # Import target "assimp::assimp" for configuration "Debug" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") + endif() + + else() +@@ -66,17 +66,17 @@ else() + set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") + set_target_properties(assimp::assimp PROPERTIES + IMPORTED_SONAME_DEBUG "${sharedLibraryName}" +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) + endif() + endif() + +diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in +index f3db8f12cd..a416e8899b 100644 +--- a/assimpTargets-release.cmake.in ++++ b/assimpTargets-release.cmake.in +@@ -42,12 +42,12 @@ if(MSVC) + # Import target "assimp::assimp" for configuration "Release" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}" +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ++ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") + +@@ -57,7 +57,7 @@ if(MSVC) + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") + endif() + + else() +@@ -70,17 +70,17 @@ else() + endif() + set_target_properties(assimp::assimp PROPERTIES + IMPORTED_SONAME_RELEASE "${sharedLibraryName}" +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) + endif() + endif() + +diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in +index ab1a8d2c7b..ef90c834a6 100644 +--- a/assimpTargets.cmake.in ++++ b/assimpTargets.cmake.in +@@ -40,16 +40,6 @@ unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + +- +-# Compute the installation prefix relative to this file. +-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-if(_IMPORT_PREFIX STREQUAL "/") +- set(_IMPORT_PREFIX "") +-endif() +- + # Create imported target assimp::assimp + if(@BUILD_SHARED_LIBS@) + add_library(assimp::assimp SHARED IMPORTED) +@@ -60,7 +50,7 @@ endif() + set_target_properties(assimp::assimp PROPERTIES + COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION" + INTERFACE_assimp_MAJOR_VERSION "1" +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" ++ INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@" + #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine" + ) + +@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES}) + include(${f}) + endforeach() + +-# Cleanup temporary variables. +-set(_IMPORT_PREFIX) +- + # Loop over all imported files and verify that they actually exist + foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch new file mode 100644 index 000000000000..b0db38a0e8a1 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch @@ -0,0 +1,76 @@ +From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001 +From: RichardTea <31507749+RichardTea@users.noreply.github.com> +Date: Fri, 11 Oct 2019 16:28:14 +0100 +Subject: [PATCH] Update assimp legal and version + +Will now report the major and minor versions specified in cmakelists +--- + code/Common/Version.cpp | 14 +++++--------- + test/unit/utVersion.cpp | 2 +- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp +index 868cfb06af..cf1da7d5ba 100644 +--- a/code/Common/Version.cpp ++++ b/code/Common/Version.cpp +@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <assimp/scene.h> + #include "ScenePrivate.h" + +-static const unsigned int MajorVersion = 5; +-static const unsigned int MinorVersion = 0; ++#include "revision.h" + + // -------------------------------------------------------------------------------- + // Legal information string - don't remove this. +@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION = + "Open Asset Import Library (Assimp).\n" + "A free C/C++ library to import various 3D file formats into applications\n\n" + +-"(c) 2008-2020, assimp team\n" ++"(c) 2006-2020, assimp team\n" + "License under the terms and conditions of the 3-clause BSD license\n" +-"https://github.com/assimp/assimp\n" ++"http://assimp.org\n" + ; + + // ------------------------------------------------------------------------------------------------ +@@ -70,13 +69,13 @@ ASSIMP_API const char* aiGetLegalString () { + // ------------------------------------------------------------------------------------------------ + // Get Assimp minor version + ASSIMP_API unsigned int aiGetVersionMinor () { +- return MinorVersion; ++ return VER_MINOR; + } + + // ------------------------------------------------------------------------------------------------ + // Get Assimp major version + ASSIMP_API unsigned int aiGetVersionMajor () { +- return MajorVersion; ++ return VER_MAJOR; + } + + // ------------------------------------------------------------------------------------------------ +@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags () { + return flags; + } + +-// include current build revision, which is even updated from time to time -- :-) +-#include "revision.h" +- + // ------------------------------------------------------------------------------------------------ + ASSIMP_API unsigned int aiGetVersionRevision() { + return GitVersion; +diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp +index 233b2fb0b2..66e832baae 100644 +--- a/test/unit/utVersion.cpp ++++ b/test/unit/utVersion.cpp +@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { + EXPECT_NE( lv, nullptr ); + std::string text( lv ); + +- size_t pos( text.find( std::string( "2017" ) ) ); ++ size_t pos( text.find( std::string( "2019" ) ) ); + EXPECT_NE( pos, std::string::npos ); + } + diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch new file mode 100644 index 000000000000..1b1efa027427 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch @@ -0,0 +1,37 @@ +From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001 +From: Kim Kulling <kimkulling@users.noreply.github.com> +Date: Sun, 6 Oct 2019 20:19:59 +0200 +Subject: [PATCH] Update utVersion.cpp + +Fix the unittests as well. +--- + test/unit/utVersion.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp +index 5cfc91ccdd..233b2fb0b2 100644 +--- a/test/unit/utVersion.cpp ++++ b/test/unit/utVersion.cpp +@@ -4,8 +4,6 @@ Open Asset Import Library (assimp) + + Copyright (c) 2006-2019, assimp team + +- +- + All rights reserved. + + Redistribution and use of this software in source and binary forms, +@@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) { + } + + TEST_F( utVersion, aiGetVersionMinorTest ) { +- EXPECT_EQ( aiGetVersionMinor(), 1U ); ++ EXPECT_EQ( aiGetVersionMinor(), 0U ); + } + + TEST_F( utVersion, aiGetVersionMajorTest ) { +- EXPECT_EQ( aiGetVersionMajor(), 4U ); ++ EXPECT_EQ( aiGetVersionMajor(), 5U ); + } + + TEST_F( utVersion, aiGetCompileFlagsTest ) { diff --git a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch new file mode 100644 index 000000000000..ed82e1b0b4b0 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch @@ -0,0 +1,22 @@ +From 13a2f22835cfe4093860de3e3d33782f854a2e58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc?= <loic.fricoteaux@airbus.com> +Date: Tue, 14 Jan 2020 16:26:24 +0100 +Subject: [PATCH] Fix Assimp patch version to match the last bug fix release + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23b6f6d618..e14c4aa21f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) + add_definitions(-DASSIMP_USE_HUNTER) + ENDIF(HUNTER_ENABLED) + +-PROJECT( Assimp VERSION 5.0.0 ) ++PROJECT( Assimp VERSION 5.0.1 ) + + # All supported options ############################################### + diff --git a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch new file mode 100644 index 000000000000..8267fc004d61 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch @@ -0,0 +1,23 @@ +From 9aea72f70e3f10f7db903c24a2c19a7fd769e3b8 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Lortie <marc-antoine.lortie@outlook.com> +Date: Mon, 20 Jan 2020 09:14:04 -0500 +Subject: [PATCH] Changed date in test aiGetLegalStringTest to the appropriate + year. + +--- + test/unit/utVersion.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp +index ca54620533..aa75a26d85 100644 +--- a/test/unit/utVersion.cpp ++++ b/test/unit/utVersion.cpp +@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { + EXPECT_NE( lv, nullptr ); + std::string text( lv ); + +- size_t pos( text.find( std::string( "2019" ) ) ); ++ size_t pos( text.find( std::string( "2020" ) ) ); + EXPECT_NE( pos, std::string::npos ); + } + |