haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt6_3d: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-04-15 16:50:19 +10:00
parent 28d748fa91
commit edf2cb86b3
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev-qt/qt6-3d/patches/qt6_3d-6.6.0.patchset
View File

@@ -1,22 +0,0 @@
From f70a455d5f67b151870909a29143e0f921d5bf3f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Oct 2023 15:03:32 +1000
Subject: Fix build
diff --git a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
index 3488120..120e47a 100644
--- a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
}
catch (const DeadlyImportError& e)
{
- if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
+ if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
}
throw;
--
2.42.0

22
dev-qt/qt6-3d/patches/qt6_3d-6.7.0.patchset Normal file
View File

@@ -0,0 +1,22 @@
From a38f3d755ebb7a065402048dc0a794e7ccc798ba Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 10 Apr 2024 21:50:59 +1000
Subject: Fix build
diff --git a/src/3rdparty/assimp/src/contrib/unzip/ioapi.c b/src/3rdparty/assimp/src/contrib/unzip/ioapi.c
index 0ca29db..2aca20f 100644
--- a/src/3rdparty/assimp/src/contrib/unzip/ioapi.c
+++ b/src/3rdparty/assimp/src/contrib/unzip/ioapi.c
@@ -14,7 +14,7 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(__HAIKU__) || defined(IOAPI_NO_64)
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
--
2.43.2

7
dev-qt/qt6-3d/qt6_3d-6.6.0.recipe → dev-qt/qt6-3d/qt6_3d-6.7.0.recipe
View File

@@ -4,13 +4,14 @@ used for developing software with a graphical user interface, and also used \
for developing non-GUI programs such as command-line tools and consoles for \
servers."
HOMEPAGE="https://qt.io/"
COPYRIGHT="2015-2023 The Qt Company Ltd."
COPYRIGHT="2015-2024 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
GNU FDL v1"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qt3d-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="0da87a46217f4d72f6d0de9768605d5325ef3d093f73a5e0d73dd88e99c1fc2a"
QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive"
SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qt3d-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="803b82a8be8632b79f4fc717b236edba716100ab274a54349add439056896424"
SOURCE_DIR="qt3d-everywhere-src-$portVersion"
PATCHES="qt6_3d-$portVersion.patchset"