diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-12-18 22:49:02 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-12-19 00:47:59 -0500 |
| commit | b325de0014c8ede50010e246d914948822f56dcb (patch) | |
| tree | d8e075fbaab35c3122b03320c25f3e06e1f7ac2c /games-emulation | |
| parent | dev-cpp/rapidyaml: add 0.5.0 (diff) | |
| download | gentoo-b325de0014c8ede50010e246d914948822f56dcb.tar.gz gentoo-b325de0014c8ede50010e246d914948822f56dcb.tar.bz2 gentoo-b325de0014c8ede50010e246d914948822f56dcb.zip | |
games-emulation/pcsx2: fix build with rapidyaml-0.5.0
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 42 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-1.7.3602.ebuild | 5 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-9999.ebuild | 5 |
3 files changed, 52 insertions, 0 deletions
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 |