diff --git a/dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.7.0.patchset b/dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.7.2.patchset similarity index 96% rename from dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.7.0.patchset rename to dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.7.2.patchset index 710c40e70..e7f969c5d 100644 --- a/dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.7.0.patchset +++ b/dev-qt/qt6-quick3dphysics/patches/qt6_quick3dphysics-6.7.2.patchset @@ -1,6 +1,6 @@ -From 07daafa720b978e121e76d2448087d6131b1f746 Mon Sep 17 00:00:00 2001 +From 5a2fd880f34a09fe4f8ac71ab513ded89b15b184 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 10 Apr 2024 23:08:59 +1000 +Date: Wed, 4 Sep 2024 22:58:42 +1000 Subject: Add Haiku support @@ -168,7 +168,7 @@ index 9a4fbb8..f6cf9d6 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 9389b4d..f8e988c 100644 +index 0fb6851..159e36a 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 @@ @@ -198,16 +198,16 @@ index 9389b4d..f8e988c 100644 // fwd #if defined(ANDROID) extern "C" { -@@ -115,6 +119,8 @@ static void setTid(_ThreadImpl& threadImpl) +@@ -114,6 +118,8 @@ static void setTid(_ThreadImpl& threadImpl) // AM: TODO: neither of the below are implemented #elif PX_APPLE_FAMILY threadImpl.tid = syscall(SYS_gettid); +#elif PX_HAIKU + threadImpl.tid = find_thread(NULL); #elif PX_EMSCRIPTEN - threadImpl.tid = pthread_self(); + // No thread id for emscripten #else -@@ -311,7 +317,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask) +@@ -324,7 +330,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask) { #if PX_PS4 prevMask = setAffinityMaskPS4(getThread(this)->thread, mask); @@ -216,7 +216,7 @@ index 9389b4d..f8e988c 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,10 @@ uint32_t ThreadImpl::getNbPhysicalCores() +@@ -433,6 +439,10 @@ uint32_t ThreadImpl::getNbPhysicalCores() int count; size_t size = sizeof(count); return sysctlbyname("hw.physicalcpu", &count, &size, NULL, 0) ? 0 : count; @@ -241,5 +241,5 @@ index 46034b0..58b4059 100644 #else return typeid(T).name(); -- -2.43.2 +2.45.2 diff --git a/dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.7.0.recipe b/dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.7.2.recipe similarity index 97% rename from dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.7.0.recipe rename to dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.7.2.recipe index 230c2e2fa..29e7339b3 100644 --- a/dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.7.0.recipe +++ b/dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.7.2.recipe @@ -8,10 +8,10 @@ COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 GNU FDL v1" -REVISION="2" +REVISION="1" QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive" SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtquick3dphysics-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="80045f261109f3f3807c0b405d056e935210a36499c3a9aff78296d8940e04e6" +CHECKSUM_SHA256="ffc790b8b44ebc03acc1f2d085dad0cc49fffde1eea941a6ff11d3eb0b6e4140" SOURCE_DIR="qtquick3dphysics-everywhere-src-$portVersion" PATCHES="qt6_quick3dphysics-$portVersion.patchset"