From nobody Sun Nov 17 18:43:19 2024 X-Original-To: dev-commits-ports-branches@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 4Xs0535bQgz5dG3P; Sun, 17 Nov 2024 18:43:19 +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 4Xs0534nL8z4rW7; Sun, 17 Nov 2024 18:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731868999; 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=beMcZHtue6Z9ydcJNKL9y0EX1L1IjNzKyh4QW6Z/b7A=; b=pwfShyoR1ENCWJvcCR9e1af6Q1tQL66Asjj6ptqTWWc6gsLaLjqGdV6yjVv68tYZXFy/z/ unbmUgyMaGDMiaJH9KWKAKf8PAQP+3wEX/i8mhsbzFxlCLlUNESF4Q4jjdxskcKT+orqY4 QTr8jv3aImNXhAlAhDJ/BsIcod8xjdsdNG3lO1SrrI11hgRNxMe7wf1YWapS0pMSv10qr3 NLz4mhkhhe7E43Z2VHa+sy+hs42Tg2R0PCg3Kk3m7WW4tt22oGdEEMP4Lud+ueQ2v89VQt Mdm3/U8w1PGADKWYoDRMC3zP4TbPM3lfkYAwvF/svBqKkdI7t6xI4czNugDxjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731868999; 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=beMcZHtue6Z9ydcJNKL9y0EX1L1IjNzKyh4QW6Z/b7A=; b=xW7zesgSd0GJi6RWF4hu9iPmc3/CR7JY3EOP0bKWQrXwODkMjgCkua/QLLXZ8df9bTQMHO a3M7VBrq1oTCsD5E2kpygyxcTpx8V1ywC0qLYNSsMVtyyT7CTKlwF1qPv+4ZldxQO6PlYk U/lyRwnwj0LHB+EgYwC/WfynE/66UlIIYjVdEdLujc9G9z+8O+jh9bkno/hyrOqYWs+5So VAR7kOWMeE2ctHVlCNXt8RGUfl4mL9SHhtQva7envIN8vX1mrcNlgHNZhmqMNidzKCFjSe f0b9X3iFCyybReY57QAT/ZA4UndqhUDWc0FmzbJnpdhe8FHhuzyS+KmeuEealg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731868999; a=rsa-sha256; cv=none; b=yghSe5PAJ5hB4SWbj6AW5BCraEIu24FvASsV+TMZGtstffjvqnyTLKTLPsa7lt4W7tftUK omHoJ7teWzOouqBY+y+mFKAkbqSnQ0jUhyVHmUcVEKJipqt968h6U8tdbwBG133ghSIUFp jDLC2JmSecxow4mzMfZWNY9qjLUt5DySGnTze18rAC/KGReqjxwmGcZA4NudReuZqgAXSZ X59+K+uoHODloNo+OsnZULdtOhOcF7ozgh9pAxmfAk+PnVB7zCw2rgPS3oG9eV8A6R88mv rWcPiunEQRwuPIdR5IWjjmAalcqEIzdREiSN0fGtKiIu9hyifGU3zcMugZJirw== 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 4Xs0533zWCz13jV; Sun, 17 Nov 2024 18:43:19 +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 4AHIhJVU052962; Sun, 17 Nov 2024 18:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AHIhJDC052959; Sun, 17 Nov 2024 18:43:19 GMT (envelope-from git) Date: Sun, 17 Nov 2024 18:43:19 GMT Message-Id: <202411171843.4AHIhJDC052959@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 033e20bf95a5 - 2024Q4 - audio/sfizz: fix build with clang 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 033e20bf95a5b274589d0a15def3a60629a2a618 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=033e20bf95a5b274589d0a15def3a60629a2a618 commit 033e20bf95a5b274589d0a15def3a60629a2a618 Author: Dimitry Andric AuthorDate: 2024-11-16 13:28:18 +0000 Commit: Dimitry Andric CommitDate: 2024-11-17 18:42:09 +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 (cherry picked from commit 96997562fb8b572c0da300f0c676fb89f8f3aabe) --- audio/sfizz/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audio/sfizz/Makefile b/audio/sfizz/Makefile index bf6b20b8827d..6f026583a1fa 100644 --- a/audio/sfizz/Makefile +++ b/audio/sfizz/Makefile @@ -69,6 +69,11 @@ VST_CMAKE_BOOL= SFIZZ_VST .include +post-patch: + @${REINPLACE_CMD} \ + -E -e 's/(template do_(push|pop)_any)/\1<>/' \ + ${WRKSRC}/external/atomic_queue/include/atomic_queue/atomic_queue.h + post-install-LV2-on: @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/lib/lv2/sfizz.lv2/Contents/Binary/sfizz.so \