From nobody Sun May 26 06:58:31 2024 X-Original-To: dev-commits-ports-main@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 4Vn8kb3SS1z5Jyyf; Sun, 26 May 2024 06:58:31 +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 4Vn8kb2ZwVz4v4g; Sun, 26 May 2024 06:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716706711; 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=vJA+F1fy2AaAjorjtD/IJSO+6dP3Lil3DEz+W9WecMw=; b=lt9d/tZ1+Tqg0kPTk6HRti7if1Zv0NIheqhAUGoxc/aOTplrZzwhoZVWZLATR+gXX6Lb+B u7940YTTvzDhllKA1X+71igs5x5j6YCGJVNl8b1BrJpRZz9ZFSM622yCbilfJkNviyrmBY um6LYFgP10/lMH0hy9l+RBnUoV6aPPxTgEZHTHQw+vbG0YvaiZ4HlLnfAdGKM2opkOv66+ qrXKQ9tOMrxsFvaKCRfVeoPZroy28dhX1JGemdCt71TT3+mTUlpa+9jiZYffnhBs6Vdt4a CkCLv0VtpoJOj1GFAb+UHSTaHP4wQbAWh+J4NW2/CYI6qSJgOh8IYrH7bDpxVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716706711; a=rsa-sha256; cv=none; b=XIZv0TFPSBReR9lh9nn/lhnEYRxrCq8HhGNuRONE8J36Qwvp0HgE0wfaUUn4fUDnNjil4t GRIAdG85JuurL2z8ygimY2uuod4p4Hl3XVbiOCWjDq+BBVRTIUjW03fThD5ZCQmyJ545E4 h/TzyatqJAdz5Ma10wBVy937YA7ozIeyUlJ0gtsxDoBsColzb8GUwKFF/gx9iqvwtd9aI+ hV+QNKtfEsSAYeZbl+gZRk1Dzk3rHms2IZa/EAZg954LvabB9WgCq2IZNSOuS00RmCmvw6 52+UmlNS10JvpxMBmIMsA0aJr3zwGAzYx2JEF3UG+lN87xTPqiBTHSgqird3RQ== 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=1716706711; 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=vJA+F1fy2AaAjorjtD/IJSO+6dP3Lil3DEz+W9WecMw=; b=tF2fIpMqsbuXey4aEde7XuDKV5RlHPpVdqaen58ctEG6w3ZJ2DT5bwHGlbHPpDf0VIS235 eSRSBM2GMG0YQajjUseRq+xGNGf7pkJvIts2gh8Lx2k3XBaJJkrF41s79GgPD+wHDUEOL2 UH5G2F+vgqtmMcfX56j6ONg1f91p0rjYhE0Kd+J41XGh5ssf9/QaPdB7wQFsrbvRHLDJvU 5koedJ9ESJP3TXR6cCDg3mON1S7fyvGC1JWIrXGXXiepKtTyJrUrYFUxyPqT2KPQxMs5JE lxQeGKq2Tk2h+4Q4jEx7vnL4VX4KdKBJeeZB2xpLlFybtqmIitcO6+4IFSja3g== 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 4Vn8kb22gbzqjs; Sun, 26 May 2024 06:58:31 +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 44Q6wVu1095446; Sun, 26 May 2024 06:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44Q6wV2N095443; Sun, 26 May 2024 06:58:31 GMT (envelope-from git) Date: Sun, 26 May 2024 06:58:31 GMT Message-Id: <202405260658.44Q6wV2N095443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 4b17f0c82bfe - main - science/qt6-quick3dphysics: Fix patch stage List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 4b17f0c82bfeabcb0770ebc6aabbf8ace3e714af Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b17f0c82bfeabcb0770ebc6aabbf8ace3e714af commit 4b17f0c82bfeabcb0770ebc6aabbf8ace3e714af Author: Jason E. Hale AuthorDate: 2024-05-26 06:03:41 +0000 Commit: Jason E. Hale CommitDate: 2024-05-26 06:58:25 +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] --- 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);