1 |
commit: 20799a02b1ce02cd457cda4463c0bc5592d89d64 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 05:21:12 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 08:13:04 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20799a02 |
7 |
|
8 |
games-emulation/pcsx2: update live ebuild |
9 |
|
10 |
ebuild could use more attention before an eventual release (unbundling, |
11 |
re-checking options/deps, wayland, making tests run), but this is just |
12 |
quickfixes to at least let it build. |
13 |
|
14 |
Two new dependencies: |
15 |
* rapidyaml(new package): replaces yaml-cpp |
16 |
* cubeb(submodule): replaces portaudio |
17 |
pcsx2 isn't currently wired to use system's cubeb and it also isn't |
18 |
packaged, so use submodule for now -- but it'd be good to package it |
19 |
eventually given other packages like yuzu (which could be nice to have |
20 |
in ::gentoo eventually) can use it as well. An ebuild would also help |
21 |
for more proper backend support, but for now hard depend on pulseaudio |
22 |
given it's the only one it links with. The cubeb introduction in PCSX2 |
23 |
is very recent so it may also be good to wait and see. |
24 |
|
25 |
Also update licenses for cubeb(ISC) and libchdr(BSD). |
26 |
|
27 |
/usr/bin/PCSX2 was also renamed to pcsx2, update ebuild to match. |
28 |
Removed QA_* instead of updating them given the messages do not |
29 |
seem to trigger anymore. |
30 |
|
31 |
Runtime wasn't really tested, could be issues -- but it'd be expected |
32 |
with upstream changing things around. |
33 |
|
34 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
35 |
|
36 |
games-emulation/pcsx2/pcsx2-9999.ebuild | 40 ++++++++++++++++----------------- |
37 |
1 file changed, 19 insertions(+), 21 deletions(-) |
38 |
|
39 |
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild |
40 |
index 6c56bf44c0de..c80113c34e62 100644 |
41 |
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild |
42 |
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild |
43 |
@@ -1,4 +1,4 @@ |
44 |
-# Copyright 1999-2021 Gentoo Authors |
45 |
+# Copyright 1999-2022 Gentoo Authors |
46 |
# Distributed under the terms of the GNU General Public License v2 |
47 |
|
48 |
EAPI=7 |
49 |
@@ -9,9 +9,13 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets |
50 |
DESCRIPTION="A PlayStation 2 emulator" |
51 |
HOMEPAGE="https://pcsx2.net/" |
52 |
EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git" |
53 |
-EGIT_SUBMODULES=( 3rdparty/libchdr/libchdr ) |
54 |
+EGIT_SUBMODULES=( |
55 |
+ # TODO: unbundle |
56 |
+ 3rdparty/cubeb/cubeb |
57 |
+ 3rdparty/libchdr/libchdr |
58 |
+) |
59 |
|
60 |
-LICENSE="GPL-3" |
61 |
+LICENSE="GPL-3 BSD ISC" |
62 |
SLOT="0" |
63 |
KEYWORDS="" |
64 |
IUSE="test" |
65 |
@@ -19,33 +23,37 @@ IUSE="test" |
66 |
RESTRICT="!test? ( test )" |
67 |
|
68 |
RDEPEND=" |
69 |
- app-arch/bzip2 |
70 |
app-arch/xz-utils |
71 |
- dev-cpp/yaml-cpp:= |
72 |
+ dev-cpp/rapidyaml:= |
73 |
+ dev-libs/glib:2 |
74 |
dev-libs/libaio |
75 |
>=dev-libs/libfmt-7.1.3:= |
76 |
dev-libs/libxml2:2 |
77 |
media-libs/alsa-lib |
78 |
+ media-libs/freetype |
79 |
+ media-libs/libglvnd |
80 |
media-libs/libpng:= |
81 |
media-libs/libsamplerate |
82 |
media-libs/libsdl2[haptic,joystick,sound] |
83 |
- media-libs/libsoundtouch |
84 |
- media-libs/portaudio |
85 |
+ media-libs/libsoundtouch:= |
86 |
+ media-sound/pulseaudio |
87 |
net-libs/libpcap |
88 |
sys-libs/zlib |
89 |
- virtual/libudev |
90 |
- virtual/opengl |
91 |
+ virtual/libudev:= |
92 |
+ x11-libs/gdk-pixbuf:2 |
93 |
x11-libs/gtk+:3 |
94 |
x11-libs/libICE |
95 |
x11-libs/libX11 |
96 |
x11-libs/libXext |
97 |
x11-libs/wxGTK:${WX_GTK_VER}[X] |
98 |
" |
99 |
-DEPEND="${RDEPEND}" |
100 |
+DEPEND=" |
101 |
+ ${RDEPEND} |
102 |
+ x11-base/xorg-proto" |
103 |
BDEPEND="test? ( dev-cpp/gtest )" |
104 |
|
105 |
FILECAPS=( |
106 |
- -m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2 |
107 |
+ -m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 |
108 |
) |
109 |
|
110 |
pkg_setup() { |
111 |
@@ -73,7 +81,6 @@ src_configure() { |
112 |
-DDISABLE_PCSX2_WRAPPER=TRUE |
113 |
-DDISABLE_SETCAP=TRUE |
114 |
-DENABLE_TESTS="$(usex test)" |
115 |
- -DOPTIMIZATION_FLAG= |
116 |
-DPACKAGE_MODE=TRUE |
117 |
-DXDG_STD=TRUE |
118 |
|
119 |
@@ -87,12 +94,3 @@ src_configure() { |
120 |
setup-wxwidgets |
121 |
cmake_src_configure |
122 |
} |
123 |
- |
124 |
-src_install() { |
125 |
- # Upstream issues: |
126 |
- # https://github.com/PCSX2/pcsx2/issues/417 |
127 |
- # https://github.com/PCSX2/pcsx2/issues/3077 |
128 |
- QA_EXECSTACK="usr/bin/PCSX2" |
129 |
- QA_TEXTRELS="usr/$(get_libdir)/PCSX2/* usr/bin/PCSX2" |
130 |
- cmake_src_install |
131 |
-} |