From e55a067461e3d23e571765d76eab93d018dacb58c49df4144cf93c8e052baab5 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 14 Nov 2021 22:03:05 +0000 Subject: [PATCH] Accepting request 931268 from home:cgiboudeaux:branches:games - Update to 5.1.0 * Check https://github.com/assimp/assimp/releases/tag/v5.1.0 for the full list of changes - Drop do-not-install-irrXML.patch. No longer needed. - Drop obsolete patches: * 0001-Fix-build-with-GCC-11.patch * 0001-use-GNUInstallDirs-where-possible.patch OBS-URL: https://build.opensuse.org/request/show/931268 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=22 --- 0001-Fix-build-with-GCC-11.patch | 69 ------ 0001-use-GNUInstallDirs-where-possible.patch | 242 ------------------- _service | 4 +- assimp-5.0.1.tar.xz | 3 - assimp-5.1.0.tar.xz | 3 + assimp.changes | 11 + assimp.spec | 7 +- do-not-install-irrXML.patch | 19 -- 8 files changed, 17 insertions(+), 341 deletions(-) delete mode 100644 0001-Fix-build-with-GCC-11.patch delete mode 100644 0001-use-GNUInstallDirs-where-possible.patch delete mode 100644 assimp-5.0.1.tar.xz create mode 100644 assimp-5.1.0.tar.xz delete mode 100644 do-not-install-irrXML.patch diff --git a/0001-Fix-build-with-GCC-11.patch b/0001-Fix-build-with-GCC-11.patch deleted file mode 100644 index c5b9475..0000000 --- a/0001-Fix-build-with-GCC-11.patch +++ /dev/null @@ -1,69 +0,0 @@ -From afc79a00f8377cd376480a1d245d4d570ea6f426 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Mon, 8 Feb 2021 11:43:34 +0100 -Subject: [PATCH] Fix build with GCC 11. - -Based on upstream change 1afc4c045e. ---- - code/AMF/AMFImporter_Postprocess.cpp | 4 ++-- - code/Common/Importer.cpp | 1 + - code/Common/Importer.h | 1 + - include/assimp/Importer.hpp | 2 ++ - 4 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/code/AMF/AMFImporter_Postprocess.cpp b/code/AMF/AMFImporter_Postprocess.cpp -index 79b5e15..3c1b842 100644 ---- a/code/AMF/AMFImporter_Postprocess.cpp -+++ b/code/AMF/AMFImporter_Postprocess.cpp -@@ -359,9 +359,9 @@ void AMFImporter::Postprocess_AddMetadata(const std::list(metadataList.size()) ); - size_t meta_idx( 0 ); - -- for(const CAMFImporter_NodeElement_Metadata& metadata: metadataList) -+ for(const CAMFImporter_NodeElement_Metadata *metadata: metadataList) - { -- sceneNode.mMetaData->Set(static_cast(meta_idx++), metadata.Type, aiString(metadata.Value)); -+ sceneNode.mMetaData->Set(static_cast(meta_idx++), metadata->Type, aiString(metadata->Value)); - } - }// if(!metadataList.empty()) - } -diff --git a/code/Common/Importer.cpp b/code/Common/Importer.cpp -index 91b5085..a287637 100644 ---- a/code/Common/Importer.cpp -+++ b/code/Common/Importer.cpp -@@ -78,6 +78,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - #include - #include - #include -diff --git a/code/Common/Importer.h b/code/Common/Importer.h -index a439d99..277af0f 100644 ---- a/code/Common/Importer.h -+++ b/code/Common/Importer.h -@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifndef INCLUDED_AI_IMPORTER_H - #define INCLUDED_AI_IMPORTER_H - -+#include - #include - #include - #include -diff --git a/include/assimp/Importer.hpp b/include/assimp/Importer.hpp -index 4941df4..d0705c7 100644 ---- a/include/assimp/Importer.hpp -+++ b/include/assimp/Importer.hpp -@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - // Public ASSIMP data structures - #include - -+#include -+ - namespace Assimp { - // ======================================================================= - // Public interface to Assimp --- -2.30.0 - diff --git a/0001-use-GNUInstallDirs-where-possible.patch b/0001-use-GNUInstallDirs-where-possible.patch deleted file mode 100644 index ed901c1..0000000 --- a/0001-use-GNUInstallDirs-where-possible.patch +++ /dev/null @@ -1,242 +0,0 @@ -From b483fbb30ce41786e9a308f1e2fbd41ecd410feb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Victor=20Matar=C3=A9?= -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 | 33 ++++++++++++++++++++------------- - assimp.pc.in | 6 ++---- - assimpTargets-debug.cmake.in | 20 ++++++++++---------- - assimpTargets-release.cmake.in | 20 ++++++++++---------- - assimpTargets.cmake.in | 15 +-------------- - 5 files changed, 43 insertions(+), 51 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcafb64..c6109e6 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")) -@@ -390,6 +377,26 @@ IF(HUNTER_ENABLED) - DESTINATION "${CONFIG_INSTALL_DIR}" - ) - ELSE(HUNTER_ENABLED) -+ 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() -+ # 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() - # cmake configuration files - 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) -diff --git a/assimp.pc.in b/assimp.pc.in -index c659e19..555a3a1 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 1ebe2a6..f5034c9 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 f3db8f1..89f1a14 100644 ---- a/assimpTargets-release.cmake.in -+++ b/assimpTargets-release.cmake.in -@@ -42,22 +42,22 @@ 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@") - - # Import target "assimp::assimp" for configuration "Release" - set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - 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() - - 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 ab1a8d2..ef90c83 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}} ) --- -2.26.2 - diff --git a/_service b/_service index 1891fd2..fb2b300 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://github.com/assimp/assimp - v5.0.1 - 5.0.1 + v5.1.0 + 5.1.0 test/models-nonbsd diff --git a/assimp-5.0.1.tar.xz b/assimp-5.0.1.tar.xz deleted file mode 100644 index e83b2b7..0000000 --- a/assimp-5.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55a496e015c79ef35f49d4a8b6fe4d8418781b83966b2943fa3923021205a7f2 -size 22351472 diff --git a/assimp-5.1.0.tar.xz b/assimp-5.1.0.tar.xz new file mode 100644 index 0000000..facba49 --- /dev/null +++ b/assimp-5.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f85d3612ecdb46c07dad8049ca0469f51af372d6022694e879c13a4006f1b426 +size 24525516 diff --git a/assimp.changes b/assimp.changes index 1e21a44..fe467bc 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Nov 13 16:29:32 UTC 2021 - Christophe Giboudeaux + +- Update to 5.1.0 + * Check https://github.com/assimp/assimp/releases/tag/v5.1.0 + for the full list of changes +- Drop do-not-install-irrXML.patch. No longer needed. +- Drop obsolete patches: + * 0001-Fix-build-with-GCC-11.patch + * 0001-use-GNUInstallDirs-where-possible.patch + ------------------------------------------------------------------- Mon Feb 8 10:45:37 UTC 2021 - Christophe Giboudeaux diff --git a/assimp.spec b/assimp.spec index 39a175d..814e137 100644 --- a/assimp.spec +++ b/assimp.spec @@ -18,18 +18,13 @@ %define sover 5 Name: assimp -Version: 5.0.1 +Version: 5.1.0 Release: 0 Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ URL: https://assimp.org/ Source0: %{name}-%{version}.tar.xz -Patch0: do-not-install-irrXML.patch -# PATCH-FIX-UPSTREAM -- Don't hardcode the library and binary location -Patch1: 0001-use-GNUInstallDirs-where-possible.patch -# PATCH-FIX-UPSTREAM -- GCC 11 build fixes backported to the 5.0.1 version -Patch2: 0001-Fix-build-with-GCC-11.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ diff --git a/do-not-install-irrXML.patch b/do-not-install-irrXML.patch deleted file mode 100644 index fc1b941..0000000 --- a/do-not-install-irrXML.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur assimp-5.0.1/contrib/irrXML/CMakeLists.txt new/contrib/irrXML/CMakeLists.txt ---- assimp-5.0.1/contrib/irrXML/CMakeLists.txt 2020-01-12 12:56:40.000000000 +0100 -+++ new/contrib/irrXML/CMakeLists.txt 2020-05-20 01:51:22.652107741 +0200 -@@ -21,9 +21,9 @@ - set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) - set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) - --install(TARGETS IrrXML -- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} -- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- COMPONENT ${LIBASSIMP_COMPONENT}) -+#install(TARGETS IrrXML -+# LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -+# ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -+# RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} -+# FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -+# COMPONENT ${LIBASSIMP_COMPONENT})