From nobody Sun May 26 06:59:34 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vn8lp2tjkz5K04G; Sun, 26 May 2024 06:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vn8lp1TSQz4vBN; Sun, 26 May 2024 06:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716706774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8YHsMPemUWHx/Mbbv0KiWn/GZGAcgAVOar/Uw82SHP8=; b=J4F/UdgnUVt5iBNkeQYVKfc/Pxu8ysCqC4ILJNgYm5PhGk5rundbQO4ewnb1qCi+TDk/0n utsjPSXmxnUN/h5Tj40sqlgHWY5Obs4YUbk2lkR1/O/hxtYExFb2hx0HHWo4ocg//xcx3f RXLPL+7tHJPsJxD4Ngz0M5p0Ot8/9FnMcpN9OOmWcKQVtETjb1tIpcjlWFcUqZxLF008cE m4/OJI9bu4wXGCradwrPR1ox4oHbzQArJhhsjq/TEcqqV9MvC39C0K82KED0UDXBHIRqNl rNb/vLJkkqBdxtLkXv2EeW8DZDyZRvV0iBXGa2oSDi+fxmVZgSDKWuMQ5CBFkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716706774; a=rsa-sha256; cv=none; b=GThV3KXJs8cRjczg2s58fkCvsaRuA5cVONqPXxTVG+ne/ybj0M06AtLf/ZbdeqWDm9DKA/ oaeqMKJ9+qXc4spdJdVQ+7CZBvmB69a/xuOp9ZN4VfXLVK3XyOqJxuCjVgAlMMR4NILS9W 1W9hI+4Tscacq26JGYs6owZ3MX1xFgxy/TaSm/ZMfeBAZZUv3e0J62mis5uSHu9dqFHERW OeTcICKzQlnBx8jJashaqQ3E1b3d1pO3jVzbcpVAX4+w3zYKpY/QCVFa/mP5c5rXUfyawq yfozmx98x/YUofV1+CzSkVXVapT70WADNBWLAS3GRlKZmhD5MaXBvZNNbd9xvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716706774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8YHsMPemUWHx/Mbbv0KiWn/GZGAcgAVOar/Uw82SHP8=; b=k7AIpgR8XmY1IZo4kdLNgJJAgYUbCUoCKqqq52PWS631QO992HI+ygoz3rzVg1OeVTZbJt qeDDvcq2EBensdY1rBxvUR4DgKXs08zJFHCyy2M0avLO//i70XjGB+TNOVGtS/AKWkB+bK WJb2aIPHjpSW7r+Hif3gctBOoupjWsygBNGYRNviF1xJQDV45IhcXQ5AQo3e+vCPmLkekY UrhdnrSftCUSUOrcBMnYIhvBRCoyOfY6N/ApgMnSMS8wKIYestjL3sqdP8nLFYR/lDU0j9 M8Z0p33oAXj1mD47dHqWM37Rvy3VhltQ+qfx9QkHYZqgMFWxztH8BrEBVkEOoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vn8lp0sZBzqrP; Sun, 26 May 2024 06:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44Q6xYWh095733; Sun, 26 May 2024 06:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44Q6xYgR095730; Sun, 26 May 2024 06:59:34 GMT (envelope-from git) Date: Sun, 26 May 2024 06:59:34 GMT Message-Id: <202405260659.44Q6xYgR095730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: d91f6afc0d27 - 2024Q2 - science/qt6-quick3dphysics: Fix patch stage List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: d91f6afc0d275f794e10c955bdace138bf5a0063 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=d91f6afc0d275f794e10c955bdace138bf5a0063 commit d91f6afc0d275f794e10c955bdace138bf5a0063 Author: Jason E. Hale AuthorDate: 2024-05-26 06:03:41 +0000 Commit: Jason E. Hale CommitDate: 2024-05-26 06:59:29 +0000 science/qt6-quick3dphysics: Fix patch stage Mk/Uses/qt.mk: Fix typo that lead to my test builds excluding this port and to not register it as a LIB_DEPENDS in consumers. [1] Nothing currently depends on this, but the devel/qt6 metaport technically should, so I'm bumping its PORTREVISION so that science/qt6-quick3dphysics is registered as a dependency. Reported by: pkg-fallout MFH: 2024Q2 Pointy hat to: my 7 months ago self who added this port [1] (cherry picked from commit 4b17f0c82bfeabcb0770ebc6aabbf8ace3e714af) --- Mk/Uses/qt.mk | 2 +- devel/qt6/Makefile | 1 + ...party_PhysX_source_foundation_src_unix_PsUnixThread.cpp | 14 ++++---------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 470415891192..127e721f4378 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -318,7 +318,7 @@ qt-quick3d_PORT= x11-toolkits/${_QT_RELNAME}-quick3d qt-quick3d_LIB= libQt${_QT_LIBVER}Quick3D.so qt-quick3dphysics_PORT= science/${_QT_RELNAME}-quick3dphysics -qt_quick3dphysics_LIB= libQt${_QT_LIBVER}Quick3DPhysics.so +qt-quick3dphysics_LIB= libQt${_QT_LIBVER}Quick3DPhysics.so qt-quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols qt-quickcontrols_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir diff --git a/devel/qt6/Makefile b/devel/qt6/Makefile index c4e795320e42..ef815c0d2e94 100644 --- a/devel/qt6/Makefile +++ b/devel/qt6/Makefile @@ -1,5 +1,6 @@ PORTNAME= qt6 DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp b/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp index 93fd958d96a6..ecd151c1f122 100644 --- a/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp +++ b/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp @@ -1,5 +1,5 @@ Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp ---- src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp.orig 2023-09-24 11:12:43 UTC +--- src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp.orig 2024-05-09 03:10:14 UTC +++ src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp @@ -36,7 +36,7 @@ #include "PsThread.h" @@ -19,22 +19,16 @@ Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp #include #include #endif -@@ -111,11 +111,11 @@ static void setTid(_ThreadImpl& threadImpl) +@@ -110,7 +110,7 @@ static void setTid(_ThreadImpl& threadImpl) static void setTid(_ThreadImpl& threadImpl) { // query TID -#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV) +#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV) || PX_FREEBSD // AM: TODO: neither of the below are implemented --#elif PX_APPLE_FAMILY -+#elif PX_APPLE_FAMILY || !PX_FREEBSD + #elif PX_APPLE_FAMILY threadImpl.tid = syscall(SYS_gettid); --#elif PX_EMSCRIPTEN -+#elif PX_EMSCRIPTEN || PX_FREEBSD - threadImpl.tid = pthread_self(); - #else - threadImpl.tid = syscall(__NR_gettid); -@@ -311,7 +311,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask) +@@ -324,7 +324,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask) { #if PX_PS4 prevMask = setAffinityMaskPS4(getThread(this)->thread, mask);