Fix assimp build
This commit is contained in:
parent
81abd60f5a
commit
c5033176c5
28
qt3d-assimp-fix-build.patch
Normal file
28
qt3d-assimp-fix-build.patch
Normal file
@ -0,0 +1,28 @@
|
||||
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
|
||||
index eb70bc3..c9165be 100644
|
||||
--- a/src/3rdparty/assimp/src/code/Common/Importer.h
|
||||
+++ b/src/3rdparty/assimp/src/code/Common/Importer.h
|
||||
@@ -49,6 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <string>
|
||||
#include <assimp/matrix4x4.h>
|
||||
|
||||
+#include <exception>
|
||||
+#include <stdexcept>
|
||||
+
|
||||
struct aiScene;
|
||||
|
||||
namespace Assimp {
|
||||
diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
|
||||
index 9078fbf..ab76f93 100644
|
||||
--- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
|
||||
+++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
|
||||
@@ -59,6 +59,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
// Public ASSIMP data structures
|
||||
#include <assimp/types.h>
|
||||
|
||||
+#include <exception>
|
||||
+#include <stdexcept>
|
||||
+
|
||||
namespace Assimp {
|
||||
// =======================================================================
|
||||
// Public interface to Assimp
|
@ -13,6 +13,8 @@ Url: http://www.qt.io
|
||||
Source0: https://download.qt.io/official_releases/additional_libraries/%{qt_module}/%{majmin}/%{version}/%{qt_module}-everywhere-src-%{version}.tar.xz
|
||||
Source1: qt3dcore-config-multilib_p.h
|
||||
|
||||
Patch0: qt3d-assimp-fix-build.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ninja-build
|
||||
@ -136,7 +138,7 @@ popd
|
||||
%{_qt6_includedir}/Qt3DQuickRender/
|
||||
%{_qt6_includedir}/Qt3DQuickScene2D
|
||||
%{_qt6_includedir}/Qt3DRender/
|
||||
%{_qt6_libdir}/cmake/Qt6/FindWrapAssimp.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6/FindWrapQt3DAssimp.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/Qt3DTestsConfig.cmake
|
||||
%{_qt6_libdir}/cmake/Qt63DAnimation/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt63DCore/*.cmake
|
||||
|
Loading…
Reference in New Issue
Block a user