rpms/qt6-qt3d
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build

Browse Source
This commit is contained in:
Jan Grulich 2023-01-18 08:32:34 +01:00
parent 0a10b8b1e7
commit 072094f3e7
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt3d-assimp-fix-build.patch
View File

@ -1,3 +1,16 @@
diff --git a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
index 3488120..79b838d 100644
--- a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@@ -56,6 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/DefaultLogger.hpp>
#include <assimp/StringUtils.h>
+#include <cstdint>
+
namespace Assimp {
namespace FBX {
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
index e7da7f4..c41dd53 100644
--- a/src/3rdparty/assimp/src/code/Common/Importer.h

6
qt6-qt3d.spec
View File

@ -59,7 +59,6 @@ Requires: qt6-qtbase-devel%{?_isa}
%if 0%{?examples}
%package examples
Summary: Programming examples for %{name}
# BuildRequires: qt6-qt3d-devel >= %{version}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
@ -76,8 +75,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# Disable LTO
%define _lto_cflags %{nil}
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
# -DQT_FEATURE_qt3d_system_assimp=ON
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_FEATURE_qt3d_system_assimp=OFF
%cmake_build