1 |
commit: 717057acb2353e96dddbdcbddae8e34a4af23f93 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 29 16:15:05 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 20:28:53 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717057ac |
7 |
|
8 |
games-emulation/pcsx2: drop 1.7.3602 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
games-emulation/pcsx2/Manifest | 1 - |
13 |
.../pcsx2/files/pcsx2-1.7.3329-musl.patch | 9 - |
14 |
games-emulation/pcsx2/pcsx2-1.7.3602.ebuild | 242 --------------------- |
15 |
3 files changed, 252 deletions(-) |
16 |
|
17 |
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest |
18 |
index d2c09dbfd961..6866d173ca7c 100644 |
19 |
--- a/games-emulation/pcsx2/Manifest |
20 |
+++ b/games-emulation/pcsx2/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 |
23 |
-DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f |
24 |
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789 |
25 |
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e |
26 |
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c |
27 |
|
28 |
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch |
29 |
deleted file mode 100644 |
30 |
index 95d2ff38a8c2..000000000000 |
31 |
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch |
32 |
+++ /dev/null |
33 |
@@ -1,9 +0,0 @@ |
34 |
---- a/pcsx2/USB/qemu-usb/iov.h |
35 |
-+++ b/pcsx2/USB/qemu-usb/iov.h |
36 |
-@@ -17,5 +17,5 @@ |
37 |
- #define IOV_H |
38 |
- |
39 |
--#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) /* /usr/include/bits/uio.h */ |
40 |
-+#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) && !defined(__DEFINED_struct_iovec) |
41 |
- struct iovec |
42 |
- { |
43 |
|
44 |
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild |
45 |
deleted file mode 100644 |
46 |
index f2949fc2a844..000000000000 |
47 |
--- a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild |
48 |
+++ /dev/null |
49 |
@@ -1,242 +0,0 @@ |
50 |
-# Copyright 1999-2022 Gentoo Authors |
51 |
-# Distributed under the terms of the GNU General Public License v2 |
52 |
- |
53 |
-EAPI=8 |
54 |
- |
55 |
-WX_GTK_VER="3.0-gtk3" |
56 |
-inherit cmake fcaps flag-o-matic wxwidgets |
57 |
- |
58 |
-if [[ ${PV} == 9999 ]]; then |
59 |
- inherit git-r3 |
60 |
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git" |
61 |
-else |
62 |
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1 |
63 |
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96 |
64 |
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 |
65 |
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f |
66 |
- SRC_URI=" |
67 |
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
68 |
- https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz |
69 |
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz |
70 |
- https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz |
71 |
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz |
72 |
- vulkan? ( |
73 |
- https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz |
74 |
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz |
75 |
- https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz |
76 |
- -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz |
77 |
- )" |
78 |
- KEYWORDS="-* ~amd64" |
79 |
-fi |
80 |
- |
81 |
-DESCRIPTION="PlayStation 2 emulator" |
82 |
-HOMEPAGE="https://pcsx2.net/" |
83 |
- |
84 |
-LICENSE=" |
85 |
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ |
86 |
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain" |
87 |
-SLOT="0" |
88 |
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland" |
89 |
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support |
90 |
-RESTRICT="!test? ( test )" |
91 |
- |
92 |
-RDEPEND=" |
93 |
- app-arch/xz-utils |
94 |
- app-arch/zstd:= |
95 |
- dev-cpp/rapidyaml:= |
96 |
- dev-libs/libaio |
97 |
- dev-libs/libchdr |
98 |
- >=dev-libs/libfmt-7.1.3:= |
99 |
- dev-libs/libzip:=[zstd] |
100 |
- media-libs/harfbuzz |
101 |
- media-libs/libglvnd |
102 |
- media-libs/libpng:= |
103 |
- >=media-libs/libsdl2-2.0.22[haptic,joystick] |
104 |
- media-libs/libsoundtouch:= |
105 |
- net-libs/libpcap |
106 |
- sys-libs/zlib:= |
107 |
- virtual/libudev:= |
108 |
- x11-libs/libX11 |
109 |
- x11-libs/libXrandr |
110 |
- alsa? ( media-libs/alsa-lib ) |
111 |
- jack? ( virtual/jack ) |
112 |
- pulseaudio? ( media-libs/libpulse ) |
113 |
- qt6? ( |
114 |
- dev-qt/qtbase:6[gui,network,widgets] |
115 |
- dev-qt/qtsvg:6 |
116 |
- net-misc/curl |
117 |
- ) |
118 |
- !qt6? ( |
119 |
- dev-libs/glib:2 |
120 |
- media-libs/libsamplerate |
121 |
- x11-libs/gdk-pixbuf:2 |
122 |
- x11-libs/gtk+:3[wayland?] |
123 |
- x11-libs/wxGTK:${WX_GTK_VER}[X] |
124 |
- ) |
125 |
- sndio? ( media-sound/sndio:= ) |
126 |
- vulkan? ( media-libs/vulkan-loader ) |
127 |
- wayland? ( dev-libs/wayland )" |
128 |
-DEPEND=" |
129 |
- ${RDEPEND} |
130 |
- x11-base/xorg-proto |
131 |
- test? ( dev-cpp/gtest )" |
132 |
-BDEPEND=" |
133 |
- dev-lang/perl |
134 |
- qt6? ( dev-qt/qttools[linguist] ) |
135 |
- !qt6? ( sys-devel/gettext )" |
136 |
- |
137 |
-FILECAPS=( |
138 |
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 |
139 |
-) |
140 |
- |
141 |
-PATCHES=( |
142 |
- "${FILESDIR}"/${PN}-1.7.0-crcs.patch |
143 |
- "${FILESDIR}"/${PN}-1.7.3329-lto.patch |
144 |
- "${FILESDIR}"/${PN}-1.7.3329-musl.patch |
145 |
- "${FILESDIR}"/${PN}-1.7.3329-qt6.patch |
146 |
- "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch |
147 |
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch |
148 |
-) |
149 |
- |
150 |
-src_unpack() { |
151 |
- if [[ ${PV} == 9999 ]]; then |
152 |
- local EGIT_SUBMODULES=( |
153 |
- # has no build system and is not really setup for unbundling |
154 |
- 3rdparty/rcheevos/rcheevos |
155 |
- |
156 |
- # system rapidyaml is still used, but this uses another part |
157 |
- # of the source directly (fast_float) and so allow the submodule |
158 |
- # https://github.com/PCSX2/pcsx2/commit/af646e449 |
159 |
- 3rdparty/rapidyaml/rapidyaml |
160 |
- 3rdparty/rapidyaml/rapidyaml/extern/c4core |
161 |
- 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float |
162 |
- |
163 |
- # uses glslang's StandAlone/ResourceLimits.h unavailable with |
164 |
- # system's (also keep bundled vulkan-headers to be in sync) |
165 |
- $(usev vulkan ' |
166 |
- 3rdparty/glslang/glslang |
167 |
- 3rdparty/vulkan-headers') |
168 |
- ) |
169 |
- |
170 |
- git-r3_src_unpack |
171 |
- else |
172 |
- default |
173 |
- |
174 |
- mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die |
175 |
- mv fast_float-${HASH_FASTFLOAT} \ |
176 |
- "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die |
177 |
- |
178 |
- rmdir "${S}"/3rdparty/rcheevos/rcheevos || die |
179 |
- mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die |
180 |
- |
181 |
- if use vulkan; then |
182 |
- rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die |
183 |
- mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die |
184 |
- mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die |
185 |
- fi |
186 |
- fi |
187 |
-} |
188 |
- |
189 |
-src_prepare() { |
190 |
- # could depend on >=0.5 for unconditional, but rather not force it yet |
191 |
- # https://github.com/PCSX2/pcsx2/issues/7623 |
192 |
- has_version '>=dev-cpp/rapidyaml-0.5' && |
193 |
- eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch |
194 |
- |
195 |
- cmake_src_prepare |
196 |
- |
197 |
- # qt6 build doesn't support PACKAGE_MODE and need to set resources location |
198 |
- sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \ |
199 |
- -i pcsx2/Frontend/CommonHost.cpp || die |
200 |
- |
201 |
- # non-cubeb pulseaudio is only used for usb-mic without qt6, not output |
202 |
- use pulseaudio || :> cmake/FindPulseAudio.cmake || die |
203 |
- |
204 |
- if [[ ${PV} != 9999 ]]; then |
205 |
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \ |
206 |
- -i cmake/Pcsx2Utils.cmake || die |
207 |
- |
208 |
- # delete all 3rdparty/* except known-used ones in non-live |
209 |
- local keep=( |
210 |
- # TODO?: rapidjson and xbyak are packaged and could be unbundlable |
211 |
- # w/ patch, and discord-rpc be optional w/ dependency on rapidjson |
212 |
- cpuinfo cubeb discord-rpc glad imgui include jpgd lzma |
213 |
- rapidjson rapidyaml rcheevos simpleini xbyak zydis |
214 |
- $(usev vulkan 'glslang vulkan-headers') |
215 |
- ) |
216 |
- find 3rdparty -mindepth 1 -maxdepth 1 -type d \ |
217 |
- -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die |
218 |
- fi |
219 |
-} |
220 |
- |
221 |
-src_configure() { |
222 |
- use qt6 || setup-wxwidgets |
223 |
- |
224 |
- # for bundled glslang (bug #858374) |
225 |
- use vulkan && append-flags -fno-strict-aliasing |
226 |
- |
227 |
- local mycmakeargs=( |
228 |
- -DBUILD_SHARED_LIBS=no |
229 |
- -DDISABLE_BUILD_DATE=yes |
230 |
- -DDISABLE_PCSX2_WRAPPER=yes |
231 |
- -DDISABLE_SETCAP=yes |
232 |
- -DENABLE_TESTS=$(usex test) |
233 |
- -DPACKAGE_MODE=yes |
234 |
- -DQT_BUILD=$(usex qt6) |
235 |
- -DUSE_SYSTEM_LIBS=yes |
236 |
- -DUSE_VTUNE=no |
237 |
- -DUSE_VULKAN=$(usex vulkan) |
238 |
- -DWAYLAND_API=$(usex wayland) |
239 |
- -DXDG_STD=yes |
240 |
- |
241 |
- # sse4.1 is the bare minimum required, -m is required at build time |
242 |
- # (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp) |
243 |
- # https://github.com/PCSX2/pcsx2/pull/4329 |
244 |
- -DARCH_FLAG=-msse4.1 |
245 |
- |
246 |
- # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch |
247 |
- -DCHECK_ALSA=$(usex alsa) |
248 |
- -DCHECK_JACK=$(usex jack) |
249 |
- -DCHECK_PULSE=$(usex pulseaudio) |
250 |
- -DCHECK_SNDIO=$(usex sndio) |
251 |
- -DLAZY_LOAD_LIBS=no |
252 |
- ) |
253 |
- |
254 |
- cmake_src_configure |
255 |
-} |
256 |
- |
257 |
-src_test() { |
258 |
- cmake_build unittests |
259 |
-} |
260 |
- |
261 |
-src_install() { |
262 |
- cmake_src_install |
263 |
- |
264 |
- use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2 |
265 |
-} |
266 |
- |
267 |
-pkg_postinst() { |
268 |
- fcaps_pkg_postinst |
269 |
- |
270 |
- local replacing_old |
271 |
- if [[ ${REPLACING_VERSIONS##* } ]] && |
272 |
- ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1 |
273 |
- then |
274 |
- replacing_old= |
275 |
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case" |
276 |
- elog "it is recommended to backup your save states and memory cards before use." |
277 |
- elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'." |
278 |
- fi |
279 |
- |
280 |
- if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then |
281 |
- [[ -v replacing_old ]] && elog |
282 |
- elog "${PN}-1.7.x is a development branch using a nightly release model" |
283 |
- elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks" |
284 |
- elog "many notable features (e.g. native 64bit builds). Given it may be a long" |
285 |
- elog "time before there is a new stable, Gentoo will carry and update 1.7.x" |
286 |
- elog "roughly every months." |
287 |
- elog |
288 |
- elog "Please report an issue if feel a picked nightly release needs to be" |
289 |
- elog "updated ahead of time or masked (notably for handling regressions)." |
290 |
- fi |
291 |
-} |