From nobody Wed Oct 09 19:10:51 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 4XP2Xr1TVDz5Ysvr; Wed, 09 Oct 2024 19:10:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP2Xr0yRJz4MZp; Wed, 9 Oct 2024 19:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728501052; 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=W0pwpfM/CxJvww8ac9eRrXKoc4S1GI7hr0VDfL8etGw=; b=eE1ke9YEG1x/6ty3+nCMpBg3ANHn8ytOkxbr5zHy3uSaphUwUt0LNH/GcJ0wIhB6uLXA2M Waf4qy6ooAuGhpaqDJg2BG1ADUkg7ndaBQJn+TbTmaUm0IIyAgsdndta97/5iJEq9mXK6n Y+ZckbMbQ5T8GwWc/KI8d9pSO9soD90zhjmiybN8YitYngLVKCur4+gaYGZ5hfiRl/aoQj MiJN0SrJOr3zZiGTrqRs5stN2IiAepGKfVpuPp6sTD7q+qB7T9rIlrIAftSC8r866UodXI 0Gu/TKsWmpsZ93AECbhEzFzzpmnZRqFqRdxcyHKvBceByIc08rdGXzEzGPmzug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728501052; 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=W0pwpfM/CxJvww8ac9eRrXKoc4S1GI7hr0VDfL8etGw=; b=K3tkMvEadjJk9vCqIIrkTZMDWpefiMjnV9K61/Ne9qIOzp+EOzBOb6P60JQ/eGk5f9x6QG N6gOFzGX1SYJc2p0RmpUXthNEotfUn3SLslTyuMkga5cdVCQfC02XH4qANjsCRx4nFquga MJIxmTH+NcpNYHxQiKErLCdVbUgeSICOxVjtLLHcYhcy7FPWbV2m2PdBItI4quIpQkpHG1 XHhfIGj4oHIUWkiw+DFd/1Tl1Eq2jwGVqBsx4N0yz+3QQxloqYe6tD7ztPO6ebA8PvgtNL YN39MjR0Idgipt5TSQR37zPIBQuAmO0RhHPGuRcx6j4oY2ymmHjRlmEBgua32g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728501052; a=rsa-sha256; cv=none; b=l0+4yqy9LBJwXvlBUvx4ssm54H4YknIKYCKHkQOhmI20z+KAC5vTPl2R1y8CnexsK4Ui6n yH76c+7VCuMIctAi4g5DXwnAf687dIEhfQupY2J8UeH92367BaJNyevtEZl+VfoU4gnDFl yQ6MaYHLBkX+SlGh6vUSVgaqpzHw0A3Oc09i2jBWl+reKyXXxnP5wuHcHJClkYpm2rQz+9 OcE4wzlPXRXir10a3BS/V8NulH23SNe/OlQ511K61yo8UmijJZ6sK0suTlTF0VixokclBx OY2xeKm5haWrVFIlUwGjiMtmd57HtvLwrTAPVgyCp51+BtI8vApscVYmkjw5uQ== 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 4XP2Xr0SmQzQ9Z; Wed, 9 Oct 2024 19:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499JApib031314; Wed, 9 Oct 2024 19:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499JAp31031311; Wed, 9 Oct 2024 19:10:51 GMT (envelope-from git) Date: Wed, 9 Oct 2024 19:10:51 GMT Message-Id: <202410091910.499JAp31031311@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 465e9eaad0ee - main - math/pdal: fix build with clang 19 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 465e9eaad0eeb60f82c2405459b0c652cb38cdff Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=465e9eaad0eeb60f82c2405459b0c652cb38cdff commit 465e9eaad0eeb60f82c2405459b0c652cb38cdff Author: Dimitry Andric AuthorDate: 2024-10-05 13:21:23 +0000 Commit: Dimitry Andric CommitDate: 2024-10-09 19:09:53 +0000 math/pdal: fix build with clang 19 Clang 19 has become more strict about errors in member functions, which results in errors building math/pdal: /wrkdirs/usr/ports/math/pdal/work/PDAL-2.7.2-src/vendor/kazhdan/SparseMatrix.inl:195:18: error: no member named 'm_N' in 'SparseMatrix' 195 | Resize(this->m_N, this->m_M); | ~~~~ ^ /wrkdirs/usr/ports/math/pdal/work/PDAL-2.7.2-src/vendor/kazhdan/SparseMatrix.inl:195:29: error: no member named 'm_M' in 'SparseMatrix' 195 | Resize(this->m_N, this->m_M); | ~~~~ ^ /wrkdirs/usr/ports/math/pdal/work/PDAL-2.7.2-src/vendor/kazhdan/Ply.h:320:97: error: no member named 'value' in 'PlyOrientedVertex' 320 | PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); } | ~ ^ /wrkdirs/usr/ports/math/pdal/work/PDAL-2.7.2-src/vendor/kazhdan/Ply.h:366:92: error: no member named 'value' in 'PlyColorVertex::_PlyColorVertex' 366 | _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); } | ~ ^ The first pair of errors is because there are no members `m_N` and `m_M` in `SparseMatrix` at all, nor are there any members that remotely look like these. However, the `SetZero()` member function that invokes these is never used anywhere, so it can simply be deleted. The second pair of errors is due to a typo: `p.value` should have been `p.point`. PR: 281867 Approved by: lbartoletti (maintainer) MFH: 2024Q3 --- math/pdal/files/patch-vendor_kazhdan_Ply.h | 20 ++++++++++++++++++++ math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h | 11 +++++++++++ .../pdal/files/patch-vendor_kazhdan_SparseMatrix.inl | 16 ++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/math/pdal/files/patch-vendor_kazhdan_Ply.h b/math/pdal/files/patch-vendor_kazhdan_Ply.h new file mode 100644 index 000000000000..2ec2a38292d4 --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_Ply.h @@ -0,0 +1,20 @@ +--- vendor/kazhdan/Ply.h.orig 2024-06-29 01:37:43 UTC ++++ vendor/kazhdan/Ply.h +@@ -317,7 +317,7 @@ class PlyOrientedVertex (public) + PlyOrientedVertex( void ) { ; } + PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; } + PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); } +- PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); } ++ PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); } + template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); } + template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); } + PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; } +@@ -363,7 +363,7 @@ class PlyColorVertex (public) + } + + _PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); } +- _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); } ++ _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); } + template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); } + template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); } + _PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; } diff --git a/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h new file mode 100644 index 000000000000..9152361e68bb --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h @@ -0,0 +1,11 @@ +--- vendor/kazhdan/SparseMatrix.h.orig 2024-06-29 01:37:43 UTC ++++ vendor/kazhdan/SparseMatrix.h +@@ -67,8 +67,6 @@ template class SparseMatrix (public) + SparseMatrix( const SparseMatrix& M ); + ~SparseMatrix(); + +- void SetZero(); +- + SparseMatrix& operator = (const SparseMatrix& M); + + SparseMatrix operator * (const T& V) const; diff --git a/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl new file mode 100644 index 000000000000..c8aa440a1b36 --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl @@ -0,0 +1,16 @@ +--- vendor/kazhdan/SparseMatrix.inl.orig 2024-06-29 01:37:43 UTC ++++ vendor/kazhdan/SparseMatrix.inl +@@ -188,13 +188,6 @@ void SparseMatrix< T >::SetRowSize( int row , int coun + } + } + +- +-template +-void SparseMatrix::SetZero() +-{ +- Resize(this->m_N, this->m_M); +-} +- + template + SparseMatrix SparseMatrix::operator * (const T& V) const + {