From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A41CA158094 for ; Mon, 11 Jul 2022 00:09:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF555E0D12; Mon, 11 Jul 2022 00:09:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA488E0D12 for ; Mon, 11 Jul 2022 00:09:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A483534109A for ; Mon, 11 Jul 2022 00:09:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19945391 for ; Mon, 11 Jul 2022 00:09:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657498088.65e79039b9cd3898cdb300f36357d5cc82c4f35c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild games-emulation/dolphin/dolphin-5.0_p20220520.ebuild games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch X-VCS-Directories: games-emulation/dolphin/ games-emulation/dolphin/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 65e79039b9cd3898cdb300f36357d5cc82c4f35c X-VCS-Branch: master Date: Mon, 11 Jul 2022 00:09:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b625436-e4ca-4598-9f95-1a9223b01a9f X-Archives-Hash: 57b2a6e800fa91b8c2e1355583d31897 commit: 65e79039b9cd3898cdb300f36357d5cc82c4f35c Author: Christopher Rudolph b-tu de> AuthorDate: Fri Jul 8 17:23:52 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 11 00:08:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e79039 games-emulation/dolphin: fix build w/ libfmt-9 Apply patch to make games-emulation/dolphin-5.0_p20220520 build with dev-libs/libfmt-9. Signed-off-by: Christopher Rudolph b-tu.de> Signed-off-by: Sam James gentoo.org> ...0520.ebuild => dolphin-5.0_p20220520-r1.ebuild} | 4 ++- ...phin-5.0_p20220520-libfmt-9.0.0-fix-build.patch | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild similarity index 98% rename from games-emulation/dolphin/dolphin-5.0_p20220520.ebuild rename to games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild index 381435640b8f..abcdeec7c45b 100644 --- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild +++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild @@ -35,12 +35,14 @@ IUSE=" profile pulseaudio systemd upnp vulkan " +PATCHES=("${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch") + RDEPEND=" app-arch/bzip2:= app-arch/xz-utils:= app-arch/zstd:= dev-libs/hidapi:= - =dev-libs/libfmt-8*:= + >=dev-libs/libfmt-8:= dev-libs/lzo:= dev-libs/pugixml:= media-libs/cubeb:= diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch new file mode 100644 index 000000000000..5bc2ae3877f4 --- /dev/null +++ b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch @@ -0,0 +1,32 @@ +From: Christopher Rudolph +Fix build with libfmt-9.0.0 +Upstream report: https://github.com/dolphin-emu/dolphin/pull/10825 + +diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h +index 750da51..1d6a467 100644 +--- a/Source/Core/Common/MsgHandler.h ++++ b/Source/Core/Common/MsgHandler.h +@@ -41,7 +41,11 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons + static_assert(NumFields == sizeof...(args), + "Unexpected number of replacement fields in format string; did you pass too few or " + "too many arguments?"); ++#if FMT_VERSION >= 90000 ++ static_assert(fmt::detail::is_compile_string::value); ++#else + static_assert(fmt::is_compile_string::value); ++#endif + return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format, + fmt::make_format_args(args...)); + } +@@ -56,7 +60,11 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con + static_assert(NumFields == sizeof...(args), + "Unexpected number of replacement fields in format string; did you pass too few or " + "too many arguments?"); ++#if FMT_VERSION >= 90000 ++ static_assert(fmt::detail::is_compile_string::value); ++#else + static_assert(fmt::is_compile_string::value); ++#endif + auto arg_list = fmt::make_format_args(args...); + return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list); + }