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 99A55158020 for ; Mon, 19 Dec 2022 05:48:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC513E0B14; Mon, 19 Dec 2022 05:48:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 929A0E0B14 for ; Mon, 19 Dec 2022 05:48:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E30534170E for ; Mon, 19 Dec 2022 05:48:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A9027CE for ; Mon, 19 Dec 2022 05:48:28 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1671428879.b325de0014c8ede50010e246d914948822f56dcb.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch games-emulation/pcsx2/pcsx2-1.7.3602.ebuild games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/files/ games-emulation/pcsx2/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b325de0014c8ede50010e246d914948822f56dcb X-VCS-Branch: master Date: Mon, 19 Dec 2022 05:48:28 +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: 6138a7ca-fc2b-4a0d-b3a0-1687eff98341 X-Archives-Hash: 3097728b4c6bc256b68d2ebca088c0c6 commit: b325de0014c8ede50010e246d914948822f56dcb Author: Ionen Wolkens gentoo org> AuthorDate: Mon Dec 19 03:49:02 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Dec 19 05:47:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b325de00 games-emulation/pcsx2: fix build with rapidyaml-0.5.0 Signed-off-by: Ionen Wolkens gentoo.org> .../files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 42 ++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-1.7.3602.ebuild | 5 +++ games-emulation/pcsx2/pcsx2-9999.ebuild | 5 +++ 3 files changed, 52 insertions(+) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch new file mode 100644 index 000000000000..b3185b47006e --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch @@ -0,0 +1,42 @@ +Quick fix taken from Alpine, fixes >=0.5.0 but breaks <0.5.0 + +Upstream seem to have no intention to acknowledge this as an issue +until they bump their bundled copy of rapidyaml: +https://github.com/PCSX2/pcsx2/issues/7623#issuecomment-1357048378 +--- a/pcsx2/GameDatabase.cpp ++++ b/pcsx2/GameDatabase.cpp +@@ -151,5 +151,5 @@ + if (node.has_child("gameFixes") && node["gameFixes"].has_children()) + { +- for (const ryml::NodeRef& n : node["gameFixes"].children()) ++ for (const ryml::ConstNodeRef& n : node["gameFixes"].children()) + { + bool fixValidated = false; +@@ -182,5 +182,5 @@ + if (node.has_child("speedHacks") && node["speedHacks"].has_children()) + { +- for (const ryml::NodeRef& n : node["speedHacks"].children()) ++ for (const ryml::ConstNodeRef& n : node["speedHacks"].children()) + { + bool speedHackValidated = false; +@@ -212,5 +212,5 @@ + if (node.has_child("gsHWFixes")) + { +- for (const ryml::NodeRef& n : node["gsHWFixes"].children()) ++ for (const ryml::ConstNodeRef& n : node["gsHWFixes"].children()) + { + const std::string_view id_name(n.key().data(), n.key().size()); +@@ -233,5 +233,5 @@ + if (node.has_child("memcardFilters") && node["memcardFilters"].has_children()) + { +- for (const ryml::NodeRef& n : node["memcardFilters"].children()) ++ for (const ryml::ConstNodeRef& n : node["memcardFilters"].children()) + { + auto memcardFilter = std::string(n.val().str, n.val().len); +@@ -243,5 +243,5 @@ + if (node.has_child("patches") && node["patches"].has_children()) + { +- for (const ryml::NodeRef& n : node["patches"].children()) ++ for (const ryml::ConstNodeRef& n : node["patches"].children()) + { + // use a crc of 0 for default patches diff --git a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild index de7b59537121..f2949fc2a844 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild @@ -138,6 +138,11 @@ src_unpack() { } src_prepare() { + # could depend on >=0.5 for unconditional, but rather not force it yet + # https://github.com/PCSX2/pcsx2/issues/7623 + has_version '>=dev-cpp/rapidyaml-0.5' && + eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch + cmake_src_prepare # qt6 build doesn't support PACKAGE_MODE and need to set resources location diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 119d33bb8302..92f1596c955b 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -136,6 +136,11 @@ src_unpack() { } src_prepare() { + # could depend on >=0.5 for unconditional, but rather not force it yet + # https://github.com/PCSX2/pcsx2/issues/7623 + has_version '>=dev-cpp/rapidyaml-0.5' && + eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch + cmake_src_prepare # qt6 build doesn't support PACKAGE_MODE and need to set resources location