summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch7
-rw-r--r--games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch7
-rw-r--r--games-emulation/pcsx2/pcsx2-1.7.3738.ebuild8
-rw-r--r--games-emulation/pcsx2/pcsx2-1.7.3820.ebuild8
-rw-r--r--games-emulation/pcsx2/pcsx2-9999.ebuild8
5 files changed, 10 insertions, 28 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
index b3185b47006e..aee1608ea754 100644
--- 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
@@ -1,8 +1,5 @@
-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
+https://github.com/PCSX2/pcsx2/issues/7623
+https://github.com/PCSX2/pcsx2/pull/7847
--- a/pcsx2/GameDatabase.cpp
+++ b/pcsx2/GameDatabase.cpp
@@ -151,5 +151,5 @@
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
index bded24136fe3..b42ae36045ad 100644
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
@@ -1,8 +1,5 @@
-Quick fix for >=0.5.0 (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
+https://github.com/PCSX2/pcsx2/issues/7623
+https://github.com/PCSX2/pcsx2/pull/7847
--- a/pcsx2/GameDatabase.cpp
+++ b/pcsx2/GameDatabase.cpp
@@ -176,5 +176,5 @@
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 740fb1613eaa..57249a1e145e 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- dev-cpp/rapidyaml:=
+ >=dev-cpp/rapidyaml-0.5:=
dev-libs/libaio
dev-libs/libchdr
>=dev-libs/libfmt-7.1.3:=
@@ -94,6 +94,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
)
src_unpack() {
@@ -136,11 +137,6 @@ 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-1.7.3820.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index caf2e5c05300..7c14ae265d5f 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- dev-cpp/rapidyaml:=
+ >=dev-cpp/rapidyaml-0.5:=
dev-libs/libaio
dev-libs/libchdr
dev-libs/libfmt:=
@@ -83,6 +83,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+ "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
)
src_unpack() {
@@ -125,11 +126,6 @@ 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.3803-rapidyaml-0.5.0.patch
-
cmake_src_prepare
sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 73eae17a4f96..a052878f071a 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- dev-cpp/rapidyaml:=
+ >=dev-cpp/rapidyaml-0.5:=
dev-libs/libaio
dev-libs/libchdr
dev-libs/libfmt:=
@@ -83,6 +83,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+ "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
)
src_unpack() {
@@ -125,11 +126,6 @@ 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.3803-rapidyaml-0.5.0.patch
-
cmake_src_prepare
sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \