From nobody Sun Nov 17 18:14:06 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 4XrzRL5pKmz5dDTX; Sun, 17 Nov 2024 18:14:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XrzRL5Fj6z4myS; Sun, 17 Nov 2024 18:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731867246; 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=ACr7gX4xNP0kCivqjrKL8rAMVRiaeqv+ZMVui+3k1t0=; b=R5bWiteJO2rxGTFDtV6a758NXzAdBtgGF2KGhh+Viq1R/9HPwJj2hPVc8Tk8DstgpUczCX FQe94/6xdBUROQY9z/8f7d66xza3Bj30FB6qXgkh0UPVmD5/0ejPzksukKvWLIHtnNDgcp aIwPR4cxIURGAAle2rGR52rw7X8ika4t7I0fJSaWvretaGtjdLkKMTtwnSBovTtTLjvXet zM0qFjl3/FcmMSuKMo8u793Syoy5uBGgfpbXWsiKxOxUhJqqaSS49C3xYDDr6BvwnCVawK PWxFUSV8zFmbM3YHXschuu38x/LlDapE2iU6QyZ4afz+/Rx9f3FczXjmWhjuSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731867246; 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=ACr7gX4xNP0kCivqjrKL8rAMVRiaeqv+ZMVui+3k1t0=; b=h9MncLT40N4rFEvXx85WCsekufNIke1ELtGlZojbZN3Qp/0LjkqUWvcu51xONrzQKo8lMc 9A7L5sDZzMs/wM59PiSVdXTOIhLcA4nrO6LAAYmiwczBeWv9+ac46uICmJjmw6HVgjM2sa aXzceF84yzyQHmPuLItKs/Fi25EGuwNdhpCki8U2t/m0RyDdTqtd4JZOR+3MPdjOOvDMy/ rtq5AS1fdQ7N4Tt2Co0QsNsEBUqP0vUctYyqfoGZm2f4lGEQx2Ik5OYezNmEeV+qxokDzr QPo8MrNPG6wTLi2lNwLK1GesgWOfWz44VnuXbMjtMwkGWaEFp24hxz5yow3PJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731867246; a=rsa-sha256; cv=none; b=Fe/m0ZAqDDGGVNg1ssWg6/YRPA4v0+TEzSVX80YfK1UseA1WT+ee/fnhQwV+JA8y2Ag8ks lKq85iejLr3pz1SAuIs0T6kzx3poAl/Lm4KCIm35j4i6vhvT4hi/uC648seIoX5+ch/iZj z21oUV65eqNDmXdTabQ1VuM2llMBrSPvm3zFOEilKBB61HCz8fr8I8MUxV6mSjmpidE4H7 ooQ7SzoujHtfWhz6lZ0wQws1l7dZ/tsPan9+T8UQf7siP7t4HrJKRlFzRjuC36bNv2CCi/ Zz/bs0CHuYHvjhR8G7KeaSw/AkvvaJ+I1dfuX7vSzuHc7tHFhjWLgRJ4gUhp/g== 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 4XrzRL4rhRz137K; Sun, 17 Nov 2024 18:14:06 +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 4AHIE68K098003; Sun, 17 Nov 2024 18:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AHIE6Fu098000; Sun, 17 Nov 2024 18:14:06 GMT (envelope-from git) Date: Sun, 17 Nov 2024 18:14:06 GMT Message-Id: <202411171814.4AHIE6Fu098000@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: 96997562fb8b - main - audio/sfizz: 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: 96997562fb8b572c0da300f0c676fb89f8f3aabe Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=96997562fb8b572c0da300f0c676fb89f8f3aabe commit 96997562fb8b572c0da300f0c676fb89f8f3aabe Author: Dimitry Andric AuthorDate: 2024-11-16 13:28:18 +0000 Commit: Dimitry Andric CommitDate: 2024-11-17 18:13:20 +0000 audio/sfizz: fix build with clang 19 Clang 19 now implements CWG 96 [1], which requires a template argument list after a 'template' keyword, resulting in errors similar to: /wrkdirs/usr/ports/audio/sfizz/work/sfizz-1.2.3/external/atomic_queue/include/atomic_queue/atomic_queue.h:394:31: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 394 | return Base::template do_pop_any(states_[index], elements_[index]); | ^ /wrkdirs/usr/ports/audio/sfizz/work/sfizz-1.2.3/external/atomic_queue/include/atomic_queue/atomic_queue.h:400:24: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 400 | Base::template do_push_any(std::forward(element), states_[index], elements_[index]); | ^ /wrkdirs/usr/ports/audio/sfizz/work/sfizz-1.2.3/external/atomic_queue/include/atomic_queue/atomic_queue.h:522:31: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 522 | return Base::template do_pop_any(states_[index], elements_[index]); | ^ /wrkdirs/usr/ports/audio/sfizz/work/sfizz-1.2.3/external/atomic_queue/include/atomic_queue/atomic_queue.h:528:24: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 528 | Base::template do_push_any(std::forward(element), states_[index], elements_[index]); | ^ In all these cases, appending "<>" is enough to satisfy the constraint. This can be done with a REINPLACE_CMD in the post-patch phase. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 PR: 282796 Approved by: yuri (maintainer) MFH: 2024Q4 --- audio/sfizz/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/audio/sfizz/Makefile b/audio/sfizz/Makefile index 95431998cf37..094ae7cb05fd 100644 --- a/audio/sfizz/Makefile +++ b/audio/sfizz/Makefile @@ -9,8 +9,6 @@ WWW= https://sfz.tools/sfizz/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_15= compilation fails with clang-19, see https://github.com/sfztools/sfizz/issues/1305 - LIB_DEPENDS= libabsl_hash.so:devel/abseil RUN_DEPENDS= zenity:x11/zenity @@ -46,5 +44,8 @@ post-patch: -e 's|CACHE_LINE_SIZE|CACHE_LINE_SIZEx|' \ ${WRKSRC}/external/atomic_queue/include/atomic_queue/atomic_queue.h \ ${WRKSRC}/external/atomic_queue/include/atomic_queue/defs.h + @${REINPLACE_CMD} \ + -E -e 's/(template do_(push|pop)_any)/\1<>/' \ + ${WRKSRC}/external/atomic_queue/include/atomic_queue/atomic_queue.h .include