From nobody Wed Dec 04 19:52:27 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 4Y3Sq01Y6bz5g6LJ; Wed, 04 Dec 2024 19:52:28 +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 4Y3Sq014vYz47mg; Wed, 4 Dec 2024 19:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733341948; 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=TCgupVPVvcx0a12D4nSgYDHhTeyp78VapjpbSLBfmvI=; b=LB8aYxFUQ3t2SF3zeBpzGxXVYoAJec7Xsaanmap/OIQVOrbhkZ2jOMPBX2gY21VhVQBPPM rAoSdmYgHO8KyTmA5ZJc2NoL2dqG1fOxZyv05p6y0+zQypaBuM441oapajBielW3gRoeLK 12M/RePPKUMqDSdTrJzAUew9Mzsrti2DEiWZGiw1ahCf4biEpdW5o8nuaMSsmr80mKv5Mb H3MLXcxJgRCBhBDAMER2hjI8kXHIZDkfDOiqbT0EfjNEseuVrerIeeRi/YGMCGMgfKa4jB BksRx+hdIOTVfHVTdA9IPFP/Zo0okmMR6g6nnoGIJJ+b7HfKSFC9c5F7wNCPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733341948; 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=TCgupVPVvcx0a12D4nSgYDHhTeyp78VapjpbSLBfmvI=; b=ZAeaXB/PEkniLdrO9D9fgW8bPhsktkg3/jn49T+GUXMhaP2VD5VzVB8FDc1YEP4Zdqo8eA yw9iwtjNmetc+LufIFwvCG2GwZfNm6VW2EAeqyopWn0KCXJ7rP8jjw4qKWLKGOeQBwKbKi Qo18y+s14u8dc0Np38w9HuN6F9ltR72ySWv59boxH17qC7eR3rLlnK78O0mfOBSDUU4aIT 14fRWDKpJaXWG+yxHKNUL0kBGc3OtPT1FnHuvSD/XI95+WW4wfKb+bmwLWHRmfNLklU95t ZlXE+4sCzGlekDRlawTopK9ZEWpBLpmzwFGkLGn0pRpCcFrx7O+pos0mD2T3wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733341948; a=rsa-sha256; cv=none; b=iyOCd9sBVo9hCygv2VCnw4uUJr79lasXncSzwfBy8K57D6/P+987smsSFqROTWQISpnC94 iUPaWvbsQSLM29jLcTDo8NV7ZHh7hIPiqE4D1mSex+QMlPA8aNklqc/UrtEecujUHDNCLi Y7yqTeFJ0Do0Ihz4NlFxP8bod1NFGPKX8UyGEzJJ3CGHJgm72vZ3iFMQukLW7BQLvGvTUg PcW1dMTfGfr+TFtbGCN/iwlKDxIwsrxWBhSjIW/MkxK2x8pfROlMZ0D3M5LXtf6LTGnf3e WqWIYucOI4i7D30vkSb2W402E3mAOt0ReB+Gg5JyeQfQ4scqS7hfJQpVMB054g== 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 4Y3Sq00hCwzLrC; Wed, 4 Dec 2024 19:52:28 +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 4B4JqRrq025759; Wed, 4 Dec 2024 19:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4JqR2O025757; Wed, 4 Dec 2024 19:52:27 GMT (envelope-from git) Date: Wed, 4 Dec 2024 19:52:27 GMT Message-Id: <202412041952.4B4JqR2O025757@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: d76e4adce969 - main - emulators/mame: fix build with clang 18 and 19 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d76e4adce969f7a3da6e7398cca26dca70cec559 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=d76e4adce969f7a3da6e7398cca26dca70cec559 commit d76e4adce969f7a3da6e7398cca26dca70cec559 Author: Dimitry Andric AuthorDate: 2024-12-03 09:22:18 +0000 Commit: Dimitry Andric CommitDate: 2024-12-04 19:51:46 +0000 emulators/mame: fix build with clang 18 and 19 During the exp-run for bug 283013 ("update LLVM_DEFAULT to 18") it turned out that emulators/mame fails to compile, with an error similar to: ../../../../../3rdparty/sol2/sol/sol.hpp:19875:31: error: address of overloaded function 'call' does not match required type 'int (lua_State *)' 19875 | lua_CFunction freefunc = &function_detail::upvalue_this_member_variable::template call; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upstream fixed this with [1] and [2]. Similarly, compiling it with clang 19, we run into another error: ../../../../../3rdparty/sol2/sol/sol.hpp:6755:10: error: no member named 'construct' in 'optional' 2191 | this->construct(std::forward(args)...); | ~~~~ ^ Upstream fixed this with [3]. Apply these upstream fixes using PATCH_SITES and PATCHFILES. [1] https://github.com/mamedev/mame/commit/4da99a13f5c [2] https://github.com/mamedev/mame/commit/b7e0fa72b92 [3] https://github.com/mamedev/mame/commit/c75845b1ef0 PR: 283126 Approved by: agh@riseup.net (maintainer) MFH: 2024Q4 --- emulators/mame/Makefile | 5 +++++ emulators/mame/distinfo | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 33d455a1d380..190f47f51213 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -2,6 +2,11 @@ PORTNAME= mame DISTVERSION= 0.264 CATEGORIES= emulators games +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 4da99a13f5cd8054ff8f747a0234a74b271b663d.patch:-p1 # fix build with clang 18 +PATCHFILES+= b7e0fa72b92f8f6761a1a59e8ffdc46f6d17e6cc.patch:-p1 # idem +PATCHFILES+= c75845b1ef01d76379bcc0a6937f1ca678484c68.patch:-p1 # fix build with clang 19 + MAINTAINER= agh@riseup.net COMMENT= MAME: a multi-purpose emulation framework WWW= https://mamedev.org/ diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 96550be61049..ea6a83f7ee17 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1711623026 +TIMESTAMP = 1733152778 SHA256 (mamedev-mame-0.264-mame0264_GH0.tar.gz) = 3d9f69ed3ef7c1628d5714c8ae2695ea77b1a652a93347b2703f7c862299376e SIZE (mamedev-mame-0.264-mame0264_GH0.tar.gz) = 207550597 +SHA256 (4da99a13f5cd8054ff8f747a0234a74b271b663d.patch) = 276836cc29cf3273beeace1e7ca4e57899fdee5210ec22fa4c6f6e0badb01635 +SIZE (4da99a13f5cd8054ff8f747a0234a74b271b663d.patch) = 1219 +SHA256 (b7e0fa72b92f8f6761a1a59e8ffdc46f6d17e6cc.patch) = 94bcf956b88c049da20a7aa2097118b53bfd94a18607e09fcb9fdfcf1c025148 +SIZE (b7e0fa72b92f8f6761a1a59e8ffdc46f6d17e6cc.patch) = 1005 +SHA256 (c75845b1ef01d76379bcc0a6937f1ca678484c68.patch) = abad5c6f67eb101cc85e50aa4855f61adf63a95398ac771fa72cb53725d4137d +SIZE (c75845b1ef01d76379bcc0a6937f1ca678484c68.patch) = 1098