diff --git a/0001-Apply-mechanism-to-decide-use-for-IrrXML-external-or.patch b/0001-Apply-mechanism-to-decide-use-for-IrrXML-external-or.patch new file mode 100644 index 0000000..5242652 --- /dev/null +++ b/0001-Apply-mechanism-to-decide-use-for-IrrXML-external-or.patch @@ -0,0 +1,285 @@ +From a52bb1d9b030ee888ab44b8ad9a2a2b8ebb909a3 Mon Sep 17 00:00:00 2001 +From: Helio Chissini de Castro +Date: Thu, 27 Apr 2017 17:19:51 +0200 +Subject: [PATCH] - Apply mechanism to decide use for IrrXML external or + internal + +Several distributions usually decide for shared external libraries +instead of an usual embedded, for security reasons, duplicatiion issues. +This change enable the possibility to set SYSTEM_IRRXML=ON for detect +and build against a system installed irrxml. +By default, the internal copy is compiled. + +Changes on build: +- Added a FindIrrXML cmake module. +- Moved the source recipe for proper CMakeLists inside contrib directory +- Includes aren't path based anymore, using the provided INCLUDE_DIR +- Compiler option are grouped in a singled entry on main CMakeLists +--- + CMakeLists.txt | 88 +++++++++++++++++++++++++++++++++++------- + cmake-modules/FindIrrXML.cmake | 17 ++++++++ + code/CMakeLists.txt | 20 +++------- + code/irrXMLWrapper.h | 6 +-- + contrib/CMakeLists.txt | 4 ++ + contrib/irrXML/CMakeLists.txt | 13 +++++++ + 6 files changed, 116 insertions(+), 32 deletions(-) + create mode 100644 cmake-modules/FindIrrXML.cmake + create mode 100644 contrib/CMakeLists.txt + create mode 100644 contrib/irrXML/CMakeLists.txt + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6989510..c2b3faa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,65 @@ SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required + cmake_minimum_required( VERSION 2.8 ) + PROJECT( Assimp ) + +-OPTION(BUILD_SHARED_LIBS "Build package with shared libraries." ON) ++# All supported options ############################################### ++OPTION( BUILD_SHARED_LIBS ++ "Build package with shared libraries." ++ ON ++) ++OPTION( ASSIMP_DOUBLE_PRECISION ++ "Set to ON to enable double precision processing" ++ OFF ++) ++OPTION( ASSIMP_OPT_BUILD_PACKAGES ++ "Set to ON to generate CPack configuration files and packaging targets" ++ OFF ++) ++OPTION( ASSIMP_ANDROID_JNIIOSYSTEM ++ "Android JNI IOSystem support is active" ++ OFF ++) ++OPTION( ASSIMP_NO_EXPORT ++ "Disable Assimp's export functionality." ++ OFF ++) ++OPTION( ASSIMP_BUILD_ZLIB ++ "Build your own zlib" ++ OFF ++) ++option( ASSIMP_BUILD_ASSIMP_TOOLS ++ "If the supplementary tools for Assimp are built in addition to the library." ++ ON ++) ++option ( ASSIMP_BUILD_SAMPLES ++ "If the official samples are built as well (needs Glut)." ++ OFF ++) ++OPTION ( ASSIMP_BUILD_TESTS ++ "If the test suite for Assimp is built in addition to the library." ++ ON ++) ++OPTION ( ASSIMP_COVERALLS ++ "Eańable this to measure test coverage." ++ OFF ++) ++ ++option ( SYSTEM_IRRXML ++ "Use system installed Irrlicht/IrrXML library." ++ OFF ++) ++ ++#OPTION ( BUILD_DOCS ++# "Build documentation using Doxygen." ++# OFF ++#) ++ ++IF(MSVC) ++ set (CMAKE_PREFIX_PATH "D:\\libs\\devil") ++ OPTION( ASSIMP_INSTALL_PDB ++ "Install MSVC debug files." ++ ON ++ ) ++ENDIF(MSVC) + + IF(NOT BUILD_SHARED_LIBS) + SET(LINK_SEARCH_START_STATIC TRUE) +@@ -116,17 +174,16 @@ IF( UNIX ) + include(GNUInstallDirs) + ENDIF( UNIX ) + +-IF((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT CMAKE_COMPILER_IS_MINGW) +- IF (BUILD_SHARED_LIBS AND CMAKE_SIZEOF_VOID_P EQUAL 8) # -fPIC is only required for shared libs on 64 bit +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +- ENDIF() ++# Grouped compiler settings ++IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) + # hide all not-exported symbols +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -std=c++0x" ) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -std=c++0x" ) ++ SET(LIBSTDC++_LIBRARIES -lstdc++) + ELSEIF(MSVC) + # enable multi-core compilation with MSVC + add_compile_options(/MP) +-ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" ) ++ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -Wno-long-long -pedantic -std=c++11" ) + ELSEIF( CMAKE_COMPILER_IS_MINGW ) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" ) + ENDIF() +@@ -176,14 +233,14 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" "${C + + FIND_PACKAGE( DirectX ) + +-OPTION ( ASSIMP_NO_EXPORT +- "Disable Assimp's export functionality." +- OFF +-) ++#IF( BUILD_DOCS ) ++# add_subdirectory(doc) ++#ENDIF( BUILD_DOCS ) + +-IF( CMAKE_COMPILER_IS_GNUCXX ) +- SET(LIBSTDC++_LIBRARIES -lstdc++) +-ENDIF( CMAKE_COMPILER_IS_GNUCXX ) ++# Look for system installed irrXML ++IF ( SYSTEM_IRRXML ) ++ find_package( IrrXML REQUIRED ) ++ENDIF( SYSTEM_IRRXML ) + + # Search for external dependencies, and build them from source if not found + # Search for zlib +@@ -287,6 +344,7 @@ ELSE (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) + ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER ) + ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) + ++ADD_SUBDIRECTORY(contrib) + + ADD_SUBDIRECTORY( code/ ) + option ( ASSIMP_BUILD_ASSIMP_TOOLS +diff --git a/cmake-modules/FindIrrXML.cmake b/cmake-modules/FindIrrXML.cmake +new file mode 100644 +index 0000000..5434e0b +--- /dev/null ++++ b/cmake-modules/FindIrrXML.cmake +@@ -0,0 +1,17 @@ ++# Find IrrXMl from irrlicht project ++# ++# Find LibIrrXML headers and library ++# ++# IRRXML_FOUND - IrrXML found ++# IRRXML_INCLUDE_DIR - Headers location ++# IRRXML_LIBRARY - IrrXML main library ++ ++find_path(IRRXML_INCLUDE_DIR irrXML.h ++ PATH_SUFFIXES include/irrlicht include/irrxml) ++find_library(IRRXML_LIBRARY IrrXML) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(IrrXML REQUIRED_VARS IRRXML_INCLUDE_DIR IRRXML_LIBRARY) ++ ++ ++mark_as_advanced(IRRXML_INCLUDE_DIR IRRXML_LIBRARY) +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index 35ecf50..52073d1 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -542,6 +542,9 @@ SET( PostProcessing_SRCS + ) + SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS}) + ++SET( IrrXML_SRCS irrXMLWrapper.h ) ++SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS}) ++ + ADD_ASSIMP_IMPORTER( Q3D + Q3DLoader.cpp + Q3DLoader.h +@@ -637,18 +640,6 @@ SET( Extra_SRCS + ) + SOURCE_GROUP( Extra FILES ${Extra_SRCS}) + +-SET( IrrXML_SRCS +- irrXMLWrapper.h +- ../contrib/irrXML/CXMLReaderImpl.h +- ../contrib/irrXML/heapsort.h +- ../contrib/irrXML/irrArray.h +- ../contrib/irrXML/irrString.h +- ../contrib/irrXML/irrTypes.h +- ../contrib/irrXML/irrXML.cpp +- ../contrib/irrXML/irrXML.h +-) +-SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS}) +- + SET( ConvertUTF_SRCS + ../contrib/ConvertUTF/ConvertUTF.h + ../contrib/ConvertUTF/ConvertUTF.c +@@ -756,7 +747,8 @@ SET( assimp_src + ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) + + INCLUDE_DIRECTORIES( +- ../contrib/openddlparser/include ++ ${IRRXML_INCLUDE_DIR} ++ ../contrib/openddlparser/include + ) + + IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) +@@ -766,7 +758,7 @@ ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) + + ADD_LIBRARY( assimp ${assimp_src} ) + +-TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ) ++TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) + + if(ANDROID AND ASSIMP_ANDROID_JNIIOSYSTEM) + set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) +diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h +index 41e4188..9d96456 100644 +--- a/code/irrXMLWrapper.h ++++ b/code/irrXMLWrapper.h +@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #define INCLUDED_AI_IRRXML_WRAPPER + + // some long includes .... +-#include "./../contrib/irrXML/irrXML.h" ++#include + #include "./../include/assimp/IOStream.hpp" + #include "BaseImporter.h" + #include +@@ -128,8 +128,8 @@ public: + + // ---------------------------------------------------------------------------------- + //! Returns size of file in bytes +- virtual int getSize() { +- return (int)data.size(); ++ virtual long getSize() const { ++ return (long)data.size(); + } + + private: +diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt +new file mode 100644 +index 0000000..362f165 +--- /dev/null ++++ b/contrib/CMakeLists.txt +@@ -0,0 +1,4 @@ ++# Compile internal irrXML only if system is not requested ++if( NOT SYSTEM_IRRXML ) ++ add_subdirectory(irrXML) ++endif( NOT SYSTEM_IRRXML ) +diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt +new file mode 100644 +index 0000000..82ede3a +--- /dev/null ++++ b/contrib/irrXML/CMakeLists.txt +@@ -0,0 +1,13 @@ ++set( IrrXML_SRCS ++ CXMLReaderImpl.h ++ heapsort.h ++ irrArray.h ++ irrString.h ++ irrTypes.h ++ irrXML.cpp ++ irrXML.h ++) ++ ++add_library(IrrXML STATIC ${IrrXML_SRCS}) ++set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) ++set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) +-- +2.9.3 + diff --git a/assimp-3.3.1-unbundle.patch b/assimp-3.3.1-unbundle.patch index 3df526d..145a43e 100644 --- a/assimp-3.3.1-unbundle.patch +++ b/assimp-3.3.1-unbundle.patch @@ -1,45 +1,11 @@ -From c59f36b6caef152854ed4e6494ed9a2e625d507f Mon Sep 17 00:00:00 2001 -From: Helio Chissini de Castro -Date: Tue, 18 Apr 2017 20:24:59 +0200 -Subject: [PATCH] assimp-3.3.1-unbundle - ---- - CMakeLists.txt | 34 ++++++++++++++++++++++++++ - code/BlenderTessellator.h | 2 +- - code/CMakeLists.txt | 53 ++++++++++++++++++++++++++++++----------- - code/D3MFImporter.cpp | 2 +- - code/D3MFOpcPackage.cpp | 2 +- - code/IFCGeometry.cpp | 4 ++-- - code/IFCLoader.cpp | 2 +- - code/IFCOpenings.cpp | 4 ++-- - code/Q3BSPZipArchive.h | 2 +- - code/irrXMLWrapper.h | 2 +- - test/CMakeLists.txt | 3 ++- - tools/assimp_cmd/CMakeLists.txt | 5 ++-- - 12 files changed, 88 insertions(+), 27 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8455bb8..9d8565b 100644 +index 8455bb8..c8e0d88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -211,6 +211,40 @@ IF ( ASSIMP_NO_EXPORT ) +@@ -211,6 +211,26 @@ IF ( ASSIMP_NO_EXPORT ) MESSAGE( STATUS "Build an import-only version of Assimp." ) ENDIF( ASSIMP_NO_EXPORT ) -+OPTION( SYSTEM_IRRXML "Use external irrXML" OFF ) -+# Search for irrXML -+SET(HAVE_IRRXML false) -+IF (SYSTEM_IRRXML) -+ FIND_LIBRARY(IRRXML_LIB IrrXML HINTS ${IRRXML_LIB_PATH}) -+ FIND_FILE(IRRXML_H irrXML.h PATHS ${IRRXML_INCLUDE_PATH}) -+ IF(IRRXML_LIB AND IRRXML_H) -+ message (STATUS "Found External IrrXML") -+ set(HAVE_IRRXML true) -+ ELSE (IRRXML_LIB AND IRRXML_H) -+ message (WARNING "External IrrXML not found. Using internal copy") -+ ENDIF(IRRXML_LIB AND IRRXML_H) -+ENDIF (SYSTEM_IRRXML) -+ +# Search for poly2tri +FIND_LIBRARY(POLY2TRI_LIB poly2tri HINTS ${POLY2TRI_LIB_PATH}) +FIND_FILE(POLY2TRI_H poly2tri.h PATHS ${POLY2TRI_INCLUDE_PATH}) @@ -77,41 +43,10 @@ index 530bd2c..a6c9d9e 100644 namespace Assimp { diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 35ecf50..6e3e499 100644 +index 35ecf50..d549c89 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt -@@ -637,17 +637,19 @@ SET( Extra_SRCS - ) - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - --SET( IrrXML_SRCS -- irrXMLWrapper.h -- ../contrib/irrXML/CXMLReaderImpl.h -- ../contrib/irrXML/heapsort.h -- ../contrib/irrXML/irrArray.h -- ../contrib/irrXML/irrString.h -- ../contrib/irrXML/irrTypes.h -- ../contrib/irrXML/irrXML.cpp -- ../contrib/irrXML/irrXML.h --) --SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS}) -+IF(NOT SYSTEM_IRRXML) -+ SET( IrrXML_SRCS -+ irrXMLWrapper.h -+ ../contrib/irrXML/CXMLReaderImpl.h -+ ../contrib/irrXML/heapsort.h -+ ../contrib/irrXML/irrArray.h -+ ../contrib/irrXML/irrString.h -+ ../contrib/irrXML/irrTypes.h -+ ../contrib/irrXML/irrXML.cpp -+ ../contrib/irrXML/irrXML.h -+ ) -+ SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS}) -+ENDIF(NOT SYSTEM_IRRXML) - - SET( ConvertUTF_SRCS - ../contrib/ConvertUTF/ConvertUTF.h -@@ -655,12 +657,15 @@ SET( ConvertUTF_SRCS +@@ -655,12 +655,15 @@ SET( ConvertUTF_SRCS ) SOURCE_GROUP( ConvertUTF FILES ${ConvertUTF_SRCS}) @@ -128,7 +63,7 @@ index 35ecf50..6e3e499 100644 SET( Poly2Tri_SRCS ../contrib/poly2tri/poly2tri/common/shapes.cc -@@ -743,8 +748,6 @@ SET( assimp_src +@@ -743,8 +746,6 @@ SET( assimp_src # Third-party libraries ${IrrXML_SRCS} ${ConvertUTF_SRCS} @@ -137,7 +72,7 @@ index 35ecf50..6e3e499 100644 ${Clipper_SRCS} ${openddl_parser_SRCS} # Necessary to show the headers in the project when using the VC++ generator: -@@ -753,6 +756,8 @@ SET( assimp_src +@@ -753,6 +754,8 @@ SET( assimp_src ${COMPILER_HEADERS} ) @@ -146,17 +81,10 @@ index 35ecf50..6e3e499 100644 ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) INCLUDE_DIRECTORIES( -@@ -821,6 +826,26 @@ else (UNZIP_FOUND) +@@ -821,6 +824,19 @@ else (UNZIP_FOUND) INCLUDE_DIRECTORIES("../") endif (UNZIP_FOUND) -+if (HAVE_IRRXML) -+ INCLUDE_DIRECTORIES(${IRRXML_INCLUDE_PATH}) -+ TARGET_LINK_LIBRARIES(assimp ${IRRXML_LIB}) -+else (HAVE_IRRXML) -+ INCLUDE_DIRECTORIES("../contrib/irrXML") -+endif (HAVE_IRRXML) -+ +if (HAVE_POLY2TRI) + INCLUDE_DIRECTORIES(${POLY2TRI_INCLUDE_PATH}) + TARGET_LINK_LIBRARIES(assimp ${POLY2TRI_LIB}) @@ -255,19 +183,6 @@ index e46a11b..da93e5c 100644 #include #include #include -diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h -index 41e4188..4862009 100644 ---- a/code/irrXMLWrapper.h -+++ b/code/irrXMLWrapper.h -@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #define INCLUDED_AI_IRRXML_WRAPPER - - // some long includes .... --#include "./../contrib/irrXML/irrXML.h" -+#include "irrXML.h" - #include "./../include/assimp/IOStream.hpp" - #include "BaseImporter.h" - #include diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index df0139d..8b26f22 100644 --- a/test/CMakeLists.txt @@ -283,21 +198,16 @@ index df0139d..8b26f22 100644 INCLUDE_DIRECTORIES( ${Assimp_SOURCE_DIR}/include diff --git a/tools/assimp_cmd/CMakeLists.txt b/tools/assimp_cmd/CMakeLists.txt -index f8af93a..297b393 100644 +index f8af93a..3f9a902 100644 --- a/tools/assimp_cmd/CMakeLists.txt +++ b/tools/assimp_cmd/CMakeLists.txt -@@ -64,8 +64,9 @@ IF( WIN32 ) +@@ -64,8 +64,7 @@ IF( WIN32 ) COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $ MAIN_DEPENDENCY assimp) ENDIF( WIN32 ) - -TARGET_LINK_LIBRARIES( assimp_cmd assimp ${ZLIB_LIBRARIES} ) -+INCLUDE_DIRECTORIES(${IRRXML_INCLUDE_PATH}) +TARGET_LINK_LIBRARIES( assimp_cmd assimp ${ZLIB_LIBRARIES} ${POLY2TRI_LIB}) -+TARGET_LINK_LIBRARIES( assimp_cmd ${IRRXML_LIB}) SET_TARGET_PROPERTIES( assimp_cmd PROPERTIES OUTPUT_NAME assimp ) --- -2.9.3 - diff --git a/assimp.spec b/assimp.spec index 4531127..95d55cf 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,6 +1,6 @@ Name: assimp Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to import various 3D model formats into applications Group: Development/Libraries # Assimp is BSD, the bundled openddlparser is MIT. @@ -11,8 +11,6 @@ URL: http://assimp.sourceforge.net # using assimp_generate_tarball.sh Source0: %{name}-%{version}-free.tar.xz Source1: assimp_generate_tarball.sh -# Strips bundled irrXML out of build files, and allows project to build -# against system versions of the libraries (not yet submitted upstream) Patch0: %{name}-3.3.1-unbundle.patch # Add /usr/lib64 to library lookup paths for python modules Patch1: %{name}-3.2.0-pythonpath.patch @@ -22,9 +20,12 @@ Patch1: %{name}-3.2.0-pythonpath.patch Patch2: 0001-Assimp-cmake-provider-fix.patch #Upstream backports # Collada morph animation -Patch100: 0001-Morph-animation-support-for-collada.patch +Patch100: 0001-Morph-animation-support-for-collada.patch # Generate doc from CMakeFiles. Backported from Upstream -Patch101: 0001-Enable-doxygen-been-properly-used-from-cmake-build-a.patch +Patch101: 0001-Enable-doxygen-been-properly-used-from-cmake-build-a.patch +# Strips bundled irrXML out of build files, and allows project to build +# against system versions of the libraries (not yet submitted upstream) +Patch102: 0001-Apply-mechanism-to-decide-use-for-IrrXML-external-or.patch BuildRequires: boost-devel BuildRequires: cmake @@ -33,6 +34,8 @@ BuildRequires: irrlicht-devel BuildRequires: irrXML-devel BuildRequires: doxygen BuildRequires: poly2tri-devel +BuildRequires: gtest-devel +BuildRequires: pkgconfig(zzip-zlib-config) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(polyclipping) @@ -108,6 +111,7 @@ rm -rf contrib/poly2tri # Backported from upstream %patch100 -p1 -b .docfix %patch101 -p1 -b .qt3d +%patch102 -p1 -b .systemirrxml %build mkdir build @@ -119,7 +123,7 @@ pushd build -DBUILD_DOCS=ON \ -DHTML_OUTPUT=%{name}-%{version} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir} \ - -DSYSTEM_IRRXML=ON + -DSYSTEM_IRRXML=ON popd make %{?_smp_mflags} -C build @@ -170,6 +174,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat Apr 29 2017 Helio Chissini de Castro - 3.3.1-3 +- Compile assimp with current exterbal irrXML + * Wed Apr 19 2017 Helio Chissini de Castro - 3.3.1-2 - Revamp assimp with new upstream release 3.3.1 plus new upstreamed doc patches