1 |
commit: 4af9aade2199538e6ace3ec8d2d272cdfdb9edc6 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Sun Jul 31 14:58:30 2022 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 20:37:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af9aade |
7 |
|
8 |
games-emulation/pcsx2: Update live ebuild |
9 |
|
10 |
This fixes two issues: |
11 |
|
12 |
1. |
13 |
|
14 |
Because -DARCH_FLAGS= the build fails with the following. |
15 |
|
16 |
PCSX2 requires compiling for at least SSE 4.1 |
17 |
|
18 |
This can be fixed by replacing the cmake argument with |
19 |
-DDISABLE_ADVANCE_SIMD=ON. |
20 |
|
21 |
2. |
22 |
|
23 |
Upstream removed crcs for a few unofficial games that are required to |
24 |
fix major playability issues. These versions of the games can be far |
25 |
preferable to the official versions where one was completely broken in |
26 |
the North American release, but fixed in a fan patched version. |
27 |
|
28 |
Upstream-PR: https://github.com/PCSX2/pcsx2/pull/5082 |
29 |
Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/1762 |
30 |
Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/5062 |
31 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
32 |
Closes: https://github.com/gentoo/gentoo/pull/26685 |
33 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
34 |
|
35 |
games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch | 43 ++++++++++++++++++++++ |
36 |
games-emulation/pcsx2/pcsx2-9999.ebuild | 6 ++- |
37 |
2 files changed, 48 insertions(+), 1 deletion(-) |
38 |
|
39 |
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch |
40 |
new file mode 100644 |
41 |
index 000000000000..aa647cd09c07 |
42 |
--- /dev/null |
43 |
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch |
44 |
@@ -0,0 +1,43 @@ |
45 |
+Upstream-PR: https://github.com/PCSX2/pcsx2/pull/5082 |
46 |
+Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/1762 |
47 |
+Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/5062 |
48 |
+ |
49 |
+From: orbea <orbea@××××××.net> |
50 |
+Date: Sun, 28 Nov 2021 16:18:48 -0800 |
51 |
+Subject: [PATCH] Revert "GS: Remove Unofficial CRCs (#4082)" |
52 |
+ |
53 |
+These games hacks are still used and can be removed |
54 |
+again when a better solution is available. |
55 |
+ |
56 |
+This reverts commit 6bcdb55f22d468b2eb8b95fd35bd071f9272a89c. |
57 |
+ |
58 |
+--- a/pcsx2/GS/GSCrc.cpp |
59 |
++++ b/pcsx2/GS/GSCrc.cpp |
60 |
+@@ -22,6 +22,8 @@ const CRC::Game CRC::m_games[] = |
61 |
+ { |
62 |
+ // Note: IDs 0x7ACF7E03, 0x7D4EA48F, 0x37C53760 - shouldn't be added as it's from the multiloaders when packing games. |
63 |
+ {0x00000000, NoTitle, NoRegion, 0}, |
64 |
++ {0xF46142D3, ArTonelico2, NoRegion, 0}, |
65 |
++ {0xC38067F4, ArTonelico2, NoRegion, 0}, // project metafalica 1.0 |
66 |
+ {0xF95F37EE, ArTonelico2, US, 0}, |
67 |
+ {0x68CE6801, ArTonelico2, JP, 0}, |
68 |
+ {0xCE2C1DBF, ArTonelico2, EU, 0}, |
69 |
+@@ -164,6 +166,8 @@ const CRC::Game CRC::m_games[] = |
70 |
+ {0xBF6F101F, GiTS, EU, 0}, // same CRC as another US disc |
71 |
+ {0xA616A6C2, TalesOfAbyss, US, 0}, |
72 |
+ {0x14FE77F7, TalesOfAbyss, US, 0}, |
73 |
++ {0x045D77E9, TalesOfAbyss, JPUNDUB, 0}, |
74 |
++ {0x14FD77F7, TalesOfAbyss, JPUNDUB, 0}, |
75 |
+ {0xAA5EC3A3, TalesOfAbyss, JP, 0}, |
76 |
+ {0xFB236A46, SonicUnleashed, US, 0}, |
77 |
+ {0x8C913264, SonicUnleashed, EU, 0}, |
78 |
+--- a/pcsx2/GS/GSCrc.h |
79 |
++++ b/pcsx2/GS/GSCrc.h |
80 |
+@@ -91,6 +91,7 @@ public: |
81 |
+ US, |
82 |
+ EU, |
83 |
+ JP, |
84 |
++ JPUNDUB, |
85 |
+ RU, |
86 |
+ FR, |
87 |
+ DE, |
88 |
|
89 |
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild |
90 |
index 14345f880fa8..3885455b5d81 100644 |
91 |
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild |
92 |
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild |
93 |
@@ -61,6 +61,10 @@ FILECAPS=( |
94 |
-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 |
95 |
) |
96 |
|
97 |
+PATCHES=( |
98 |
+ "${FILESDIR}"/${PN}-1.7.0-crcs.patch |
99 |
+) |
100 |
+ |
101 |
pkg_setup() { |
102 |
if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then |
103 |
# -mxsave flag is needed when GCC >= 8.2 is used |
104 |
@@ -93,8 +97,8 @@ src_configure() { |
105 |
# if it something other than "Devel|Debug|Release" |
106 |
local CMAKE_BUILD_TYPE="Release" |
107 |
local mycmakeargs=( |
108 |
- -DARCH_FLAG= |
109 |
-DBUILD_SHARED_LIBS=FALSE |
110 |
+ -DDISABLE_ADVANCE_SIMD=TRUE |
111 |
-DDISABLE_BUILD_DATE=TRUE |
112 |
-DDISABLE_PCSX2_WRAPPER=TRUE |
113 |
-DDISABLE_SETCAP=TRUE |