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_quick3dphysics: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2023-11-06 22:59:09 +10:00
parent dd0efb234b
commit b1d34c4a72
2 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.5.0.patchset → dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.6.0.patchset
View File

@@ -1,9 +1,22 @@
From 0bdc9128a25c4f35c14ab2847e7fa4686e8530b9 Mon Sep 17 00:00:00 2001
From 91fe64cef024b6253f92ba1ac40a9af7392c3c64 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 9 Apr 2023 19:16:54 +1000
Date: Fri, 20 Oct 2023 21:30:40 +1000
Subject: Add Haiku support
diff --git a/src/3rdparty/PhysX/CMakeLists.txt b/src/3rdparty/PhysX/CMakeLists.txt
index 366a9c0..baf17bd 100644
--- a/src/3rdparty/PhysX/CMakeLists.txt
+++ b/src/3rdparty/PhysX/CMakeLists.txt
@@ -1341,7 +1341,7 @@ if (WIN32)
endif()
## MSYS
-if (MSYS OR MINGW)
+if (MSYS OR MINGW OR HAIKU)
qt_internal_extend_target(BundledPhysX DEFINES PX_SIMD_DISABLED PX_GCC_FAMILY)
endif()
diff --git a/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h b/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h
index 4b75756..9054315 100644
--- a/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h
@@ -18,7 +31,7 @@ index 4b75756..9054315 100644
#elif PX_XBOXONE
#include "foundation/XboxOne/PxXboxOneIntrinsics.h"
diff --git a/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h b/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h
index 14ed950..333ac20 100644
index 630c7c0..59bd337 100644
--- a/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h
+++ b/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h
@@ -104,6 +104,8 @@ Operating system defines, see http://sourceforge.net/p/predef/wiki/OperatingSyst
@@ -30,7 +43,7 @@ index 14ed950..333ac20 100644
#elif defined(__ORBIS__)
#define PX_PS4 1
#elif defined(__NX__)
@@ -187,6 +189,9 @@ define anything not defined on this platform to 0
@@ -194,6 +196,9 @@ define anything not defined on this platform to 0
#ifndef PX_OSX
#define PX_OSX 0
#endif
@@ -40,7 +53,7 @@ index 14ed950..333ac20 100644
#ifndef PX_PS4
#define PX_PS4 0
#endif
@@ -253,7 +258,7 @@ family shortcuts
@@ -269,7 +274,7 @@ family shortcuts
#define PX_MICROSOFT_FAMILY (PX_XBOXONE || PX_WINDOWS_FAMILY || PX_XBOX_SERIES_X)
#define PX_LINUX_FAMILY (PX_LINUX || PX_ANDROID)
#define PX_APPLE_FAMILY (PX_IOS || PX_OSX) // equivalent to #if __APPLE__
@@ -49,7 +62,7 @@ index 14ed950..333ac20 100644
#if defined(__EMSCRIPTEN__)
#define PX_EMSCRIPTEN 1
#else
@@ -291,7 +296,7 @@ Assert macro
@@ -307,7 +312,7 @@ Assert macro
DLL export macros
*/
#ifndef PX_C_EXPORT
@@ -154,15 +167,15 @@ index 847a21a..f119b56 100644
typedef int16_t __int16_t;
typedef int32_t __int32_t;
diff --git a/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp b/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp
index c29b09c..594ef02 100644
index 9389b4d..f8e988c 100644
--- a/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp
+++ b/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp
@@ -36,13 +36,13 @@
#include "PsThread.h"
#include <math.h>
-#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN
+#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && !PX_HAIKU
-#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && __GLIBC__
+#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && !PX_HAIKU && __GLIBC__
#include <bits/local_lim.h> // PTHREAD_STACK_MIN
#endif
#include <stdio.h>
@@ -202,12 +215,14 @@ index c29b09c..594ef02 100644
// not supported
#elif !PX_APPLE_FAMILY // Apple doesn't support syscall with getaffinity and setaffinity
int32_t errGet = syscall(__NR_sched_getaffinity, getThread(this)->tid, sizeof(prevMask), &prevMask);
@@ -420,6 +426,8 @@ uint32_t ThreadImpl::getNbPhysicalCores()
@@ -420,6 +426,10 @@ uint32_t ThreadImpl::getNbPhysicalCores()
int count;
size_t size = sizeof(count);
return sysctlbyname("hw.physicalcpu", &count, &size, NULL, 0) ? 0 : count;
+#elif PX_HAIKU
+ return 16;
+ system_info info;
+ status_t result = get_system_info(&info);
+ return (result != B_OK) ? 0 : info.cpu_count;
#elif defined(ANDROID)
return android_getCpuCount();
#else
@@ -225,28 +240,5 @@ index 46034b0..58b4059 100644
#else
return typeid(T).name();
--
2.37.3
From d36212644e56bca6df9ac660a20c04210a7c0117 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 14 May 2023 20:27:32 +1000
Subject: Disable SIMD for Haiku
diff --git a/src/3rdparty/PhysX/CMakeLists.txt b/src/3rdparty/PhysX/CMakeLists.txt
index 366a9c0..baf17bd 100644
--- a/src/3rdparty/PhysX/CMakeLists.txt
+++ b/src/3rdparty/PhysX/CMakeLists.txt
@@ -1341,7 +1341,7 @@ if (WIN32)
endif()
## MSYS
-if (MSYS OR MINGW)
+if (MSYS OR MINGW OR HAIKU)
qt_internal_extend_target(BundledPhysX DEFINES PX_SIMD_DISABLED PX_GCC_FAMILY)
endif()
--
2.37.3
2.42.0

4
dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.5.0.recipe → dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.6.0.recipe
View File

@@ -8,9 +8,9 @@ COPYRIGHT="2015-2023 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
GNU FDL v1"
REVISION="2"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtquick3dphysics-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="01c5a922238f1a16924b5e956c65fc7342a10b06546572ac9ceb623dbe98c011"
CHECKSUM_SHA256="74395b686f680cfa302e41530ff9bbe1b7e13c1d1aa9d68aa192318ecbfd7c03"
SOURCE_DIR="qtquick3dphysics-everywhere-src-$portVersion"
PATCHES="qt6_quick3dphysics-$portVersion.patchset"