[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: 5880e274502f29f69c921ed16320d8fcc80def36
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu May 23 00:46:34 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu May 23 00:48:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5880e274
games-emulation/pcsx2: drop obsolete patch
Still applies but been fixed upstream, wasn't neccessary
for the last bump either.
Signed-off-by: Ionen Wolkens gentoo.org>
.../pcsx2/files/pcsx2-1.7.5817-missing-headers.patch | 18 --
games-emulation/pcsx2/pcsx2-1.7.5835.ebuild| 1 -
games-emulation/pcsx2/pcsx2-.ebuild| 1 -
3 files changed, 20 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
deleted file mode 100644
index d8d341a7dea1..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-ThreadedFileReader.cpp:37:4: error: use of undeclared identifier 'memcpy'
-defs.h:78:14: error: no member named 'clamp' in namespace 'std'
a/pcsx2/CDVD/ThreadedFileReader.h
-+++ b/pcsx2/CDVD/ThreadedFileReader.h
-@@ -10,4 +10,5 @@
- #include
- #include
-+#include
-
- class Error;
a/pcsx2/SPU2/defs.h
-+++ b/pcsx2/SPU2/defs.h
-@@ -6,4 +6,5 @@
- #include "GS/MultiISA.h"
-
-+#include
- #include
-
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index 295c925c4305..3b09dfdebe2d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 295c925c4305..3b09dfdebe2d 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 39ee5dd284c74c4feb4402e08463042cdeef2f91
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue May 21 17:30:43 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue May 21 17:39:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ee5dd2
games-emulation/pcsx2: add 1.7.5835
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 175
2 files changed, 176 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 895637e5b424..201c1e51c713 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B
3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd
SHA512
60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B
773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4
SHA512
1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d
+DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B
537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f
SHA512
7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
new file mode 100644
index ..295c925c4305
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/lz4:=
+ app-arch/zstd:=
+ dev-qt/qtbase:6[concurrent,gui,widgets]
+ dev-qt/qtsvg:6
+ media-libs/freetype
+ media-libs/libglvnd[X]
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsdl2[haptic,joystick]
+ media-libs/libwebp:=
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? (
+ media-libs/shaderc
+ media-libs/vulkan-loader
+ )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ clang? ( sys-devel/clang:* )
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
+ "${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+
+ # relax Qt6 and SDL2 version requirements which often get restricted
+ # without a specific need, please report a bug to Gentoo (not upstream)
+ # if a still-available older version is really causing issues
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: de916e3ad11a728544603942e2093c2c4888fb44
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue May 21 17:10:24 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue May 21 17:19:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de916e3a
games-emulation/pcsx2: update live for upstream's shaderc changes
Hardly tested beside running a game + a valid shader using vulkan,
please report bugs to Gentoo if there is anything up with this that
cannot be reproduced with upstream's AppImage.
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/pcsx2-1.7.5835-vanilla-shaderc.patch | 49 ++
games-emulation/pcsx2/pcsx2-.ebuild| 4 +-
2 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch
new file mode 100644
index ..e9c06fb07a5c
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch
@@ -0,0 +1,49 @@
+PCSX2 upstream modifies shaderc[1][2][3] rendering its code incompatible
+with vanilla. We'd rather not package this modified shaderc if it can
+reasonably be avoided, so this does minimal code changes to allow vanilla
+usage.
+
+Disclaimer: as the author of this patch, be warned that I can hardly claim
+to know neither C++ nor shaderc, so it could very well be wrong. If run into
+vulkan/shaderc-related issues, try to reproduce with upstream's AppImage
+before reporting bugs to them as they offer no support for distros' builds.
+
+[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646
+[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260
+[3] https://github.com/PCSX2/pcsx2/commit/ff7995f0d6caaac
+
+Signed-off-by: Ionen Wolkens
+--- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
+@@ -109,5 +109,5 @@
+ X(shaderc_compile_options_set_optimization_level) \
+ X(shaderc_compile_options_set_target_env) \
+- X(shaderc_compilation_status_to_string) \
++ X(shaderc_result_get_compilation_status) \
+ X(shaderc_compile_into_spv) \
+ X(shaderc_result_release) \
+@@ -217,19 +217,16 @@
+ dyn_shaderc::shaderc_compile_options_set_source_language(options,
shaderc_source_language_glsl);
+ dyn_shaderc::shaderc_compile_options_set_target_env(options,
shaderc_target_env_vulkan, 0);
+- dyn_shaderc::shaderc_compile_options_set_generate_debug_info(options,
debug,
+- debug &&
GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info);
++ dyn_shaderc::shaderc_compile_options_set_generate_debug_info(options);
+ dyn_shaderc::shaderc_compile_options_set_optimization_level(
+ options, debug ? shaderc_optimization_level_zero :
shaderc_optimization_level_performance);
+
+- shaderc_compilation_result_t result;
+- const shaderc_compilation_status status =
dyn_shaderc::shaderc_compile_into_spv(
++ shaderc_compilation_result_t result =
dyn_shaderc::shaderc_compile_into_spv(
+ dyn_shaderc::s_compiler, source.data(), source.length(),
static_cast(stage), "source",
+- "main", options, );
+- if (status != shaderc_compilation_status_success)
++ "main", options);
++ if (dyn_shaderc::shaderc_result_get_compilation_status(result) !=
shaderc_compilation_status_success)
+ {
+ const std::string_view errors(result ?
dyn_shaderc::shaderc_result_get_error_message(result) :
+
"null result object");
+- ERROR_LOG("Failed to compile shader to SPIR-V: {}\n{}",
+-
dyn_shaderc::shaderc_compilation_status_to_string(status), errors);
++ ERROR_LOG("Failed to compile shader to SPIR-V: {}", errors);
+ DumpBadShader(source, errors);
+ }
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 643fe6a2b122..295c925c4305 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio
test vulkan wayland
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
-# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
COMMON_DEPEND="
app-arch/lz4:=
app-arch/zstd:=
@@ -78,8 +78,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
"${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
+ "${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: d09ffa75a9a07a02a6060fef6d76268832b23ba2
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri May 17 04:59:16 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri May 17 05:14:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09ffa75
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens gentoo.org>
.../pcsx2/files/pcsx2-1.7.5817-missing-headers.patch | 18 ++
games-emulation/pcsx2/pcsx2-.ebuild| 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
new file mode 100644
index ..d8d341a7dea1
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5817-missing-headers.patch
@@ -0,0 +1,18 @@
+ThreadedFileReader.cpp:37:4: error: use of undeclared identifier 'memcpy'
+defs.h:78:14: error: no member named 'clamp' in namespace 'std'
+--- a/pcsx2/CDVD/ThreadedFileReader.h
b/pcsx2/CDVD/ThreadedFileReader.h
+@@ -10,4 +10,5 @@
+ #include
+ #include
++#include
+
+ class Error;
+--- a/pcsx2/SPU2/defs.h
b/pcsx2/SPU2/defs.h
+@@ -6,4 +6,5 @@
+ #include "GS/MultiISA.h"
+
++#include
+ #include
+
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 69486b68cc68..643fe6a2b122 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -31,7 +31,6 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
app-arch/lz4:=
app-arch/zstd:=
- dev-libs/libaio
dev-qt/qtbase:6[concurrent,gui,widgets]
dev-qt/qtsvg:6
media-libs/freetype
@@ -80,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
+ "${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 6e84d051c84ffbf63ec5146b6a1a3a4b0d7d7050
Author: Joonas Niilola gentoo org>
AuthorDate: Mon May 13 05:27:38 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon May 13 05:27:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e84d051
games-emulation/pcsx2: Stabilize 1.7.5724 amd64, #931830
Signed-off-by: Joonas Niilola gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
index 634e5d0a4e32..1bf5c7c73e38 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -12,7 +12,7 @@ else
# unbundling on this package has become unmaintainable and, rather than
# handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
+ KEYWORDS="-* amd64"
fi
DESCRIPTION="PlayStation 2 emulator"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: b23bc2d3b322c8dd4ddc34ad7d7ceba1574e5e36
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 26 13:06:36 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 26 13:06:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23bc2d3
games-emulation/pcsx2: add link in comment about wayland too
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index d8fea1ceb110..69486b68cc68 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -114,9 +114,10 @@ src_configure() {
-DUSE_VTUNE=no
-DUSE_VULKAN=$(usex vulkan)
- # Note that upstream hardly support wayland, may or may not work
+ # note that upstream hardly support native wayland, may or may
not work
+ # https://github.com/PCSX2/pcsx2/pull/10179
-DWAYLAND_API=$(usex wayland)
- # Not optional given libX11 is hard-required either way and
upstream
+ # not optional given libX11 is hard-required either way and
upstream
# seemingly has no intention to drop the requirement at the
moment
# https://github.com/PCSX2/pcsx2/issues/11149
-DX11_API=yes
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 875047b58fb944e418c67286d47154895a77079c
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 26 12:38:33 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 26 13:01:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875047b5
games-emulation/pcsx2: extend comment about x11/wayland apis
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 5c49263139b5..23abb02ad48f 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -113,8 +113,13 @@ src_configure() {
-DUSE_LINKED_FFMPEG=yes
-DUSE_VTUNE=no
-DUSE_VULKAN=$(usex vulkan)
+
+ # Note that upstream hardly support wayland, may or may not work
-DWAYLAND_API=$(usex wayland)
- -DX11_API=yes # X libs are currently hard-required either way
+ # Not optional given libX11 is hard-required either way and
upstream
+ # seemingly has no intention to drop the requirement at the
moment
+ # https://github.com/PCSX2/pcsx2/issues/11149
+ -DX11_API=yes
# not packaged due to bug #885471, but still disable for no
automagic
-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 79002c26340590f597b01953215546a758c9e239
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 26 12:49:59 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 26 13:01:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79002c26
games-emulation/pcsx2: optfeature on alsa-utils/gst-plugins-base
Unlikely to be (both) missing on the average desktop system but warn
in case given upstream ranted about someone not having alsa-utils
on Arch in the linked issue and it could very well happen here too.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 6 +-
games-emulation/pcsx2/pcsx2-.ebuild | 8 +++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
index 5c49263139b5..634e5d0a4e32 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
if [[ ${PV} == ]]; then
inherit git-r3
@@ -152,6 +152,10 @@ src_install() {
pkg_postinst() {
fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
+ # calls aplay (or gst-play/launch-1.0 as fallback in next version)
+ # https://github.com/PCSX2/pcsx2/issues/11141
+ optfeature "UI sound effects support" media-sound/alsa-utils
+
if [[ ${REPLACING_VERSIONS##* } ]] &&
ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
elog ">=${PN}-1.7 has received several changes since
<=${PN}-1.6.0, and is"
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 23abb02ad48f..d8fea1ceb110 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
if [[ ${PV} == ]]; then
inherit git-r3
@@ -157,6 +157,12 @@ src_install() {
pkg_postinst() {
fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
+ # calls aplay or gst-play/launch-1.0 as fallback
+ # https://github.com/PCSX2/pcsx2/issues/11141
+ optfeature "UI sound effects support" \
+ media-sound/alsa-utils \
+ media-libs/gst-plugins-base:1.0
+
if [[ ${REPLACING_VERSIONS##* } ]] &&
ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
elog ">=${PN}-1.7 has received several changes since
<=${PN}-1.6.0, and is"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5d9a3785c0e4c9c5055b8724612df53cf1ab6e27 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Apr 22 07:16:56 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Apr 22 07:24:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9a3785 games-emulation/pcsx2: update dlopen comment No longer links directly with it, but still using glad for dlopen. Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 2 +- games-emulation/pcsx2/pcsx2-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild index b1a0cb87549d..5c49263139b5 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild @@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support RESTRICT="!test? ( test )" -# dlopen: qtsvg, vulkan-loader, wayland +# dlopen: libglvnd, qtsvg, vulkan-loader, wayland COMMON_DEPEND=" app-arch/lz4:= app-arch/zstd:= diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index b1a0cb87549d..5c49263139b5 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support RESTRICT="!test? ( test )" -# dlopen: qtsvg, vulkan-loader, wayland +# dlopen: libglvnd, qtsvg, vulkan-loader, wayland COMMON_DEPEND=" app-arch/lz4:= app-arch/zstd:=
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 02f80de36e6b9d927e8f594de8cca69ba8625506
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Apr 22 06:28:08 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Apr 22 07:24:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f80de3
games-emulation/pcsx2: drop 1.7.5474, 1.7.5560
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 2 -
games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 161
games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 161
3 files changed, 324 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d60f8d26c7f6..1b49ba4dc5f0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1 @@
-DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B
2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d
SHA512
261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
-DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B
d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43
SHA512
ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B
3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd
SHA512
60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
deleted file mode 100644
index b53145e648db..
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- # unbundling on this package has become unmaintainable and, rather than
- # handle submodules separately, using a tarball that includes them
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/lz4:=
- app-arch/xz-utils
- app-arch/zstd:=
- dev-libs/libaio
- dev-qt/qtbase:6[concurrent,gui,widgets]
- dev-qt/qtsvg:6
- media-libs/libglvnd[X]
- media-libs/libpng:=
- media-libs/libsdl2[haptic,joystick]
- media-libs/libwebp:=
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/qttools:6[linguist]
- clang? ( sys-devel/clang:* )
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
- "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
- -i cmake/Pcsx2Utils.cmake || die
- fi
-
- # relax Qt6 and SDL2 version requirements which often get restricted
- # without a specific need, please report a bug to Gentoo (not upstream)
- # if a still-available older version is really causing issues
- sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
- -i cmake/SearchForStuff.cmake || die
-}
-
-src_configure() {
- # note that upstream
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: d02ee6353c2d370547b34c7b763b8b7de37dca75
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Apr 22 07:10:04 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Apr 22 07:24:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02ee635
games-emulation/pcsx2: add 1.7.5724
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 163
2 files changed, 164 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 1b49ba4dc5f0..895637e5b424 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,2 @@
DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B
3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd
SHA512
60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
+DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B
773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4
SHA512
1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
new file mode 100644
index ..b1a0cb87549d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/lz4:=
+ app-arch/zstd:=
+ dev-libs/libaio
+ dev-qt/qtbase:6[concurrent,gui,widgets]
+ dev-qt/qtsvg:6
+ media-libs/freetype
+ media-libs/libglvnd[X]
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsdl2[haptic,joystick]
+ media-libs/libwebp:=
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? (
+ media-libs/shaderc
+ media-libs/vulkan-loader
+ )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ clang? ( sys-devel/clang:* )
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+
+ # relax Qt6 and SDL2 version requirements which often get restricted
+ # without a specific need, please report a bug to Gentoo (not upstream)
+ # if a still-available older version is really causing issues
+ sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+ -i cmake/SearchForStuff.cmake || die
+}
+
+src_configure() {
+ # note that upstream only supports clang and ignores gcc issues, e.g.
+ # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+ # (CMakeLists.txt also gives a big warning if compiler is not clang)
+ if use clang && ! tc-is-clang; then
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: fa7a60f4742c5599d49d055bcbece43e3e3a3deb
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Apr 13 17:26:33 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Apr 13 17:29:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7a60f4
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens gentoo.org>
.../pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch | 18 ++
games-emulation/pcsx2/pcsx2-.ebuild| 1 +
2 files changed, 19 insertions(+)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
new file mode 100644
index ..aa447b30b6fc
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
@@ -0,0 +1,18 @@
+This does not exist in normal shaderc and was modified[1] by PCSX2
+for use in their CI/appimage making it impossible to use system's
+(despite they do not bundle it). So not much choices but to remove
+usage.
+
+Partial (for simplification) revert of [2], hopefully temporary.
+
+[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646
+[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260
+--- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
+@@ -113,6 +113,4 @@
+ {
+ options.SetGenerateDebugInfo();
+- if
(GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info)
+- options.SetEmitNonSemanticDebugInfo();
+
+ options.SetOptimizationLevel(shaderc_optimization_level_zero);
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 2ca40ad4ee99..b1a0cb87549d 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2bd1ce7d2accd459fb4eba76e5e9e53835c0c046
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Apr 10 06:05:43 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Apr 10 06:06:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd1ce7d
games-emulation/pcsx2: Stabilize 1.7.5624 amd64, #929002
Signed-off-by: Joonas Niilola gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5624.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
index 04d9d27fa7e1..b53145e648db 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
@@ -12,7 +12,7 @@ else
# unbundling on this package has become unmaintainable and, rather than
# handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
+ KEYWORDS="-* amd64"
fi
DESCRIPTION="PlayStation 2 emulator"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2b86086f0303322143aa374dcb821d1899272183
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Apr 7 12:18:18 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Apr 7 12:29:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b86086f
games-emulation/pcsx2: update live
Bundled glslang is finally gone (traded for system shaderc), so can
remove -fno-sa too.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 004ac26d3f65..2ca40ad4ee99 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
dev-libs/libaio
dev-qt/qtbase:6[concurrent,gui,widgets]
dev-qt/qtsvg:6
+ media-libs/freetype
media-libs/libglvnd[X]
media-libs/libjpeg-turbo:=
media-libs/libpng:=
@@ -50,7 +51,10 @@ COMMON_DEPEND="
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
+ vulkan? (
+ media-libs/shaderc
+ media-libs/vulkan-loader
+ )
wayland? ( dev-libs/wayland )
"
# patches is a optfeature but always pull given PCSX2 complaints if it
@@ -101,9 +105,6 @@ src_configure() {
strip-unsupported-flags
fi
- # for bundled old glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
-
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_ADVANCE_SIMD=yes
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: bf85a43216b442ee0c34e2aec8dad6b6506ce737 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Apr 6 08:02:57 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Apr 6 08:03:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf85a432 games-emulation/pcsx2: update live Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 5edb77a7b841..004ac26d3f65 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -35,6 +35,7 @@ COMMON_DEPEND=" dev-qt/qtbase:6[concurrent,gui,widgets] dev-qt/qtsvg:6 media-libs/libglvnd[X] + media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2[haptic,joystick] media-libs/libwebp:=
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2cfe0e3557ed857b63bec7d9e1969cc8a96068e6 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Mar 31 12:01:35 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Mar 31 12:09:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfe0e35 games-emulation/pcsx2: update live Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 04d9d27fa7e1..5edb77a7b841 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -30,7 +30,6 @@ RESTRICT="!test? ( test )" # dlopen: qtsvg, vulkan-loader, wayland COMMON_DEPEND=" app-arch/lz4:= - app-arch/xz-utils app-arch/zstd:= dev-libs/libaio dev-qt/qtbase:6[concurrent,gui,widgets]
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5d2914d102cd4e120d37f628d1d2e5b49cb850d8
Author: Joonas Niilola gentoo org>
AuthorDate: Thu Mar 21 06:37:11 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Mar 21 06:37:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2914d1
games-emulation/pcsx2: Stabilize 1.7.5560 amd64, #927318
Signed-off-by: Joonas Niilola gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
index 04d9d27fa7e1..b53145e648db 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
@@ -12,7 +12,7 @@ else
# unbundling on this package has become unmaintainable and, rather than
# handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
+ KEYWORDS="-* amd64"
fi
DESCRIPTION="PlayStation 2 emulator"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 0fe71912cf6332849f47c1a7612d13edefe5071d
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Mar 20 06:32:32 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Mar 20 07:01:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe71912
games-emulation/pcsx2: add 1.7.5624
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5624.ebuild | 161
2 files changed, 162 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 49389ef7b07e..d60f8d26c7f6 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B
2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d
SHA512
261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B
d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43
SHA512
ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
+DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B
3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd
SHA512
60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
new file mode 100644
index ..04d9d27fa7e1
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/lz4:=
+ app-arch/xz-utils
+ app-arch/zstd:=
+ dev-libs/libaio
+ dev-qt/qtbase:6[concurrent,gui,widgets]
+ dev-qt/qtsvg:6
+ media-libs/libglvnd[X]
+ media-libs/libpng:=
+ media-libs/libsdl2[haptic,joystick]
+ media-libs/libwebp:=
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? ( media-libs/vulkan-loader )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ clang? ( sys-devel/clang:* )
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+
+ # relax Qt6 and SDL2 version requirements which often get restricted
+ # without a specific need, please report a bug to Gentoo (not upstream)
+ # if a still-available older version is really causing issues
+ sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+ -i cmake/SearchForStuff.cmake || die
+}
+
+src_configure() {
+ # note that upstream only supports clang and ignores gcc issues, e.g.
+ #
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: db171da487e687bc393c3b413480a8c276a716fc
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Mar 20 05:18:22 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Mar 20 07:01:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db171da4
games-emulation/pcsx2: drop 1.7.5312
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../pcsx2/files/pcsx2-1.7.3773-lto.patch | 9 --
games-emulation/pcsx2/pcsx2-1.7.5312.ebuild| 155 -
3 files changed, 165 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 050847187f99..49389ef7b07e 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,2 @@
-DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B
ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd
SHA512
6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B
2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d
SHA512
261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B
d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43
SHA512
ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
deleted file mode 100644
index cd0574bd5653..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Don't rely on the cmake macro to pass -fno-lto to the problematic
-FastJmp.cpp so that it works if users add -flto themselves.
a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -275,3 +275,3 @@
-
--if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-+if (USE_GCC)
- # GCC LTO doesn't work with asm statements
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
deleted file mode 100644
index 5e4249cd5a8e..
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- # unbundling on this package has become unmaintainable and, rather than
- # handle submodules separately, using a tarball that includes them
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/xz-utils
- dev-libs/libaio
- dev-qt/qtbase:6[concurrent,gui,widgets]
- dev-qt/qtsvg:6
- media-libs/libglvnd[X]
- media-libs/libpng:=
- media-libs/libsdl2[haptic,joystick]
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/qttools:6[linguist]
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
- "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != ]]; then
- sed -e
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 3fb4f8ac47f4e033a9ea5411b672c190ca46ac0a Author: Ionen Wolkens gentoo org> AuthorDate: Sat Mar 2 14:42:40 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Mar 2 14:46:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb4f8ac games-emulation/pcsx2: depend on qtbase[concurrent] cmake does not check for it but it makes some header-only usage. Could be DEPEND-only but given the logic in the header prefer to make that rdepend to be safe (that is hardly worth disabling anyway). Not worth a revbump. Closes: https://bugs.gentoo.org/926037 Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 2 +- games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 2 +- games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 2 +- games-emulation/pcsx2/pcsx2-.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild index b7ca1ce4e8ff..5e4249cd5a8e 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild @@ -31,7 +31,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" app-arch/xz-utils dev-libs/libaio - dev-qt/qtbase:6[gui,widgets] + dev-qt/qtbase:6[concurrent,gui,widgets] dev-qt/qtsvg:6 media-libs/libglvnd[X] media-libs/libpng:= diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild index c7fbc6aaca10..b53145e648db 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild @@ -33,7 +33,7 @@ COMMON_DEPEND=" app-arch/xz-utils app-arch/zstd:= dev-libs/libaio - dev-qt/qtbase:6[gui,widgets] + dev-qt/qtbase:6[concurrent,gui,widgets] dev-qt/qtsvg:6 media-libs/libglvnd[X] media-libs/libpng:= diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild index 8a507c1db80d..04d9d27fa7e1 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild @@ -33,7 +33,7 @@ COMMON_DEPEND=" app-arch/xz-utils app-arch/zstd:= dev-libs/libaio - dev-qt/qtbase:6[gui,widgets] + dev-qt/qtbase:6[concurrent,gui,widgets] dev-qt/qtsvg:6 media-libs/libglvnd[X] media-libs/libpng:= diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 8a507c1db80d..04d9d27fa7e1 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -33,7 +33,7 @@ COMMON_DEPEND=" app-arch/xz-utils app-arch/zstd:= dev-libs/libaio - dev-qt/qtbase:6[gui,widgets] + dev-qt/qtbase:6[concurrent,gui,widgets] dev-qt/qtsvg:6 media-libs/libglvnd[X] media-libs/libpng:=
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: b6d259e4e62559c09c51e766b45298a70c976dcc Author: Ionen Wolkens gentoo org> AuthorDate: Sun Feb 18 18:21:17 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Feb 18 18:26:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d259e4 games-emulation/pcsx2: depend on libglvnd[X] No need for a revbump given it does not *actually* link with libGLX but looks for it during configure time. It could be interesting to force it to be optional (or at least not last time I tried, but given X libraries currently cannot be optional either way (and upstream advise against using the wayland support) it's likely not worth the extra trouble. Will revisit if ever add a proper USE=X to pcsx2. Bug: https://bugs.gentoo.org/924765 Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 2 +- games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 2 +- games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 2 +- games-emulation/pcsx2/pcsx2-.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild index a675a321a728..b7ca1ce4e8ff 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild @@ -33,7 +33,7 @@ COMMON_DEPEND=" dev-libs/libaio dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 - media-libs/libglvnd + media-libs/libglvnd[X] media-libs/libpng:= media-libs/libsdl2[haptic,joystick] media-video/ffmpeg:= diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild index 9521bddc7fc8..c7fbc6aaca10 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" dev-libs/libaio dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 - media-libs/libglvnd + media-libs/libglvnd[X] media-libs/libpng:= media-libs/libsdl2[haptic,joystick] media-libs/libwebp:= diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild index 9810fcf44af1..8a507c1db80d 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" dev-libs/libaio dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 - media-libs/libglvnd + media-libs/libglvnd[X] media-libs/libpng:= media-libs/libsdl2[haptic,joystick] media-libs/libwebp:= diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 9810fcf44af1..8a507c1db80d 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" dev-libs/libaio dev-qt/qtbase:6[gui,widgets] dev-qt/qtsvg:6 - media-libs/libglvnd + media-libs/libglvnd[X] media-libs/libpng:= media-libs/libsdl2[haptic,joystick] media-libs/libwebp:=
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 4ead727e16ab917b6f7b1608549da6ed1424b72a
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Feb 18 08:06:54 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Feb 18 08:07:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ead727e
games-emulation/pcsx2: Stabilize 1.7.5474 amd64, #924765
Signed-off-by: Joonas Niilola gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
index 9810fcf44af1..9521bddc7fc8 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
@@ -12,7 +12,7 @@ else
# unbundling on this package has become unmaintainable and, rather than
# handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
+ KEYWORDS="-* amd64"
fi
DESCRIPTION="PlayStation 2 emulator"
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 162455cc85593d8bf949869e131fe715533593da
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Feb 17 10:14:45 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Feb 17 10:19:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162455cc
games-emulation/pcsx2: add 1.7.5560
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 161
2 files changed, 162 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 4608e70cee79..050847187f99 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B
ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd
SHA512
6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B
2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d
SHA512
261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
+DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B
d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43
SHA512
ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
new file mode 100644
index ..9810fcf44af1
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/lz4:=
+ app-arch/xz-utils
+ app-arch/zstd:=
+ dev-libs/libaio
+ dev-qt/qtbase:6[gui,widgets]
+ dev-qt/qtsvg:6
+ media-libs/libglvnd
+ media-libs/libpng:=
+ media-libs/libsdl2[haptic,joystick]
+ media-libs/libwebp:=
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? ( media-libs/vulkan-loader )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ clang? ( sys-devel/clang:* )
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+
+ # relax Qt6 and SDL2 version requirements which often get restricted
+ # without a specific need, please report a bug to Gentoo (not upstream)
+ # if a still-available older version is really causing issues
+ sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+ -i cmake/SearchForStuff.cmake || die
+}
+
+src_configure() {
+ # note that upstream only supports clang and ignores gcc issues, e.g.
+ #
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, profiles/base/
commit: 02038f740f159241bb3e7a1871e2fecb22da974e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Feb 17 09:59:00 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Feb 17 10:19:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02038f74
games-emulation/pcsx2: add (forced) IUSE=+clang
Makes what is happening clearer to users, and gives the option to
force-disable it (through /etc/portage/profile) if really wanted.
Albeit doing so will currently fail to build without patches which
upstream is unlikely to accept given they took a clang-only stance
and ignore bugs (thus being forced).
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/metadata.xml | 5 +
games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 8
games-emulation/pcsx2/pcsx2-.ebuild | 8
profiles/base/package.use.force | 6 ++
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/games-emulation/pcsx2/metadata.xml
b/games-emulation/pcsx2/metadata.xml
index 6e25d9d61e5b..ddf894bc0a0f 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,6 +14,11 @@
Gentoo Games Project
+
+ Use Clang compiler to build (the only compiler that is
+ currently supported by upstream on Linux, do not report
+ bugs if force-disabled)
+
Enable support for the
media-sound/sndio backend
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
index 5166d24d2965..9810fcf44af1 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
@@ -23,7 +23,7 @@ LICENSE="
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
"
SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -65,7 +65,7 @@ DEPEND="
"
BDEPEND="
dev-qt/qttools:6[linguist]
- sys-devel/clang:*
+ clang? ( sys-devel/clang:* )
wayland? (
dev-util/wayland-scanner
kde-frameworks/extra-cmake-modules
@@ -93,10 +93,10 @@ src_prepare() {
}
src_configure() {
- # upstream only supports clang and ignores gcc issues, e.g.
+ # note that upstream only supports clang and ignores gcc issues, e.g.
# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
# (CMakeLists.txt also gives a big warning if compiler is not clang)
- if ! tc-is-clang; then
+ if use clang && ! tc-is-clang; then
local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
strip-unsupported-flags
fi
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 5166d24d2965..9810fcf44af1 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -23,7 +23,7 @@ LICENSE="
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
"
SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan
wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -65,7 +65,7 @@ DEPEND="
"
BDEPEND="
dev-qt/qttools:6[linguist]
- sys-devel/clang:*
+ clang? ( sys-devel/clang:* )
wayland? (
dev-util/wayland-scanner
kde-frameworks/extra-cmake-modules
@@ -93,10 +93,10 @@ src_prepare() {
}
src_configure() {
- # upstream only supports clang and ignores gcc issues, e.g.
+ # note that upstream only supports clang and ignores gcc issues, e.g.
# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
# (CMakeLists.txt also gives a big warning if compiler is not clang)
- if ! tc-is-clang; then
+ if use clang && ! tc-is-clang; then
local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
strip-unsupported-flags
fi
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e50d568231f8..7430401bf4b8 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,12 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Ionen Wolkens (2024-02-17)
+# Currently fails to build with gcc, and either way the current upstream
+# makes it clear that non-clang is not a supported configuration.
+# Please do not report bugs if disabled unless upstream's stance changed.
+games-emulation/pcsx2 clang
+
# Matt Turner
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2e17aeea244e5bd84ea37a04881b3a8cbaf8ea00
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jan 17 12:39:56 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jan 17 14:41:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e17aeea
games-emulation/pcsx2: extend clang comment
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 328235f14174..5166d24d2965 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -95,6 +95,7 @@ src_prepare() {
src_configure() {
# upstream only supports clang and ignores gcc issues, e.g.
# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+ # (CMakeLists.txt also gives a big warning if compiler is not clang)
if ! tc-is-clang; then
local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
strip-unsupported-flags
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/, ...
commit: c75f09735b89ba465ad543ec885718a77566643a
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 15 04:58:25 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 15 07:26:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75f0973
games-emulation/pcsx2: drop 1.6.0-r3
See bug #922149 for what motivated dropping it even though
it's the upstream stable release.
Note that this drops the x86 keyword, upstream does not
support that anymore (only amd64+sse4.1 is supported).
wrt bug #884825, there is no pcsx2 version left using system
soundtouch.
Closes: https://bugs.gentoo.org/884825
Closes: https://bugs.gentoo.org/922149
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../pcsx2/files/pcsx2-1.6.0-disable-setcap.patch | 49 --
.../pcsx2/files/pcsx2-1.6.0-wx-config.patch| 20
games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild| 105 -
profiles/arch/amd64/no-multilib/package.mask | 1 -
5 files changed, 176 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index da9e1fbded42..35c955606c1c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1 @@
-DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B
ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd
SHA512
6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
b/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
deleted file mode 100644
index 07040b62b91b..
--- a/games-emulation/pcsx2/files/pcsx2-1.6.0-disable-setcap.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4366d2973316a6c250a17cf9a170f187e2ed9f93 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov
-Date: Sat, 17 Oct 2020 12:05:36 +0400
-Subject: [PATCH] Added cmake options to bypass setcap execution.
-
-This call became a problem with distributions (eg Gentoo GNU/Linux) that
-builds PCSX2 in sandboxed environment which disallows setcap execution.
-
-Signed-off-by: Yuri Konotopov
- cmake/BuildParameters.cmake | 1 +
- pcsx2/CMakeLists.txt| 10 ++
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
-index 235bdb8e5..a3ff0041f 100644
a/cmake/BuildParameters.cmake
-+++ b/cmake/BuildParameters.cmake
-@@ -46,6 +46,7 @@ option(GSDX_LEGACY "Build a GSdx legacy plugin compatible
with GL3.3")
- option(PACKAGE_MODE "Use this option to ease packaging of PCSX2
(developer/distribution option)")
- option(DISABLE_CHEATS_ZIP "Disable including the cheats_ws.zip file")
- option(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file")
-+option(DISABLE_SETCAP "Do not set files capabilities")
- option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
- option(EXTRA_PLUGINS "Build various 'extra' plugins")
- option(SDL2_API "Use SDL2 on spu2x and onepad (wxWidget mustn't be built with
SDL1.2 support" ON)
-diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
-index 6839089d7..6e129caca 100644
a/pcsx2/CMakeLists.txt
-+++ b/pcsx2/CMakeLists.txt
-@@ -739,9 +739,11 @@ endif()
- add_pcsx2_executable(${Output} "${pcsx2FinalSources}" "${pcsx2FinalLibs}"
"${pcsx2FinalFlags}")
-
- if(dev9ghzdrk)
--if(PACKAGE_MODE)
--install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling
networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo
setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
--else()
--install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling
networking capability on Linux...';set -x; [ -f
${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip
CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
-+if(NOT DISABLE_SETCAP)
-+if(PACKAGE_MODE)
-+install(CODE "execute_process(COMMAND /bin/bash -c \"echo
'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output}
] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set
+x\")")
-+else()
-+install(CODE "execute_process(COMMAND /bin/bash -c \"echo
'Enabling networking capability on Linux...';set -x; [ -f
${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip
CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
-+endif()
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5d465d5586178c6441289109e789cbec2a331118
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 15 05:01:03 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 15 07:26:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d465d55
games-emulation/pcsx2: force-remove lower bounds on Qt6 and SDL2
Upstream likes to bump these to very recent ones at arbitrary
points without seemingly being truly required.
Needed to be able to stabilize pcsx2 without bothering to stable
libsdl2-2.28.4 "right now" when 2.28.3 seems just fine still.
pcsx2- had already needed to switch to 2.28.5 too (why..?).
If a version is found problematic, will add the needed lower
bound to *DEPEND only. Odds are very old Qt6 (e.g. 6.2) is likely
broken but these are long gone and won't worry about it.
Using sed given versions keep changing and want to avoid rebasing
a patch every time.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 14 ++
games-emulation/pcsx2/pcsx2-.ebuild | 16 +++-
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index 223990367c6d..dfb2a1b447ac 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -31,11 +31,11 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
app-arch/xz-utils
dev-libs/libaio
- >=dev-qt/qtbase-6.6.0:6[gui,widgets]
- >=dev-qt/qtsvg-6.6.0:6
+ dev-qt/qtbase:6[gui,widgets]
+ dev-qt/qtsvg:6
media-libs/libglvnd
media-libs/libpng:=
- >=media-libs/libsdl2-2.28.4[haptic,joystick]
+ media-libs/libsdl2[haptic,joystick]
media-video/ffmpeg:=
net-libs/libpcap
net-misc/curl
@@ -61,7 +61,7 @@ DEPEND="
x11-base/xorg-proto
"
BDEPEND="
- >=dev-qt/qttools-6.6.0:6[linguist]
+ dev-qt/qttools:6[linguist]
wayland? (
dev-util/wayland-scanner
kde-frameworks/extra-cmake-modules
@@ -81,6 +81,12 @@ src_prepare() {
sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-i cmake/Pcsx2Utils.cmake || die
fi
+
+ # relax Qt6 and SDL2 version requirements which often get restricted
+ # without a specific need, please report a bug to Gentoo (not upstream)
+ # if a still-available older version is really causing issues
+ sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+ -i cmake/SearchForStuff.cmake || die
}
src_configure() {
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 43536202eed1..178e5a77996c 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,11 +33,11 @@ COMMON_DEPEND="
app-arch/xz-utils
app-arch/zstd:=
dev-libs/libaio
- >=dev-qt/qtbase-6.6.0:6[gui,widgets]
- >=dev-qt/qtsvg-6.6.0:6
+ dev-qt/qtbase:6[gui,widgets]
+ dev-qt/qtsvg:6
media-libs/libglvnd
media-libs/libpng:=
- >=media-libs/libsdl2-2.28.5[haptic,joystick]
+ media-libs/libsdl2[haptic,joystick]
media-libs/libwebp:=
media-video/ffmpeg:=
net-libs/libpcap
@@ -64,7 +64,7 @@ DEPEND="
x11-base/xorg-proto
"
BDEPEND="
- >=dev-qt/qttools-6.6.0:6[linguist]
+ dev-qt/qttools:6[linguist]
wayland? (
dev-util/wayland-scanner
kde-frameworks/extra-cmake-modules
@@ -84,6 +84,12 @@ src_prepare() {
sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-i cmake/Pcsx2Utils.cmake || die
fi
+
+ # relax Qt6 and SDL2 version requirements which often get restricted
+ # without a specific need, please report a bug to Gentoo (not upstream)
+ # if a still-available older version is really causing issues
+ sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+ -i cmake/SearchForStuff.cmake || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 45313b7cf62271ff0d7e65b7853c0aafbc18b93e
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 15 05:59:44 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 15 07:26:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45313b7c
games-emulation/pcsx2: update live, require clang
Likely an easy fix that could be done from our end, but no
longer have the patience to support things that upstream is
refusing to support. Albeit may drop the requirement if it
gets fixed by the time of next bump, but otherwise it'll
likely stick around.
Likely not worth using the llvm eclass here, not linking with
and only need to pick the current compiler.
fwiw forcing clang removes the need for the lto patch.
Also BUILD_DATE option was removed. GIT_TAG bits may also need
updates but will check that next time do a bump as it does not
matter in live. LICENSE may need a bit of reviewing too given
upstream added a compilation of all the licenses used.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 178e5a77996c..586432db9b7e 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake desktop fcaps flag-o-matic
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
if [[ ${PV} == ]]; then
inherit git-r3
@@ -65,6 +65,7 @@ DEPEND="
"
BDEPEND="
dev-qt/qttools:6[linguist]
+ sys-devel/clang:*
wayland? (
dev-util/wayland-scanner
kde-frameworks/extra-cmake-modules
@@ -72,7 +73,6 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
)
@@ -93,6 +93,13 @@ src_prepare() {
}
src_configure() {
+ # upstream only supports clang and ignores gcc issues, e.g.
+ # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+ if ! tc-is-clang; then
+ local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+ strip-unsupported-flags
+ fi
+
if use vulkan; then
# for bundled glslang (bug #858374)
append-flags -fno-strict-aliasing
@@ -104,7 +111,6 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_ADVANCE_SIMD=yes
- -DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
-DUSE_LINKED_FFMPEG=yes
-DUSE_VTUNE=no
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: de66e7b69307542a793931c375498cfa4a22dfb4
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 8 10:29:52 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 8 12:57:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de66e7b6
games-emulation/pcsx2: drop 1.7.5214
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../files/pcsx2-1.7.3468-cubeb-automagic.patch | 56
games-emulation/pcsx2/pcsx2-1.7.5214.ebuild| 154 -
3 files changed, 211 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 293fe8fddf59..da9e1fbded42 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,2 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B
6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9
SHA512
3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B
ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd
SHA512
6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
deleted file mode 100644
index 804cf29af397..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Same that media-libs/cubeb does and meant for -DLAZY_LOAD_LIBS=no.
-
-Unfortunately need to use bundled cubeb here given it modifies the
-source starting with (but not limited to):
-https://github.com/PCSX2/pcsx2/commit/9170a5abc1
a/3rdparty/cubeb/CMakeLists.txt
-+++ b/3rdparty/cubeb/CMakeLists.txt
-@@ -110,38 +110,48 @@
-
- find_package(PkgConfig REQUIRED)
-
-+ if(CHECK_PULSE)
- pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
- if(libpulse_FOUND)
- set(USE_PULSE ON)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
- target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
- endif()
-+ endif()
-
-+ if(CHECK_ALSA)
- pkg_check_modules(alsa IMPORTED_TARGET alsa)
- if(alsa_FOUND)
- set(USE_ALSA ON)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
- target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
- endif()
-+ endif()
-
-+ if(CHECK_JACK)
- pkg_check_modules(jack IMPORTED_TARGET jack)
- if(jack_FOUND)
- set(USE_JACK ON)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
- target_link_libraries(cubeb PRIVATE PkgConfig::jack)
- endif()
-+ endif()
-
-+ if(CHECK_SNDIO)
- check_include_files(sndio.h USE_SNDIO)
- if(USE_SNDIO)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
- target_link_libraries(cubeb PRIVATE sndio)
- endif()
-+ endif()
-
-+ if(CHECK_AAUDIO)
- check_include_files(aaudio/AAudio.h USE_AAUDIO)
- if(USE_AAUDIO)
- target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
- target_link_libraries(cubeb PRIVATE aaudio)
- endif()
-+ endif()
- endif()
-
- if(USE_PULSE)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
deleted file mode 100644
index 462f4b662736..
--- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- # unbundling on this package has become unmaintainable and, rather than
- # handle submodules separately, using a tarball that includes them
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: f6a0fc872fbd0e619b21e8f557f8e276f30cc1f2
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Dec 31 06:56:45 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Dec 31 07:09:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a0fc87
games-emulation/pcsx2: update live
Upstream has discovered that unbundling some dependencies reduces
build time.
ARCH_FLAG was removed, it was useful to pass the actual minimal
-m* flags, but -DDISABLE_ADVANCE_SIMD comes close enough and
prevents passing the more problematic -march=native.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 7dcbf7dc75d7..43536202eed1 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -29,13 +29,16 @@ RESTRICT="!test? ( test )"
# dlopen: qtsvg, vulkan-loader, wayland
COMMON_DEPEND="
+ app-arch/lz4:=
app-arch/xz-utils
+ app-arch/zstd:=
dev-libs/libaio
>=dev-qt/qtbase-6.6.0:6[gui,widgets]
>=dev-qt/qtsvg-6.6.0:6
media-libs/libglvnd
media-libs/libpng:=
>=media-libs/libsdl2-2.28.5[haptic,joystick]
+ media-libs/libwebp:=
media-video/ffmpeg:=
net-libs/libpcap
net-misc/curl
@@ -94,6 +97,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
+ -DDISABLE_ADVANCE_SIMD=yes
-DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
-DUSE_LINKED_FFMPEG=yes
@@ -102,11 +106,6 @@ src_configure() {
-DWAYLAND_API=$(usex wayland)
-DX11_API=yes # X libs are currently hard-required either way
- # sse4.1 is the bare minimum required, -m is required at build
time
- # (see PCSX2Base.h) and it dies if no support at runtime
(AppInit.cpp)
- # https://github.com/PCSX2/pcsx2/pull/4329
- -DARCH_FLAG=-msse4.1
-
# not packaged due to bug #885471, but still disable for no
automagic
-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 7e9c844fe4748e43a83217181b32bfa7da5b1cad Author: Ionen Wolkens gentoo org> AuthorDate: Sat Dec 30 16:10:24 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Dec 30 16:15:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9c844f games-emulation/pcsx2: update live As usual pcsx2 is picky about sdl2 versions, not that I can see the reason why (pretty sure this works just fine with stable libsdl2-2.28.3 and this just annoys stable users accept keywording it). May really have to consider just sedding out the version check for Qt and SDL2 if these keep up (not a patch given will likely keep getting changed). Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 223990367c6d..7dcbf7dc75d7 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" >=dev-qt/qtsvg-6.6.0:6 media-libs/libglvnd media-libs/libpng:= - >=media-libs/libsdl2-2.28.4[haptic,joystick] + >=media-libs/libsdl2-2.28.5[haptic,joystick] media-video/ffmpeg:= net-libs/libpcap net-misc/curl
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2c3b2ee2786b91ed20a6413832b58fdec9aed3dc
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 19 11:31:44 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 19 11:43:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3b2ee2
games-emulation/pcsx2: drop 1.7.5133
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.5133.ebuild | 155
2 files changed, 156 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c52d59d08b7f..293fe8fddf59 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,4 +1,3 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B
89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284
SHA512
cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B
6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9
SHA512
3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B
ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd
SHA512
6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
deleted file mode 100644
index 63a7bbdd2c1d..
--- a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- # formerly was attempting to unbundle most, but upstream dropped every
- # checks for alternatively using system's and keeping this up has become
- # unmaintainable, and to simplify now also using tarballs with
submodules
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/xz-utils
- dev-libs/libaio
- >=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
- >=dev-qt/qtsvg-6.5.3:6
- media-libs/libglvnd
- media-libs/libpng:=
- >=media-libs/libsdl2-2.28.4[haptic,joystick]
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- >=dev-qt/qttools-6.5.3:6[linguist]
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
- -i cmake/Pcsx2Utils.cmake || die
- fi
-}
-
-src_configure() {
- if use vulkan; then
- # for bundled glslang (bug #858374)
- append-flags
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: b18ca9569e9a68f47281761a885777067ee5f96b
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 19 11:31:32 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 19 11:43:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18ca956
games-emulation/pcsx2: add 1.7.5312
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index da9f8c0707d6..c52d59d08b7f 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,4 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B
89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284
SHA512
cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B
6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9
SHA512
3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
+DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B
ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd
SHA512
6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
new file mode 100644
index ..7978166a40b3
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # formerly was attempting to unbundle most, but upstream dropped every
+ # checks for alternatively using system's and keeping this up has become
+ # unmaintainable, and to simplify now also using tarballs with
submodules
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/xz-utils
+ dev-libs/libaio
+ >=dev-qt/qtbase-6.6.0:6[gui,widgets]
+ >=dev-qt/qtsvg-6.6.0:6
+ media-libs/libglvnd
+ media-libs/libpng:=
+ >=media-libs/libsdl2-2.28.4[haptic,joystick]
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? ( media-libs/vulkan-loader )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ >=dev-qt/qttools-6.6.0:6[linguist]
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.3773-lto.patch
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+}
+
+src_configure() {
+ if use vulkan; then
+ # for bundled glslang (bug #858374)
+ append-flags -fno-strict-aliasing
+
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: f4ef4c3241064e84640a494044ccf62c72abfff2
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 19 11:33:55 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 19 11:43:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4ef4c32
games-emulation/pcsx2: reword/shorten tarball comment
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.5214.ebuild | 5 ++---
games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 5 ++---
games-emulation/pcsx2/pcsx2-.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
index cf1118563fd6..462f4b662736 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
else
- # formerly was attempting to unbundle most, but upstream dropped every
- # checks for alternatively using system's and keeping this up has become
- # unmaintainable, and to simplify now also using tarballs with
submodules
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
KEYWORDS="-* ~amd64"
fi
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index 7978166a40b3..223990367c6d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
else
- # formerly was attempting to unbundle most, but upstream dropped every
- # checks for alternatively using system's and keeping this up has become
- # unmaintainable, and to simplify now also using tarballs with
submodules
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
KEYWORDS="-* ~amd64"
fi
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 7978166a40b3..223990367c6d 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
else
- # formerly was attempting to unbundle most, but upstream dropped every
- # checks for alternatively using system's and keeping this up has become
- # unmaintainable, and to simplify now also using tarballs with
submodules
+ # unbundling on this package has become unmaintainable and, rather than
+ # handle submodules separately, using a tarball that includes them
SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
KEYWORDS="-* ~amd64"
fi
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: d2b2beabf1fb184106dc3b8eab5f8163ce96641c
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Nov 27 04:40:38 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 27 05:15:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b2beab
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/pcsx2-1.7.5232-cubeb-automagic.patch | 31 ++
games-emulation/pcsx2/pcsx2-.ebuild| 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5232-cubeb-automagic.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.5232-cubeb-automagic.patch
new file mode 100644
index ..e195ae79c3b1
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5232-cubeb-automagic.patch
@@ -0,0 +1,31 @@
+Same that media-libs/cubeb does and meant for -DLAZY_LOAD_LIBS=no.
+
+Unfortunately need to use bundled cubeb here given it modifies the
+source starting with (but not likely limited to):
+https://github.com/PCSX2/pcsx2/commit/9170a5abc1
+--- a/3rdparty/cubeb/CMakeLists.txt
b/3rdparty/cubeb/CMakeLists.txt
+@@ -76,3 +76,5 @@
+
++ if(CHECK_PULSE)
+ pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
++ endif()
+ if(libpulse_FOUND)
+@@ -83,3 +85,5 @@
+
++ if(CHECK_ALSA)
+ pkg_check_modules(alsa IMPORTED_TARGET alsa)
++ endif()
+ if(alsa_FOUND)
+@@ -90,3 +94,5 @@
+
++ if(CHECK_JACK)
+ pkg_check_modules(jack IMPORTED_TARGET jack)
++ endif()
+ if(jack_FOUND)
+@@ -97,3 +103,5 @@
+
++ if(CHECK_SNDIO)
+ check_include_files(sndio.h USE_SNDIO)
++ endif()
+ if(USE_SNDIO)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index c2e6420ddbfc..7978166a40b3 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -70,9 +70,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 9496e226550ee3853e7db5595ef4144d4404f038 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Nov 22 11:12:20 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Nov 22 12:44:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9496e226 games-emulation/pcsx2: update live Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index cf1118563fd6..c2e6420ddbfc 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -32,7 +32,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" app-arch/xz-utils dev-libs/libaio - >=dev-qt/qtbase-6.6.0:6[gui,network,widgets] + >=dev-qt/qtbase-6.6.0:6[gui,widgets] >=dev-qt/qtsvg-6.6.0:6 media-libs/libglvnd media-libs/libpng:=
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: aeb23a8d017cd7550a573a1a1493e8e4f2f8663e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 19 05:33:48 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 19 05:53:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb23a8d
games-emulation/pcsx2: add 1.7.5214
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5214.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index e4f5e210d621..da9f8c0707d6 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B
89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284
SHA512
cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
+DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B
6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9
SHA512
3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
new file mode 100644
index ..cf1118563fd6
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # formerly was attempting to unbundle most, but upstream dropped every
+ # checks for alternatively using system's and keeping this up has become
+ # unmaintainable, and to simplify now also using tarballs with
submodules
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/xz-utils
+ dev-libs/libaio
+ >=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
+ >=dev-qt/qtsvg-6.6.0:6
+ media-libs/libglvnd
+ media-libs/libpng:=
+ >=media-libs/libsdl2-2.28.4[haptic,joystick]
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? ( media-libs/vulkan-loader )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ >=dev-qt/qttools-6.6.0:6[linguist]
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.3773-lto.patch
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+}
+
+src_configure() {
+ if use vulkan; then
+ # for bundled glslang (bug #858374)
+ append-flags -fno-strict-aliasing
+
+ # odr violations in pcsx2's vulkan code, disabling as a safety
for now
+ filter-lto
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=no
+ -DDISABLE_BUILD_DATE=yes
+ -DENABLE_TESTS=$(usex test)
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5ed52f8dd805ee343d8eae04e1ee6568afdd5408
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 19 05:50:17 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 19 05:53:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed52f8d
games-emulation/pcsx2: remove -gentoo from version
Sounded like a good idea on paper to identify given upstream can be
picky about non-official builds. However the version gets tied to
savestates and this may be more of an annoyance if trying to get an
old version to convert a save state back to a memory card save.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index e13f2c5a2b74..cf1118563fd6 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -79,7 +79,7 @@ src_prepare() {
cmake_src_prepare
if [[ ${PV} != ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-i cmake/Pcsx2Utils.cmake || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2ebfbd01902e9f0b4d32ca7d2cef575ab7eb287b Author: Ionen Wolkens gentoo org> AuthorDate: Thu Oct 26 05:31:03 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Oct 26 05:39:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebfbd01 games-emulation/pcsx2: update live Albeit not quite sure why upstream insists on bumping minimum version, does not seem to be using anything 6.6.0-specific. As far as I'm aware it still works with 6.5.x beside the cmake check (similar deal as the minimum sdl2 version checks). May be annoying for stable users still on 6.5.x. May consider to patch out the limitation if this gets frequently bumped while not seemingly broken, albeit leaving it alone for now. Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 63a7bbdd2c1d..e13f2c5a2b74 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -32,8 +32,8 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" app-arch/xz-utils dev-libs/libaio - >=dev-qt/qtbase-6.5.3:6[gui,network,widgets] - >=dev-qt/qtsvg-6.5.3:6 + >=dev-qt/qtbase-6.6.0:6[gui,network,widgets] + >=dev-qt/qtsvg-6.6.0:6 media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.28.4[haptic,joystick] @@ -62,7 +62,7 @@ DEPEND=" x11-base/xorg-proto " BDEPEND=" - >=dev-qt/qttools-6.5.3:6[linguist] + >=dev-qt/qttools-6.6.0:6[linguist] wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 8721ba824c7d6b957051f4d5e7433270a347254f
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Oct 25 07:09:03 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Oct 25 07:56:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8721ba82
games-emulation/pcsx2: drop 1.7.5033
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.5033.ebuild | 155
2 files changed, 156 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index cf554a25bc0b..e4f5e210d621 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,2 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B
ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b
SHA512
ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B
89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284
SHA512
cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
deleted file mode 100644
index 98a2f8f00c10..
--- a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- # formerly was attempting to unbundle most, but upstream dropped every
- # checks for alternatively using system's and keeping this up has become
- # unmaintainable, and to simplify now also using tarballs with
submodules
- SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
- app-arch/xz-utils
- dev-libs/libaio
- dev-qt/qtbase:6[gui,network,widgets]
- dev-qt/qtsvg:6
- media-libs/libglvnd
- media-libs/libpng:=
- >=media-libs/libsdl2-2.28.2[haptic,joystick]
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )
- pulseaudio? ( media-libs/libpulse )
- sndio? ( media-sound/sndio:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
- ${COMMON_DEPEND}
- >=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/qttools:6[linguist]
- wayland? (
- dev-util/wayland-scanner
- kde-frameworks/extra-cmake-modules
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
- "${FILESDIR}"/${PN}-1.7.4667-flags.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${PV} != ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
- -i cmake/Pcsx2Utils.cmake || die
- fi
-}
-
-src_configure() {
- if use vulkan; then
- # for bundled glslang (bug #858374)
- append-flags -fno-strict-aliasing
-
- # odr violations in pcsx2's vulkan code, disabling as a safety
for now
- filter-lto
- fi
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_BUILD_DATE=yes
- -DENABLE_TESTS=$(usex test)
- -DUSE_LINKED_FFMPEG=yes
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: ea02f6c1debe0c5a9ff64adfef2020e766e1e154
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 19 12:24:54 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Oct 19 13:35:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea02f6c1
games-emulation/pcsx2: add 1.7.5133
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5133.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 2a4ba484f723..cf554a25bc0b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B
ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b
SHA512
ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
+DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B
89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284
SHA512
cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
new file mode 100644
index ..63a7bbdd2c1d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # formerly was attempting to unbundle most, but upstream dropped every
+ # checks for alternatively using system's and keeping this up has become
+ # unmaintainable, and to simplify now also using tarballs with
submodules
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/xz-utils
+ dev-libs/libaio
+ >=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
+ >=dev-qt/qtsvg-6.5.3:6
+ media-libs/libglvnd
+ media-libs/libpng:=
+ >=media-libs/libsdl2-2.28.4[haptic,joystick]
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? ( media-libs/vulkan-loader )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ >=dev-qt/qttools-6.5.3:6[linguist]
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+ "${FILESDIR}"/${PN}-1.7.3773-lto.patch
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${PV} != ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+ fi
+}
+
+src_configure() {
+ if use vulkan; then
+ # for bundled glslang (bug #858374)
+ append-flags -fno-strict-aliasing
+
+ # odr violations in pcsx2's vulkan code, disabling as a safety
for now
+ filter-lto
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=no
+ -DDISABLE_BUILD_DATE=yes
+ -DENABLE_TESTS=$(usex test)
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 195a3bba4e9153a907d6152a2470ee6c0923e62a Author: Ionen Wolkens gentoo org> AuthorDate: Sat Oct 14 04:46:53 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Oct 14 04:50:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195a3bba games-emulation/pcsx2: update live Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 98a2f8f00c10..63a7bbdd2c1d 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -32,11 +32,11 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" app-arch/xz-utils dev-libs/libaio - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 + >=dev-qt/qtbase-6.5.3:6[gui,network,widgets] + >=dev-qt/qtsvg-6.5.3:6 media-libs/libglvnd media-libs/libpng:= - >=media-libs/libsdl2-2.28.2[haptic,joystick] + >=media-libs/libsdl2-2.28.4[haptic,joystick] media-video/ffmpeg:= net-libs/libpcap net-misc/curl @@ -62,7 +62,7 @@ DEPEND=" x11-base/xorg-proto " BDEPEND=" - dev-qt/qttools:6[linguist] + >=dev-qt/qttools-6.5.3:6[linguist] wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: d65be23ca9ed07d21da4f83289bf99e479bc2d48
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Oct 10 18:52:11 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Oct 10 20:18:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65be23c
games-emulation/pcsx2: drop 1.7.4940-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 6 -
.../pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 -
.../pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 --
.../pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 -
.../pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch | 8 -
games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild | 277 -
6 files changed, 325 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ea922468de55..2a4ba484f723 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,8 +1,2 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B
ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec
SHA512
be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B
ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b
SHA512
ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
-DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
-DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
-DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
-DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B
88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89
SHA512
991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
-DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B
7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69
SHA512
8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
deleted file mode 100644
index 9787cd380337..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
+++ /dev/null
@@ -1,6 +0,0 @@
a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -164 +164,2 @@
--add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
-+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
-+alias_library(chdr-static PkgConfig::chdr)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
deleted file mode 100644
index 858efc3b3e47..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -96,6 +95,0 @@
--if(ENABLE_TESTS)
-- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
-- message(WARNING "ENABLE_TESTS was on but gtest was not found,
unit tests will not be enabled")
-- set(ACTUALLY_ENABLE_TESTS Off)
-- endif()
--endif()
a/tests/ctest/CMakeLists.txt
-+++ b/tests/ctest/CMakeLists.txt
-@@ -20 +20,2 @@
--add_subdirectory(gtest)
-+find_package(GTest REQUIRED)
-+alias_library(gtest_main GTest::gtest_main)
diff --git
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5766d7228b9df5837563d68d79dc13021f3c356d
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 19 10:58:29 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 19 11:35:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5766d722
games-emulation/pcsx2: add 1.7.5033
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.5033.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ddff241a7cae..ea922468de55 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B
ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec
SHA512
be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
+DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B
ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b
SHA512
ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
new file mode 100644
index ..98a2f8f00c10
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ # formerly was attempting to unbundle most, but upstream dropped every
+ # checks for alternatively using system's and keeping this up has become
+ # unmaintainable, and to simplify now also using tarballs with
submodules
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+ app-arch/xz-utils
+ dev-libs/libaio
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6
+ media-libs/libglvnd
+ media-libs/libpng:=
+ >=media-libs/libsdl2-2.28.2[haptic,joystick]
+ media-video/ffmpeg:=
+ net-libs/libpcap
+ net-misc/curl
+ sys-apps/dbus
+ sys-libs/zlib:=
+ virtual/libudev:=
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ jack? ( virtual/jack )
+ pulseaudio? ( media-libs/libpulse )
+ sndio? ( media-sound/sndio:= )
+ vulkan? ( media-libs/vulkan-loader )
+ wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ wayland? (
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: a5c243495666fd87f2d022bac33d5a43c7eaa07f
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 19 10:09:20 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 19 11:35:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c24349
games-emulation/pcsx2: install in mono path, handle translations
Translations ignore AppRoot and insist on using the location that pcsx2
is at. Rather than modify further, install everything in /usr/lib/${PN}
and keep a symlink for PATH (fortunately using a wrapper does not seem
necessary). Unfortunately upstream has no interest in a more standard
installation so this may be better going forward.
Also tidy a bit.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 24 ++--
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index bb34c0a768df..7024be408faa 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -55,7 +55,7 @@ COMMON_DEPEND="
# is missing and it is fairly small (installs a ~1.5MB patches.zip)
RDEPEND="
${COMMON_DEPEND}
- games-emulation/pcsx2_patches
+ >=games-emulation/pcsx2_patches-0_p20230917
"
DEPEND="
${COMMON_DEPEND}
@@ -69,10 +69,6 @@ BDEPEND="
)
"
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
PATCHES=(
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
@@ -82,9 +78,6 @@ PATCHES=(
src_prepare() {
cmake_src_prepare
- sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
- -i pcsx2/Pcsx2Config.cpp || die
-
if [[ ${PV} != ]]; then
sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
-i cmake/Pcsx2Utils.cmake || die
@@ -134,19 +127,22 @@ src_test() {
}
src_install() {
- newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
-
- insinto /usr/share/${PN}
- doins -r "${BUILD_DIR}"/bin/resources
+ insinto /usr/lib/${PN}
+ doins -r "${BUILD_DIR}"/bin/.
- dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+ fperms +x /usr/lib/${PN}/pcsx2-qt
+ dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
newicon bin/resources/icons/AppIconLarge.png ${PN}.png
make_desktop_entry ${PN} ${PN^^}
+
+ dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+
+ use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
}
pkg_postinst() {
- fcaps_pkg_postinst
+ fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
local replacing=
if [[ ${REPLACING_VERSIONS##* } ]]; then
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 8c2f4b7164fa5b2930bee4cb3abfa7133208604b
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 19 10:34:00 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 19 11:35:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2f4b71
games-emulation/pcsx2: depend on old pcsx2_patches for 1.7.4940
Due to change in install location, but bump is happening at same
time so odds are this revbump will not be used unless trying old
version for regressions.
Signed-off-by: Ionen Wolkens gentoo.org>
.../pcsx2/{pcsx2-1.7.4940.ebuild => pcsx2-1.7.4940-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
similarity index 99%
rename from games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
index 6089f51c3411..4976851a41d4 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
@@ -75,7 +75,7 @@ COMMON_DEPEND="
# is missing and it is fairly small (installs a ~1.5MB patches.zip)
RDEPEND="
${COMMON_DEPEND}
- games-emulation/pcsx2_patches
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 8e19ddfad1745322789c0928fdf784e2755807e5
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 19 10:50:10 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 19 11:35:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e19ddfa
games-emulation/pcsx2: reduce postinst messages
Should not be super interesting at this point and has been fairly
stable despite packaging annoyances, albeit keep warning for those
upgrading from 1.6.0.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 37 +
1 file changed, 5 insertions(+), 32 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 7024be408faa..98a2f8f00c10 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -144,39 +144,12 @@ src_install() {
pkg_postinst() {
fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
- local replacing=
- if [[ ${REPLACING_VERSIONS##* } ]]; then
- if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then
- replacing=old
- elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then
- replacing=wx
- else
- replacing=any
- fi
- fi
-
- if [[ ${replacing} == old ]]; then
+ if [[ ${REPLACING_VERSIONS##* } ]] &&
+ ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+ elog ">=${PN}-1.7 has received several changes since
<=${PN}-1.6.0, and is"
+ elog "notably now a 64bit build using Qt6. Just-in-case it is
recommended"
+ elog "to backup configs, save states, and memory cards before
using."
elog
- elog ">=${PN}-1.7 has received several changes since
<=${PN}-1.6.0, notably"
- elog "it is now a 64bit build using Qt6. Just-in-case it is
recommended to"
- elog "backup your configs, save states, and memory cards before
use."
elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
fi
-
- if [[ ${replacing} == @(|old) && ${PV} != ]]; then
- elog
- elog "${PN}-1.7.x is a development branch where .x increments
every changes."
- elog "Stable 1.6.0 is getting old and lacks many notable
features (e.g. native"
- elog "64bit builds). Given it may be a long time before there
is a new stable,"
- elog "Gentoo will carry and update 1.7.x roughly every months."
- elog
- elog "Please report an issue if feel a picked version needs to
be updated ahead"
- elog "of time or masked (notably for handling regressions)."
- fi
-
- if [[ ${replacing} == wx ]]; then
- ewarn
- ewarn "Note that wxGTK support been dropped upstream since
>=${PN}-1.7.3773,"
- ewarn "and so USE=qt6 is gone and Qt6 is now always used."
- fi
}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: cdb771bfd674ceca39e808f36da55b6b75867dd8
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Sep 17 04:14:18 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Sep 17 04:23:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb771bf
games-emulation/pcsx2: update live
Upstream purged some options and made them hard-required, did not use
most of these but dbus is one of.
Also adjust some comments. Things got changed around X11_API a bit,
but seems it still tries to link with libX11 if (UNIX) regardless, so
still no optional X (given upstream is killing options that they
"do not test" once they get a build failure report, odds are it will
remain this way).
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index f2a78ab73686..bb34c0a768df 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -24,7 +24,7 @@ LICENSE="
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
"
SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -40,11 +40,11 @@ COMMON_DEPEND="
media-video/ffmpeg:=
net-libs/libpcap
net-misc/curl
+ sys-apps/dbus
sys-libs/zlib:=
virtual/libudev:=
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
sndio? ( media-sound/sndio:= )
@@ -97,20 +97,18 @@ src_configure() {
append-flags -fno-strict-aliasing
# odr violations in pcsx2's vulkan code, disabling as a safety
for now
- # (vulkan support tend to receive major changes, is more on WIP
side)
filter-lto
fi
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
- -DDBUS_API=$(usex dbus)
-DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
-DUSE_LINKED_FFMPEG=yes
-DUSE_VTUNE=no
-DUSE_VULKAN=$(usex vulkan)
-DWAYLAND_API=$(usex wayland)
- -DX11_API=yes # fails if X libs are missing even if disabled
+ -DX11_API=yes # X libs are currently hard-required either way
# sse4.1 is the bare minimum required, -m is required at build
time
# (see PCSX2Base.h) and it dies if no support at runtime
(AppInit.cpp)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: c8ecb03553e32d0bff681f236e13f0c0406260b0
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 12 16:03:46 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 12 16:03:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ecb035
games-emulation/pcsx2: drop 1.7.4795
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 2 -
games-emulation/pcsx2/pcsx2-1.7.4795.ebuild | 277
2 files changed, 279 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index e6a9f19955a0..ddff241a7cae 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,9 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B
b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2
SHA512
2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B
ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec
SHA512
be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
-DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B
88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89
SHA512
991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B
7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69
SHA512
8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
deleted file mode 100644
index 7d24c2ae54cd..
--- a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
- https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
- -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- ->
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/
commit: bfce5962f19f461c6a2c1f94064f7341dc60ba4e Author: Ionen Wolkens gentoo org> AuthorDate: Sun Aug 27 05:24:40 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Aug 27 05:24:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfce5962 games-emulation/pcsx2: drop unused patch Forgot this one was only in , so can clean it up now. Signed-off-by: Ionen Wolkens gentoo.org> .../pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch | 8 1 file changed, 8 deletions(-) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch deleted file mode 100644 index 631e49b3bddf.. --- a/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch +++ /dev/null @@ -1,8 +0,0 @@ a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -181,2 +181,3 @@ --add_subdirectory(3rdparty/zstd EXCLUDE_FROM_ALL) --add_subdirectory(3rdparty/libzip EXCLUDE_FROM_ALL) -+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd) -+alias_library(Zstd::Zstd PkgConfig::zstd) -+find_package(libzip REQUIRED)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: a6344190b62e7ba9972dfc0d4beb135b6498d5ed
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Aug 27 04:35:04 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Aug 27 05:02:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6344190
games-emulation/pcsx2: update live, give up unbundling
We already had to go out of our way to unbundle a few extras, but
now upstream has removed all checks for alternatively using system
libraries (that someone had sent a PR for to add before) and this
is becoming too much of a pain to go against and very fragile.
May possibly revisit when it does a non-nightly release.
CMakeLists.txt set a very high lower bound on SDL2 for some reason,
but well, it's packaged.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 99 ++---
1 file changed, 5 insertions(+), 94 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index f41481a3cf53..f2a78ab73686 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -9,26 +9,10 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
- https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
- -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )
- "
+ # formerly was attempting to unbundle most, but upstream dropped every
+ # checks for alternatively using system's and keeping this up has become
+ # unmaintainable, and to simplify now also using tarballs with
submodules
+ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz;
KEYWORDS="-* ~amd64"
fi
@@ -47,16 +31,12 @@ RESTRICT="!test? ( test )"
# dlopen: qtsvg, vulkan-loader, wayland
COMMON_DEPEND="
app-arch/xz-utils
- app-arch/zstd:=
- dev-cpp/rapidyaml:=
dev-libs/libaio
- dev-libs/libchdr
- dev-libs/libzip:=[zstd]
dev-qt/qtbase:6[gui,network,widgets]
dev-qt/qtsvg:6
media-libs/libglvnd
media-libs/libpng:=
- >=media-libs/libsdl2-2.0.22[haptic,joystick]
+ >=media-libs/libsdl2-2.28.2[haptic,joystick]
media-video/ffmpeg:=
net-libs/libpcap
net-misc/curl
@@ -80,7 +60,6 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
x11-base/xorg-proto
- test? ( dev-cpp/gtest )
"
BDEPEND="
dev-qt/qttools:6[linguist]
@@ -98,59 +77,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
- "${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
- "${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
- "${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
- "${FILESDIR}"/${PN}-1.7.4943-system-libzip-zstd.patch
)
-src_unpack() {
- if [[ ${PV} == ]]; then
- local EGIT_SUBMODULES=(
- # libfmt is volatile and upstream is unlikely to make
fixes for
- # latest system copy punctually (may revisit this
eventually)
- 3rdparty/fmt/fmt
-
- # has no build system and is not really setup for
unbundling
- 3rdparty/rcheevos/rcheevos
-
- # system rapidyaml is still used, but this uses another
part
- # of the source directly (fast_float) and so allow the
submodule
- # https://github.com/PCSX2/pcsx2/commit/af646e449
- 3rdparty/rapidyaml/rapidyaml
- 3rdparty/rapidyaml/rapidyaml/extern/c4core
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: a08a828b4f780c33942e24591da4faa6c8508521
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Aug 25 04:36:02 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 25 04:41:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08a828b
games-emulation/pcsx2: update live
Previous patch was just meant to fix system detection given
we lack the .cmake files, but now upstream straight up removed
the find_optional for zstd and also libzip while at it.
Signed-off-by: Ionen Wolkens gentoo.org>
.../pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch | 8
games-emulation/pcsx2/pcsx2-.ebuild | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
new file mode 100644
index ..631e49b3bddf
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
@@ -0,0 +1,8 @@
+--- a/cmake/SearchForStuff.cmake
b/cmake/SearchForStuff.cmake
+@@ -181,2 +181,3 @@
+-add_subdirectory(3rdparty/zstd EXCLUDE_FROM_ALL)
+-add_subdirectory(3rdparty/libzip EXCLUDE_FROM_ALL)
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
++find_package(libzip REQUIRED)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 7d24c2ae54cd..f41481a3cf53 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -100,8 +100,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
"${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
- "${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch
"${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
+ "${FILESDIR}"/${PN}-1.7.4943-system-libzip-zstd.patch
)
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 7d2eab17ddf0c6bdc8ff0f6573d2d9720e91196f
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 24 03:27:05 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 24 03:39:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2eab17
games-emulation/pcsx2: add 1.7.4940
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 2 +
games-emulation/pcsx2/pcsx2-1.7.4940.ebuild | 277
2 files changed, 279 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 47b74b941337..e6a9f19955a0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,7 +1,9 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B
b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2
SHA512
2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
+DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B
ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec
SHA512
be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
+DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B
88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89
SHA512
991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B
7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69
SHA512
8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
new file mode 100644
index ..6089f51c3411
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+ HASH_RCHEEVOS=3af1e2fc5188d6e932ee379942f4049ea877e648
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+ https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+ -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ ->
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: ecfb63aac9ba9449e8cba57d9b7683c17752c567
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Aug 6 00:48:11 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Aug 6 04:27:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfb63aa
games-emulation/pcsx2: drop 1.7.4624
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../pcsx2/files/pcsx2-1.7.3351-unbundle.patch | 34 ---
games-emulation/pcsx2/pcsx2-1.7.4624.ebuild| 259 -
3 files changed, 294 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d98bdaa4..47b74b941337 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,4 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B
539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a
SHA512
af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B
b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2
SHA512
2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
deleted file mode 100644
index 014548ae9882..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Adjust to unbundle a few extras.
-
-zstd changes only needed because of https://bugs.gentoo.org/872254
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,3 +54,4 @@
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-- add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL)
-+ find_package(GTest REQUIRED)
-+ alias_library(gtest_main GTest::gtest_main)
- add_subdirectory(tests/ctest)
a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -177,3 +177,3 @@
- set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
--if(ENABLE_TESTS)
-+if(0)
- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
-@@ -210,7 +210,4 @@
- find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
--find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
--if (${zstd_TYPE} STREQUAL System)
-- alias_library(Zstd::Zstd zstd::libzstd_shared)
-- alias_library(pcsx2-zstd zstd::libzstd_shared)
--endif()
-+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
-+alias_library(Zstd::Zstd PkgConfig::zstd)
- find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
-@@ -248,3 +245,4 @@
- add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL)
--add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
-+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
-+alias_library(chdr-static PkgConfig::chdr)
-
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
deleted file mode 100644
index 0837cde0069d..
--- a/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 680e9eb4f6ba3553afb18c59c4a7922a8f9a07fd
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jul 24 23:35:14 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 25 00:01:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680e9eb4
games-emulation/pcsx2: sync live
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 24
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 3af6a07551b2..7d24c2ae54cd 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -27,7 +27,8 @@ else
-> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
+ )
+ "
KEYWORDS="-* ~amd64"
fi
@@ -36,7 +37,8 @@ HOMEPAGE="https://pcsx2.net/;
LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
SLOT="0"
IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
@@ -67,22 +69,26 @@ COMMON_DEPEND="
pulseaudio? ( media-libs/libpulse )
sndio? ( media-sound/sndio:= )
vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )"
+ wayland? ( dev-libs/wayland )
+"
# patches is a optfeature but always pull given PCSX2 complaints if it
# is missing and it is fairly small (installs a ~1.5MB patches.zip)
RDEPEND="
${COMMON_DEPEND}
- games-emulation/pcsx2_patches"
+ games-emulation/pcsx2_patches
+"
DEPEND="
${COMMON_DEPEND}
x11-base/xorg-proto
- test? ( dev-cpp/gtest )"
+ test? ( dev-cpp/gtest )
+"
BDEPEND="
dev-qt/qttools:6[linguist]
wayland? (
dev-util/wayland-scanner
kde-frameworks/extra-cmake-modules
- )"
+ )
+"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
@@ -95,6 +101,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
"${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
"${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch
+ "${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
)
src_unpack() {
@@ -118,7 +125,8 @@ src_unpack() {
# also keep vulkan-headers to stay in sync
$(usev vulkan '
3rdparty/glslang/glslang
- 3rdparty/vulkan-headers')
+ 3rdparty/vulkan-headers
+ ')
)
git-r3_src_unpack
@@ -158,7 +166,7 @@ src_prepare() {
# TODO?: rapidjson and xbyak are packaged and could be
unbundlable
# w/ patch, and discord-rpc be optional w/ dependency
on rapidjson
cpuinfo cubeb demangler discord-rpc fmt glad imgui
include jpgd
- lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis
+ lzma rapidjson rapidyaml rcheevos simpleini soundtouch
xbyak zydis
$(usev vulkan 'glslang vulkan-headers')
)
find 3rdparty -mindepth 1 -maxdepth 1 -type d \
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: ea2897a4c78f03ccb232e90c504c6707f8e24ff5
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jul 24 23:34:38 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 25 00:01:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2897a4
games-emulation/pcsx2: add 1.7.4795
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
.../pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch | 8 +
games-emulation/pcsx2/pcsx2-1.7.4795.ebuild| 277 +
3 files changed, 286 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 2a4397da1100..d98bdaa4 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B
539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a
SHA512
af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
+DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B
b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2
SHA512
2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
new file mode 100644
index ..c4d11083ad45
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch
@@ -0,0 +1,8 @@
+Continuation of https://github.com/PCSX2/pcsx2/commit/a59f95317a3fd
+--- a/pcsx2/GameDatabase.cpp
b/pcsx2/GameDatabase.cpp
+@@ -1040,3 +1040,3 @@
+ const u32 index = static_cast(s_hash_database.size());
+- for (const ryml::NodeRef& n : node["hashes"].children())
++ for (const auto& n : node["hashes"].children())
+ {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
new file mode 100644
index ..7d24c2ae54cd
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+ https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+ -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: a091e20a286f0e901165241da7af04c32ec33d6f
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jul 6 09:36:48 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jul 6 09:44:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a091e20a
games-emulation/pcsx2: update live
Technically builds without wayland-scanner still, but ECM
(which is now required with wayland) looks for its wayland.xml
and warns if it's missing. It's fairly cheap to depend on and
may avoid unexpected consequences when missing.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 63f79eb0b691..3af6a07551b2 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -77,7 +77,12 @@ DEPEND="
${COMMON_DEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools:6[linguist]"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: 638d959dfe1ae6462e3d3996f6cb7e4558c23429
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jul 1 08:25:11 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jul 1 09:07:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638d959d
games-emulation/pcsx2: update live
gtest unbundling needs rebasing, and unfortunately can no longer
use system soundtouch as-is (newly bundled, fails if unbundled).
Also split unbundling patches while at it, using diff -U0 so they're
unlikely to break easily while touching the same file (context is
not important for these).
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch| 7 +++
.../pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 ++
.../pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 +++
.../pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 +
games-emulation/pcsx2/pcsx2-.ebuild | 9 +++--
5 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
new file mode 100644
index ..ad76cc99c6b6
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
@@ -0,0 +1,7 @@
+If upstream believes -ffast-math is ok for this part then that is
+fine, but we do not want to override users' -O.
+--- a/3rdparty/soundtouch/CMakeLists.txt
b/3rdparty/soundtouch/CMakeLists.txt
+@@ -43 +43 @@
+- target_compile_options(pcsx2-soundtouch PRIVATE -Ofast)
++ target_compile_options(pcsx2-soundtouch PRIVATE -ffast-math)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
new file mode 100644
index ..9787cd380337
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
@@ -0,0 +1,6 @@
+--- a/cmake/SearchForStuff.cmake
b/cmake/SearchForStuff.cmake
+@@ -164 +164,2 @@
+-add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
++pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
++alias_library(chdr-static PkgConfig::chdr)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
new file mode 100644
index ..858efc3b3e47
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
@@ -0,0 +1,15 @@
+--- a/cmake/SearchForStuff.cmake
b/cmake/SearchForStuff.cmake
+@@ -96,6 +95,0 @@
+-if(ENABLE_TESTS)
+- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
+- message(WARNING "ENABLE_TESTS was on but gtest was not found,
unit tests will not be enabled")
+- set(ACTUALLY_ENABLE_TESTS Off)
+- endif()
+-endif()
+--- a/tests/ctest/CMakeLists.txt
b/tests/ctest/CMakeLists.txt
+@@ -20 +20,2 @@
+-add_subdirectory(gtest)
++find_package(GTest REQUIRED)
++alias_library(gtest_main GTest::gtest_main)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch
new file mode 100644
index ..27b2e82852e8
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch
@@ -0,0 +1,13 @@
+This can use system zstd already but will not find it given
+it does not install cmake files, so use pkg-config.
+https://bugs.gentoo.org/872254
+--- a/cmake/SearchForStuff.cmake
b/cmake/SearchForStuff.cmake
+@@ -114,5 +114,2 @@
+-find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
+-if (${zstd_TYPE} STREQUAL System)
+- alias_library(Zstd::Zstd zstd::libzstd_shared)
+- alias_library(pcsx2-zstd zstd::libzstd_shared)
+-endif()
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 0837cde0069d..63f79eb0b691 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -55,7 +55,6 @@ COMMON_DEPEND="
media-libs/libglvnd
media-libs/libpng:=
>=media-libs/libsdl2-2.0.22[haptic,joystick]
- media-libs/libsoundtouch:=
media-video/ffmpeg:=
net-libs/libpcap
net-misc/curl
@@ -85,9 +84,12 @@ FILECAPS=(
)
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.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
+ "${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
+ "${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch
)
src_unpack() {
@@ -191,6 +193,9 @@ src_configure() {
# https://github.com/PCSX2/pcsx2/pull/4329
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: b8ec138c25f79c286acaf13a84905b32ea93649e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jul 1 08:54:08 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jul 1 09:07:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ec138c
games-emulation/pcsx2: drop 1.7.3738-r1, 1.7.4534-r1
Note that 1.7.3738 was the last version to support wxGTK, been kept
for an extended period but can be dropped now that Qt6 is unmasked.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 2 -
games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch | 43
.../pcsx2/files/pcsx2-1.7.3329-lto.patch | 21 --
.../pcsx2/files/pcsx2-1.7.3329-qt6.patch | 10 -
.../files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 39
games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild | 246
games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild | 253 -
7 files changed, 614 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 139f46d9d7e0..2a4397da1100 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,4 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B
203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1
SHA512
0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B
539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a
SHA512
af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
deleted file mode 100644
index aa647cd09c07..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream-PR: https://github.com/PCSX2/pcsx2/pull/5082
-Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/1762
-Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/5062
-
-From: orbea
-Date: Sun, 28 Nov 2021 16:18:48 -0800
-Subject: [PATCH] Revert "GS: Remove Unofficial CRCs (#4082)"
-
-These games hacks are still used and can be removed
-again when a better solution is available.
-
-This reverts commit 6bcdb55f22d468b2eb8b95fd35bd071f9272a89c.
-
a/pcsx2/GS/GSCrc.cpp
-+++ b/pcsx2/GS/GSCrc.cpp
-@@ -22,6 +22,8 @@ const CRC::Game CRC::m_games[] =
- {
- // Note: IDs 0x7ACF7E03, 0x7D4EA48F, 0x37C53760 - shouldn't be added as
it's from the multiloaders when packing games.
- {0x, NoTitle, NoRegion, 0},
-+ {0xF46142D3, ArTonelico2, NoRegion, 0},
-+ {0xC38067F4, ArTonelico2, NoRegion, 0}, // project metafalica 1.0
- {0xF95F37EE, ArTonelico2, US, 0},
- {0x68CE6801, ArTonelico2, JP, 0},
- {0xCE2C1DBF, ArTonelico2, EU, 0},
-@@ -164,6 +166,8 @@ const CRC::Game CRC::m_games[] =
- {0xBF6F101F, GiTS, EU, 0}, // same CRC as another US disc
- {0xA616A6C2, TalesOfAbyss, US, 0},
- {0x14FE77F7, TalesOfAbyss, US, 0},
-+ {0x045D77E9, TalesOfAbyss, JPUNDUB, 0},
-+ {0x14FD77F7, TalesOfAbyss, JPUNDUB, 0},
- {0xAA5EC3A3, TalesOfAbyss, JP, 0},
- {0xFB236A46, SonicUnleashed, US, 0},
- {0x8C913264, SonicUnleashed, EU, 0},
a/pcsx2/GS/GSCrc.h
-+++ b/pcsx2/GS/GSCrc.h
-@@ -91,6 +91,7 @@ public:
- US,
- EU,
- JP,
-+ JPUNDUB,
- RU,
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: cc9ce18c02fbef950b77280cf15c6d26ef90ed3d
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jun 24 02:59:17 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jun 24 04:13:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc9ce18c
games-emulation/pcsx2: add 1.7.4624
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.4624.ebuild | 259
2 files changed, 260 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 36a24560f9e3..139f46d9d7e0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B
203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1
SHA512
0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
+DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B
539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a
SHA512
af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
new file mode 100644
index ..0837cde0069d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+ https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+ -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2697fac5cef42fa8de788e91fa6f4ac924f0b916
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jun 24 02:59:47 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jun 24 04:13:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2697fac5
games-emulation/pcsx2: sync live
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index d2af26b4d0ef..0837cde0069d 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -42,8 +42,8 @@ IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio
test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
app-arch/xz-utils
app-arch/zstd:=
dev-cpp/rapidyaml:=
@@ -69,8 +69,13 @@ RDEPEND="
sndio? ( media-sound/sndio:= )
vulkan? ( media-libs/vulkan-loader )
wayland? ( dev-libs/wayland )"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+ ${COMMON_DEPEND}
+ games-emulation/pcsx2_patches"
DEPEND="
- ${RDEPEND}
+ ${COMMON_DEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )"
BDEPEND="dev-qt/qttools:6[linguist]"
@@ -169,6 +174,7 @@ src_configure() {
-DDBUS_API=$(usex dbus)
-DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
+ -DUSE_LINKED_FFMPEG=yes
-DUSE_VTUNE=no
-DUSE_VULKAN=$(usex vulkan)
-DWAYLAND_API=$(usex wayland)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: f70462ffa87a2fb6214929274f12f484d9cb61e4
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jun 2 05:07:44 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jun 2 06:53:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70462ff
games-emulation/pcsx2: drop 1.7.4425-r2
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild | 245 -
2 files changed, 246 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 6bd1232b6bb5..36a24560f9e3 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B
9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31
SHA512
a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B
203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1
SHA512
0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
deleted file mode 100644
index 14030099b64d..
--- a/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
- https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
- -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
- app-arch/xz-utils
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 90de363201faff3f2eee6af878a998d0059496fa
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun May 28 20:49:25 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun May 28 20:49:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90de3632
games-emulation/pcsx2: Drop dependency on libbacktrace
... since that library causes a ton of problems.
Signed-off-by: Andreas K. Hüttel gentoo.org>
games-emulation/pcsx2/metadata.xml| 1 -
.../pcsx2/{pcsx2-1.7.4425-r1.ebuild => pcsx2-1.7.4425-r2.ebuild} | 4 +---
.../pcsx2/{pcsx2-1.7.4534.ebuild => pcsx2-1.7.4534-r1.ebuild} | 4 +---
games-emulation/pcsx2/pcsx2-.ebuild | 4 +---
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/games-emulation/pcsx2/metadata.xml
b/games-emulation/pcsx2/metadata.xml
index 5e2be35968f1..6e25d9d61e5b 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,7 +14,6 @@
Gentoo Games Project
- Display a backtrace on crash using
sys-libs/libbacktrace
Enable support for the
media-sound/sndio backend
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
similarity index 97%
rename from games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
index 4b41e151906f..14030099b64d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
@@ -38,7 +38,7 @@ LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan
wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -63,7 +63,6 @@ RDEPEND="
virtual/libudev:=
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
- backtrace? ( sys-libs/libbacktrace )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
sndio? ( media-sound/sndio:= )
@@ -159,7 +158,6 @@ src_configure() {
use vulkan && append-flags -fno-strict-aliasing
local mycmakeargs=(
- $(cmake_use_find_package backtrace Libbacktrace)
-DBUILD_SHARED_LIBS=no
-DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
similarity index 97%
rename from games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
index 1c93197e9991..d2af26b4d0ef 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
@@ -38,7 +38,7 @@ LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test
vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -63,7 +63,6 @@ RDEPEND="
virtual/libudev:=
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
- backtrace? ( sys-libs/libbacktrace )
dbus? ( sys-apps/dbus )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
@@ -166,7 +165,6 @@ src_configure() {
fi
local mycmakeargs=(
- $(cmake_use_find_package backtrace Libbacktrace)
-DBUILD_SHARED_LIBS=no
-DDBUS_API=$(usex dbus)
-DDISABLE_BUILD_DATE=yes
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 1c93197e9991..d2af26b4d0ef 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -38,7 +38,7 @@ LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test
vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -63,7 +63,6 @@ RDEPEND="
virtual/libudev:=
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
- backtrace? ( sys-libs/libbacktrace )
dbus? ( sys-apps/dbus )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
@@ -166,7 +165,6 @@
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: e74e866773720afd3a2ecd2f810e785c1f98a036
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu May 25 23:24:53 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri May 26 02:38:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74e8667
games-emulation/pcsx2: add 1.7.4534
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.4534.ebuild | 255
2 files changed, 256 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 8819ea109be9..6bd1232b6bb5 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B
9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31
SHA512
a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
+DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B
203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1
SHA512
0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
new file mode 100644
index ..1c93197e9991
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+ https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+ -> ${PN}-fmt-${HASH_FMT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: a21051f8ceacb84df069bda7f794cc3b83f29a43
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu May 25 23:15:23 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri May 26 02:38:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21051f8
games-emulation/pcsx2: filter-lto with USE=vulkan
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index be8593008a14..1c93197e9991 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -156,8 +156,14 @@ src_prepare() {
}
src_configure() {
- # for bundled glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
+ if use vulkan; then
+ # for bundled glslang (bug #858374)
+ append-flags -fno-strict-aliasing
+
+ # odr violations in pcsx2's vulkan code, disabling as a safety
for now
+ # (vulkan support tend to receive major changes, is more on WIP
side)
+ filter-lto
+ fi
local mycmakeargs=(
$(cmake_use_find_package backtrace Libbacktrace)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 818a4f4096df066f3a6ca47aad95419c37c581c7 Author: Sam James gentoo org> AuthorDate: Tue May 23 02:43:31 2023 + Commit: Sam James gentoo org> CommitDate: Tue May 23 02:51:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818a4f40 games-emulation/pcsx2: defer to new global USE=vulkan description Signed-off-by: Sam James gentoo.org> games-emulation/pcsx2/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml index cf7d628cd86c..5e2be35968f1 100644 --- a/games-emulation/pcsx2/metadata.xml +++ b/games-emulation/pcsx2/metadata.xml @@ -16,7 +16,6 @@ Display a backtrace on crash using sys-libs/libbacktrace Enable support for the media-sound/sndio backend - Enable support for Vulkan https://github.com/PCSX2/pcsx2/issues
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 756af8bca06386b8227ef45cdad734ee53a870d7
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue May 16 17:16:49 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue May 16 17:20:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756af8bc
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index ca3efae59de9..be8593008a14 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -135,8 +135,8 @@ src_unpack() {
src_prepare() {
cmake_src_prepare
- sed -e "/EmuFolders::AppRoot =/s|=.*|=
\"${EPREFIX}/usr/share/${PN}\";|" \
- -i pcsx2/Frontend/CommonHost.cpp || die
+ sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
+ -i pcsx2/Pcsx2Config.cpp || die
if [[ ${PV} != ]]; then
sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: fc3db82f7d2e647e4f0cfe68cb6c831b0b25458c
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed May 10 17:05:43 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed May 10 17:25:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3db82f
games-emulation/pcsx2: drop 1.7.4280
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 237
2 files changed, 238 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 73283f95037d..8819ea109be9 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B
822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585
SHA512
60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B
9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31
SHA512
a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
deleted file mode 100644
index ae1c9c594c50..
--- a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan
wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
- app-arch/xz-utils
- app-arch/zstd:=
- dev-cpp/rapidyaml:=
- dev-libs/libaio
- dev-libs/libchdr
- dev-libs/libfmt:=
- dev-libs/libzip:=[zstd]
- dev-qt/qtbase:6[gui,network,widgets]
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 98f07e417114c0077ac7f082483f95dc31522dde
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed May 10 16:59:44 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed May 10 17:25:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f07e41
games-emulation/pcsx2: switch to bundled libfmt for now
May or may not be an easy fix for libfmt-10, but upstream currently
does not really support using system libraries unless someone else
does the fix for them (e.g. closed the rapidyaml-0.5 issue and
left it broken for months).
Given libfmt tend to be volatile and break old code often, switch
to bundled for now. May revisit this later when there's non-nightly
releases, or if (at least) gets fixed for libfmt-10.
Do a revbump given portage does not fully understand rebuilding pcsx2
as being a solution to allow bumping libfmt if the dep is gone.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
...csx2-1.7.3738.ebuild => pcsx2-1.7.3738-r1.ebuild} | 20 +---
...csx2-1.7.4425.ebuild => pcsx2-1.7.4425-r1.ebuild} | 16 +---
games-emulation/pcsx2/pcsx2-.ebuild | 16 +---
4 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index db45ae12d53c..73283f95037d 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -3,6 +3,7 @@ DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613
DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B
822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585
SHA512
60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B
9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31
SHA512
a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
+DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B
74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f
SHA512
805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B
7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69
SHA512
8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
similarity index 90%
rename from games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
index 87648ee26e9d..b0b340795652 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
else
HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
@@ -18,6 +19,8 @@ else
https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
-> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+ https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 71d84122ca08c2ef35660dceb2d4fa31245de707
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Apr 30 21:26:52 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Apr 30 21:34:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d84122
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index ae1c9c594c50..2608f0e1b287 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -35,7 +35,7 @@ LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan
wayland"
+IUSE="alsa backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test
vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -62,6 +62,7 @@ RDEPEND="
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
backtrace? ( sys-libs/libbacktrace )
+ dbus? ( sys-apps/dbus )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
sndio? ( media-sound/sndio:= )
@@ -152,6 +153,7 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package backtrace Libbacktrace)
-DBUILD_SHARED_LIBS=no
+ -DDBUS_API=$(usex dbus)
-DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
-DUSE_VTUNE=no
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: f9b82904bd8128128a98f541d0776009a1852024
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Apr 26 07:49:52 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Apr 26 08:36:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b82904
games-emulation/pcsx2: add 1.7.4425
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.4425.ebuild | 237
2 files changed, 238 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 1496d4a0c301..db45ae12d53c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B
822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585
SHA512
60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
+DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B
9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31
SHA512
a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
new file mode 100644
index ..ae1c9c594c50
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan
wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 2f420d0c64b33fe486a1ea36fd51b21ee7f227ee
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Apr 23 04:47:37 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Apr 23 04:49:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f420d0c
games-emulation/pcsx2: use explicit slot for qttools
Oversight, albeit is unlikely to be an issue unless qttools
is still not split by the time Qt7 comes out.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 2 +-
games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 2 +-
games-emulation/pcsx2/pcsx2-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 951c4e4fe7c8..87648ee26e9d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -81,7 +81,7 @@ DEPEND="
test? ( dev-cpp/gtest )"
BDEPEND="
dev-lang/perl
- qt6? ( dev-qt/qttools[linguist] )
+ qt6? ( dev-qt/qttools:6[linguist] )
!qt6? ( sys-devel/gettext )"
FILECAPS=(
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
index a0683b3c3d85..ae1c9c594c50 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
@@ -71,7 +71,7 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools:6[linguist]"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index a0683b3c3d85..ae1c9c594c50 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -71,7 +71,7 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools:6[linguist]"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: ed0b72095d7a4830faf1d3e4e8580f04cefbdcae
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Apr 5 12:40:21 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Apr 5 13:21:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0b7209
games-emulation/pcsx2: drop 1.7.4217
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch | 60 --
games-emulation/pcsx2/pcsx2-1.7.4217.ebuild| 237 -
3 files changed, 298 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 5b6690e3e7cc..1496d4a0c301 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B
fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37
SHA512
382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B
822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585
SHA512
60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
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
deleted file mode 100644
index b42ae36045ad..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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 @@
- 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;
-@@ -207,5 +207,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;
-@@ -237,5 +237,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());
-@@ -258,5 +258,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);
-@@ -268,5 +268,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
-@@ -293,5 +293,5 @@
- if (node.has_child("dynaPatches") &&
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: c825787cfc67de93148b46bd299c6d2ee3ce078b
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Mar 28 07:20:03 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 28 07:39:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c825787c
games-emulation/pcsx2: sync live
PV bit was already in other ebuilds, overlooked to sync before
(upstream can be picky about modifications and it doesn't hurt to
indicate this is Gentoo's version while we adjust tag manually).
rapidyaml restriction no longer matter as it works with 0.4 too
now, albeit we don't have <0.5 in tree anymore anyway.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 5d05ef3be008..a0683b3c3d85 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
- >=dev-cpp/rapidyaml-0.5:=
+ dev-cpp/rapidyaml:=
dev-libs/libaio
dev-libs/libchdr
dev-libs/libfmt:=
@@ -129,7 +129,7 @@ src_prepare() {
-i pcsx2/Frontend/CommonHost.cpp || die
if [[ ${PV} != ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
-i cmake/Pcsx2Utils.cmake || die
# delete all 3rdparty/* except known-used ones in non-live
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: a0836b8cd43da0ae917cc83828816656978a62f0
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Mar 28 07:22:09 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 28 07:39:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0836b8c
games-emulation/pcsx2: add 1.7.4280
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 237
2 files changed, 238 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 24fbffc4a4d7..5b6690e3e7cc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B
fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37
SHA512
382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
+DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B
822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585
SHA512
60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
new file mode 100644
index ..a0683b3c3d85
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan
wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 17cda78d199334cbefafec6e36ee837733159133
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Mar 25 02:05:28 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 25 03:18:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cda78d
games-emulation/pcsx2: drop 1.7.4042
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.4042.ebuild | 237
2 files changed, 238 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 3bc6aef3e272..24fbffc4a4d7 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B
31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc
SHA512
553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B
fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37
SHA512
382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
deleted file mode 100644
index e94d9f32ace2..
--- a/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
- app-arch/xz-utils
- app-arch/zstd:=
- >=dev-cpp/rapidyaml-0.5:=
- dev-libs/libaio
- dev-libs/libchdr
- dev-libs/libfmt:=
- dev-libs/libzip:=[zstd]
- dev-qt/qtbase:6[gui,network,widgets]
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 42177c71dd144e397935801799dd37d4e416fc47
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Mar 21 05:17:05 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 21 05:44:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42177c71
games-emulation/pcsx2: update live, add IUSE=backtrace
Unsure about the USE choice, library is scarcely used and so
no real point of reference. Considered a generic USE=debug,
but going with a described local USE.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/metadata.xml | 1 +
games-emulation/pcsx2/pcsx2-.ebuild | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/metadata.xml
b/games-emulation/pcsx2/metadata.xml
index efa1131e61ab..cf7d628cd86c 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,6 +14,7 @@
Gentoo Games Project
+ Display a backtrace on crash using
sys-libs/libbacktrace
Enable support for the
media-sound/sndio backend
Enable support for Vulkan
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index be5cf31b436b..5d05ef3be008 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -35,7 +35,7 @@ LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan
wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -61,6 +61,7 @@ RDEPEND="
virtual/libudev:=
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
+ backtrace? ( sys-libs/libbacktrace )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
sndio? ( media-sound/sndio:= )
@@ -149,6 +150,7 @@ src_configure() {
use vulkan && append-flags -fno-strict-aliasing
local mycmakeargs=(
+ $(cmake_use_find_package backtrace Libbacktrace)
-DBUILD_SHARED_LIBS=no
-DDISABLE_BUILD_DATE=yes
-DENABLE_TESTS=$(usex test)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: f6dba5f29cf07fe56bb626629d1fdace85c5b5dd
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Mar 19 22:27:53 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Mar 19 22:44:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dba5f2
games-emulation/pcsx2: update live
Upstream still bundles old rapidyaml but it's now compatible with 0.5.
As for the man page, it was removed entirely upstream. It contained
rather outdated info and was not useful anymore either way.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 55f64e2732eb..be5cf31b436b 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -80,7 +80,6 @@ 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() {
@@ -189,8 +188,7 @@ src_install() {
insinto /usr/share/${PN}
doins -r "${BUILD_DIR}"/bin/resources
- dodoc README.md
bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt}
- newman bin/docs/PCSX2.1 ${PN}.1
+ dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
newicon bin/resources/icons/AppIconLarge.png ${PN}.png
make_desktop_entry ${PN} ${PN^^}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 440d47aba903e382dc6422c4c3fa3b6161ddd4af
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Mar 12 06:41:58 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Mar 12 06:41:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440d47ab
games-emulation/pcsx2: add 1.7.4217
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.4217.ebuild | 237
2 files changed, 238 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c3008a630dbc..3bc6aef3e272 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B
31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc
SHA512
553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
+DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B
fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37
SHA512
382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild
new file mode 100644
index ..e94d9f32ace2
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test?
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 811dae60f0634a9ba92a103baf311f521e897fc6
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Feb 13 11:03:31 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Feb 13 11:32:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811dae60
games-emulation/pcsx2: drop 1.7.3958
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.3958.ebuild | 237
2 files changed, 238 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 48c05a44627a..c3008a630dbc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B
1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d
SHA512
1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B
31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc
SHA512
553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
deleted file mode 100644
index e94d9f32ace2..
--- a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
- app-arch/xz-utils
- app-arch/zstd:=
- >=dev-cpp/rapidyaml-0.5:=
- dev-libs/libaio
- dev-libs/libchdr
- dev-libs/libfmt:=
- dev-libs/libzip:=[zstd]
- dev-qt/qtbase:6[gui,network,widgets]
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: aff547c621ec5e906c7104ef440636cabb547371
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Feb 9 22:29:56 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 9 22:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff547c6
games-emulation/pcsx2: add 1.7.4042
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.4042.ebuild | 237
2 files changed, 238 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 5e61a4289376..48c05a44627a 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B
1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d
SHA512
1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
+DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B
31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc
SHA512
553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
new file mode 100644
index ..e94d9f32ace2
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test?
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: eda8d7d1fb76049e1c71237dab717bf6a85220e0
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Feb 2 22:05:47 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 2 22:51:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda8d7d1
games-emulation/pcsx2: update glslang comment + add bugref
ResourceLimits.h bit can (now) be solved and so isn't entirely
accurate, albeit requires work and unbundling will still increase
the maintenance burden over time as it's not that uncommon for
glslang to break its API.
Unless upstream actively tries to keep up with glslang, it may
be best kept left like that.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 4 ++--
games-emulation/pcsx2/pcsx2-1.7.3958.ebuild | 4 ++--
games-emulation/pcsx2/pcsx2-.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 57249a1e145e..951c4e4fe7c8 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -110,8 +110,8 @@ src_unpack() {
3rdparty/rapidyaml/rapidyaml/extern/c4core
3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
- # uses glslang's StandAlone/ResourceLimits.h
unavailable with
- # system's (also keep bundled vulkan-headers to be in
sync)
+ # glslang can be troublesome to unbundle (bug #831217),
+ # also keep vulkan-headers to stay in sync
$(usev vulkan '
3rdparty/glslang/glslang
3rdparty/vulkan-headers')
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
index 176d63a0bcb9..e94d9f32ace2 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
@@ -96,8 +96,8 @@ src_unpack() {
3rdparty/rapidyaml/rapidyaml/extern/c4core
3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
- # uses glslang's StandAlone/ResourceLimits.h
unavailable with
- # system's (also keep bundled vulkan-headers to be in
sync)
+ # glslang can be troublesome to unbundle (bug #831217),
+ # also keep vulkan-headers to stay in sync
$(usev vulkan '
3rdparty/glslang/glslang
3rdparty/vulkan-headers')
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 4cddbd425737..55f64e2732eb 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -96,8 +96,8 @@ src_unpack() {
3rdparty/rapidyaml/rapidyaml/extern/c4core
3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
- # uses glslang's StandAlone/ResourceLimits.h
unavailable with
- # system's (also keep bundled vulkan-headers to be in
sync)
+ # glslang can be troublesome to unbundle (bug #831217),
+ # also keep vulkan-headers to stay in sync
$(usev vulkan '
3rdparty/glslang/glslang
3rdparty/vulkan-headers')
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 4098f593e47763b98c366f5b4d435bb91c919dc2
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 30 18:54:29 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 30 19:11:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4098f593
games-emulation/pcsx2: drop 1.7.3820
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 237
2 files changed, 238 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 4fa628dc037b..5e61a4289376 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B
39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834
SHA512
6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B
1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d
SHA512
1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
deleted file mode 100644
index 91963a439c7b..
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
- app-arch/xz-utils
- app-arch/zstd:=
- >=dev-cpp/rapidyaml-0.5:=
- dev-libs/libaio
- dev-libs/libchdr
- dev-libs/libfmt:=
- dev-libs/libzip:=[zstd]
- dev-qt/qtbase:6[gui,network,widgets]
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 28c4ff24d872f182d40935f6693f94cb754348c7
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jan 25 22:21:24 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jan 25 22:32:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c4ff24
games-emulation/pcsx2: add 1.7.3958
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.3958.ebuild | 237
2 files changed, 238 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d93cf8e3a65c..4fa628dc037b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B
39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834
SHA512
6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
+DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B
1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d
SHA512
1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
new file mode 100644
index ..176d63a0bcb9
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test?
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: b5530563219a42d294d8910dae7b04207dff51f6
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jan 12 22:32:45 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jan 12 22:40:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5530563
games-emulation/pcsx2: cleanup unused perl bdep
Not important but noticed nothing was using it anymore (or at
least in Qt6-only versions, leaving it alone for wx builds).
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 4 +---
games-emulation/pcsx2/pcsx2-.ebuild | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index 7c14ae265d5f..91963a439c7b 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -70,9 +70,7 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )"
-BDEPEND="
- dev-lang/perl
- dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools[linguist]"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 1ad975e4a014..4cddbd425737 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -70,9 +70,7 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )"
-BDEPEND="
- dev-lang/perl
- dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools[linguist]"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: 20f4fed7d27c518f834980a90ea3343c6d65db54
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jan 11 09:17:49 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jan 11 11:25:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f4fed7
games-emulation/pcsx2: make rapidyaml patch unconditional
A PR is pending upstream to bump bundled rapidyaml which will also
require >=0.5 if kept as-is, and 0.5 is stable now so there's little
reason not to change this (no need for a revbump in this case).
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 7 ++-
games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch | 7 ++-
games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 8 ++--
games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 8 ++--
games-emulation/pcsx2/pcsx2-.ebuild | 8 ++--
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-.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5af6fbc84760770a4a12bb2b018bc01ea8c5ad98
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jan 11 09:53:35 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jan 11 11:25:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af6fbc8
games-emulation/pcsx2: drop crcs patch in live
Upstream removed the CRC list entirely that I can see,
untested but assume this is no longer useful.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index a052878f071a..1ad975e4a014 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -79,7 +79,6 @@ FILECAPS=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-1.7.0-crcs.patch
"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 5f7c7b47044751ec5a546d2b30007f196fc3f1ff
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 2 15:39:18 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 2 15:47:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7c7b47
games-emulation/pcsx2: update live
XDG_STD=yes is now default and the option was replaced by a
legacy option to opt-out which we don't need to pass.
Similar for handling setcap.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index e2f804a6b008..73eae17a4f96 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -159,13 +159,11 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_BUILD_DATE=yes
- -DDISABLE_SETCAP=yes
-DENABLE_TESTS=$(usex test)
-DUSE_VTUNE=no
-DUSE_VULKAN=$(usex vulkan)
-DWAYLAND_API=$(usex wayland)
-DX11_API=yes # fails if X libs are missing even if disabled
- -DXDG_STD=yes
# note that the current upstream is somewhat hostile to using
system
# libs, system installs, or any modifications and may disregard
any
@@ -193,10 +191,10 @@ src_test() {
}
src_install() {
- newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
+ newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
insinto /usr/share/${PN}
- doins -r "${BUILD_DIR}"/pcsx2-qt/resources
+ doins -r "${BUILD_DIR}"/bin/resources
dodoc README.md
bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt}
newman bin/docs/PCSX2.1 ${PN}.1
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 0ee6e8f7f063044c104a431bfdc7b9cdc3f577e2
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 2 10:28:21 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 2 11:05:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee6e8f7
games-emulation/pcsx2: add comment about upstream
May be useful to know for anyone working on this.
Upstream doesn't seem to want to hear of non-appimage issues.
They also dislike that we do workarounds for these issues and
wants it pristine (no patch/sed, even tiny changes like changing
the path to find resources in /usr/share given been seemingly
refusing to add a cmake option to change it) and using bundled libs.
Hopefully may change if it gets a dedicated linux contributor, as
there's currently none and it's at most just drive-by PRs which
don't get maintained and eventually break.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index b9d68d63b68b..e2f804a6b008 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -161,13 +161,17 @@ src_configure() {
-DDISABLE_BUILD_DATE=yes
-DDISABLE_SETCAP=yes
-DENABLE_TESTS=$(usex test)
- -DUSE_SYSTEM_LIBS=yes
-DUSE_VTUNE=no
-DUSE_VULKAN=$(usex vulkan)
-DWAYLAND_API=$(usex wayland)
-DX11_API=yes # fails if X libs are missing even if disabled
-DXDG_STD=yes
+ # note that the current upstream is somewhat hostile to using
system
+ # libs, system installs, or any modifications and may disregard
any
+ # bugs that is not reproducible with the appimage using bundled
libs
+ -DUSE_SYSTEM_LIBS=yes
+
# sse4.1 is the bare minimum required, -m is required at build
time
# (see PCSX2Base.h) and it dies if no support at runtime
(AppInit.cpp)
# https://github.com/PCSX2/pcsx2/pull/4329
@@ -189,7 +193,6 @@ src_test() {
}
src_install() {
- # package mode was removed turning cmake_src_install into a noop
newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
insinto /usr/share/${PN}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 0b7309a9168d53db7c8ab0255320f5c6d4a295a4
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 2 06:16:36 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 2 06:17:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7309a9
games-emulation/pcsx2: adjust postinst elog to be more accurate
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 15 +++
games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 15 +++
games-emulation/pcsx2/pcsx2-.ebuild | 13 ++---
3 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 92f1596c955b..740fb1613eaa 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -225,13 +225,12 @@ pkg_postinst() {
if [[ ${PV} != && ( ! ${REPLACING_VERSIONS} || -v replacing_old )
]]; then
[[ -v replacing_old ]] && elog
- elog "${PN}-1.7.x is a development branch using a nightly
release model"
- elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting
old and lacks"
- elog "many notable features (e.g. native 64bit builds). Given
it may be a long"
- elog "time before there is a new stable, Gentoo will carry and
update 1.7.x"
- elog "roughly every months."
+ elog "${PN}-1.7.x is a development branch where .x increments
every changes."
+ elog "Stable 1.6.0 is getting old and lacks many notable
features (e.g. native"
+ elog "64bit builds). Given it may be a long time before there
is a new stable,"
+ elog "Gentoo will carry and update 1.7.x roughly every months."
elog
- elog "Please report an issue if feel a picked nightly release
needs to be"
- elog "updated ahead of time or masked (notably for handling
regressions)."
+ elog "Please report an issue if feel a picked version needs to
be updated ahead"
+ elog "of time or masked (notably for handling regressions)."
fi
}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index eebe34cc10de..caf2e5c05300 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -226,14 +226,13 @@ pkg_postinst() {
if [[ ${replacing} == @(|old) && ${PV} != ]]; then
elog
- elog "${PN}-1.7.x is a development branch using a nightly
release model"
- elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting
old and lacks"
- elog "many notable features (e.g. native 64bit builds). Given
it may be a long"
- elog "time before there is a new stable, Gentoo will carry and
update 1.7.x"
- elog "roughly every months."
+ elog "${PN}-1.7.x is a development branch where .x increments
every changes."
+ elog "Stable 1.6.0 is getting old and lacks many notable
features (e.g. native"
+ elog "64bit builds). Given it may be a long time before there
is a new stable,"
+ elog "Gentoo will carry and update 1.7.x roughly every months."
elog
- elog "Please report an issue if feel a picked nightly release
needs to be"
- elog "updated ahead of time or masked (notably for handling
regressions)."
+ elog "Please report an issue if feel a picked version needs to
be updated ahead"
+ elog "of time or masked (notably for handling regressions)."
fi
if [[ ${replacing} == wx ]]; then
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 88c5807335b7..b9d68d63b68b 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -226,14 +226,13 @@ pkg_postinst() {
if [[ ${replacing} == @(|old) && ${PV} != ]]; then
elog
- elog "${PN}-1.7.x is a development branch using a nightly
release model"
- elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting
old and lacks"
- elog "many notable features (e.g. native 64bit builds). Given
it may be a long"
- elog "time before there is a new stable, Gentoo will carry and
update 1.7.x"
- elog "roughly every months."
+ elog "${PN}-1.7.x
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: babbb3349e064e71743b372d272b89eba67b03a4
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 2 05:33:08 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 2 05:46:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babbb334
games-emulation/pcsx2: switch icon in live
The linux_various directory is about to be removed, and this
other icon is higher quality anyway. PCSX2.desktop.in will also
be removed but had already switched to make_desktop_entry.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index eebe34cc10de..88c5807335b7 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -198,7 +198,7 @@ src_install() {
dodoc README.md
bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt}
newman bin/docs/PCSX2.1 ${PN}.1
- newicon linux_various/PCSX2.xpm ${PN}.xpm
+ newicon bin/resources/icons/AppIconLarge.png ${PN}.png
make_desktop_entry ${PN} ${PN^^}
}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 39e5ef3b9ea88d074e3b05197864033ce73c5af0
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Dec 30 17:53:31 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Dec 30 18:06:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e5ef3b
games-emulation/pcsx2: add 1.7.3820, drop 1.7.3818
Early bump to include fix for a notable microVU regression since 3813.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 2 +-
games-emulation/pcsx2/{pcsx2-1.7.3818.ebuild => pcsx2-1.7.3820.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index b99b2a8df7f3..d93cf8e3a65c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,6 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.3818.tar.gz 9165699 BLAKE2B
adfff6d4c1fc74e6fab052a03ec42b519f3cd9898c5719482e8b9bbdb9d224caf9a4bb95aef3e4f3993944e877e9a4f79e48d74e427c59c70c1480238ee0146b
SHA512
4a3bdd4d4b18fa06fd942ed93ff2bc9dd5e332bdf59ba5fc54b185e6e58957d4f5da74e4371cfb6964696a2ed08df61fdc1d3738ce9b781a39c7c08f10e9c99e
+DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B
39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834
SHA512
6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
similarity index 100%
rename from games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: 717057acb2353e96dddbdcbddae8e34a4af23f93
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Dec 29 16:15:05 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Dec 29 20:28:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717057ac
games-emulation/pcsx2: drop 1.7.3602
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../pcsx2/files/pcsx2-1.7.3329-musl.patch | 9 -
games-emulation/pcsx2/pcsx2-1.7.3602.ebuild| 242 -
3 files changed, 252 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d2c09dbfd961..6866d173ca7c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,4 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B
bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea
SHA512
cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
deleted file mode 100644
index 95d2ff38a8c2..
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
a/pcsx2/USB/qemu-usb/iov.h
-+++ b/pcsx2/USB/qemu-usb/iov.h
-@@ -17,5 +17,5 @@
- #define IOV_H
-
--#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) /*
/usr/include/bits/uio.h */
-+#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) &&
!defined(__DEFINED_struct_iovec)
- struct iovec
- {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
deleted file mode 100644
index f2949fc2a844..
--- a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic wxwidgets
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
-else
- HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
- HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
-
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
- -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
-
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
- -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
- vulkan? (
-
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
- -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
- )"
- KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/;
-
-LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
- ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 9e5a5e76bb743ac23db130f86f9569821ca5258b
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Dec 29 20:24:37 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Dec 29 20:28:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5a5e76
games-emulation/pcsx2: add 1.7.3818 (qt6-only, masked)
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.3818.ebuild | 244
2 files changed, 245 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 6866d173ca7c..b99b2a8df7f3 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
+DIST pcsx2-1.7.3818.tar.gz 9165699 BLAKE2B
adfff6d4c1fc74e6fab052a03ec42b519f3cd9898c5719482e8b9bbdb9d224caf9a4bb95aef3e4f3993944e877e9a4f79e48d74e427c59c70c1480238ee0146b
SHA512
4a3bdd4d4b18fa06fd942ed93ff2bc9dd5e332bdf59ba5fc54b185e6e58957d4f5da74e4371cfb6964696a2ed08df61fdc1d3738ce9b781a39c7c08f10e9c99e
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
new file mode 100644
index ..eebe34cc10de
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
+RDEPEND="
+ app-arch/xz-utils
+ app-arch/zstd:=
+ dev-cpp/rapidyaml:=
+ dev-libs/libaio
+ dev-libs/libchdr
+ dev-libs/libfmt:=
+ dev-libs/libzip:=[zstd]
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: 8d20cc57acca57295f7b20b3313d83625d9947a7
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Dec 29 02:00:41 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Dec 29 02:04:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d20cc57
games-emulation/pcsx2: update rapidyaml patch for live
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch | 63 ++
games-emulation/pcsx2/pcsx2-.ebuild| 2 +-
2 files changed, 64 insertions(+), 1 deletion(-)
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
new file mode 100644
index ..bded24136fe3
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch
@@ -0,0 +1,63 @@
+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
+--- a/pcsx2/GameDatabase.cpp
b/pcsx2/GameDatabase.cpp
+@@ -176,5 +176,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;
+@@ -207,5 +207,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;
+@@ -237,5 +237,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());
+@@ -258,5 +258,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);
+@@ -268,5 +268,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
+@@ -293,5 +293,5 @@
+ if (node.has_child("dynaPatches") && node["dynaPatches"].has_children())
+ {
+- for (const ryml::NodeRef& n : node["dynaPatches"].children())
++ for (const ryml::ConstNodeRef& n :
node["dynaPatches"].children())
+ {
+ DynamicPatch patch;
+@@ -299,5 +299,5 @@
+ if (n.has_child("pattern") &&
n["pattern"].has_children())
+ {
+- for (const ryml::NodeRef& db_pattern :
n["pattern"].children())
++ for (const ryml::ConstNodeRef& db_pattern :
n["pattern"].children())
+ {
+ DynamicPatchEntry entry;
+@@ -307,5 +307,5 @@
+ patch.pattern.push_back(entry);
+ }
+- for (const ryml::NodeRef& db_replacement :
n["replacement"].children())
++ for (const ryml::ConstNodeRef& db_replacement :
n["replacement"].children())
+ {
+ DynamicPatchEntry entry;
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 17916151687b..eebe34cc10de 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -128,7 +128,7 @@ 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
+ eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
cmake_src_prepare
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
commit: f7db54db79dff86b89c25f3e4828c41ae47d67ac
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Dec 24 15:32:27 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Dec 24 16:01:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7db54db
games-emulation/pcsx2: drop wxGTK support in live
Upstream dropped support, so have to go along. This allow to cleanup
a few things/patches, and makes others worse like manual src_install.
Will wait a bit before doing a non-live release given upstream is
still doing last minute fixes for wx cleanup (tests are notably
broken given they still try to use removed functions).
Signed-off-by: Ionen Wolkens gentoo.org>
.../pcsx2/files/pcsx2-1.7.3773-lto.patch | 9 +++
games-emulation/pcsx2/pcsx2-.ebuild| 89 --
2 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
new file mode 100644
index ..cd0574bd5653
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
@@ -0,0 +1,9 @@
+Don't rely on the cmake macro to pass -fno-lto to the problematic
+FastJmp.cpp so that it works if users add -flto themselves.
+--- a/common/CMakeLists.txt
b/common/CMakeLists.txt
+@@ -275,3 +275,3 @@
+
+-if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
++if (USE_GCC)
+ # GCC LTO doesn't work with asm statements
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 43d70a563a48..17916151687b 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic wxwidgets
+inherit cmake desktop fcaps flag-o-matic
if [[ ${PV} == ]]; then
inherit git-r3
@@ -36,44 +35,34 @@ LICENSE="
GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
-# dlopen: ffmpeg, qtsvg, vulkan-loader
+# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
RDEPEND="
app-arch/xz-utils
app-arch/zstd:=
dev-cpp/rapidyaml:=
dev-libs/libaio
dev-libs/libchdr
- >=dev-libs/libfmt-7.1.3:=
+ dev-libs/libfmt:=
dev-libs/libzip:=[zstd]
- media-libs/harfbuzz
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6
media-libs/libglvnd
media-libs/libpng:=
>=media-libs/libsdl2-2.0.22[haptic,joystick]
media-libs/libsoundtouch:=
media-video/ffmpeg:=
net-libs/libpcap
+ net-misc/curl
sys-libs/zlib:=
virtual/libudev:=
- x11-libs/libX11
x11-libs/libXrandr
alsa? ( media-libs/alsa-lib )
jack? ( virtual/jack )
pulseaudio? ( media-libs/libpulse )
- qt6? (
- dev-qt/qtbase:6[gui,network,widgets]
- dev-qt/qtsvg:6
- net-misc/curl
- )
- !qt6? (
- dev-libs/glib:2
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[wayland?]
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- )
sndio? ( media-sound/sndio:= )
vulkan? ( media-libs/vulkan-loader )
wayland? ( dev-libs/wayland )"
@@ -83,8 +72,7 @@ DEPEND="
test? ( dev-cpp/gtest )"
BDEPEND="
dev-lang/perl
- qt6? ( dev-qt/qttools[linguist] )
- !qt6? ( sys-devel/gettext )"
+ dev-qt/qttools[linguist]"
FILECAPS=(
-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
@@ -92,10 +80,9 @@ FILECAPS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.7.0-crcs.patch
- "${FILESDIR}"/${PN}-1.7.3329-lto.patch
- "${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.3773-lto.patch
)
src_unpack() {
@@ -145,8 +132,7 @@ src_prepare() {
cmake_src_prepare
- # qt6 build doesn't support PACKAGE_MODE and need to set resources
location
- sed -e "/EmuFolders::AppRoot =/s|=.*|=
\"${EPREFIX}/usr/share/PCSX2\";|" \
+ sed -e "/EmuFolders::AppRoot =/s|=.*|=
\"${EPREFIX}/usr/share/${PN}\";|" \
-i pcsx2/Frontend/CommonHost.cpp || die
if [[ ${PV} != ]]; then
@@ -157,7 +143,7 @@ src_prepare() {
local keep=(
# TODO?: rapidjson and xbyak are packaged and could be
unbundlable
# w/ patch, and discord-rpc be optional w/ dependency
on rapidjson
- cpuinfo cubeb
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: a86175270f346bb3bba8ecacff684dcf3a6a1a71 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Dec 22 06:37:54 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Dec 22 08:30:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8617527 games-emulation/pcsx2: update live to depend on ffmpeg This dlopen() it, but still using binding := to ensure it builds with matching headers. The cmake include/library "not found" message is harmless as long as at least the version is found (emits a warning if it attempts to use bundled headers, on non-live will fail if attempts this given headers will be deleted). Note that recording doesn't really work without qt6 (doesn't even have menus to select codecs), albeit still uses headers if disabled. Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/games-emulation/pcsx2/pcsx2-.ebuild b/games-emulation/pcsx2/pcsx2-.ebuild index 92f1596c955b..43d70a563a48 100644 --- a/games-emulation/pcsx2/pcsx2-.ebuild +++ b/games-emulation/pcsx2/pcsx2-.ebuild @@ -40,6 +40,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland" REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support RESTRICT="!test? ( test )" +# dlopen: ffmpeg, qtsvg, vulkan-loader RDEPEND=" app-arch/xz-utils app-arch/zstd:= @@ -53,6 +54,7 @@ RDEPEND=" media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= + media-video/ffmpeg:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:=
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/
commit: b325de0014c8ede50010e246d914948822f56dcb
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Dec 19 03:49:02 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Dec 19 05:47:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b325de00
games-emulation/pcsx2: fix build with rapidyaml-0.5.0
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch | 42 ++
games-emulation/pcsx2/pcsx2-1.7.3602.ebuild| 5 +++
games-emulation/pcsx2/pcsx2-.ebuild| 5 +++
3 files changed, 52 insertions(+)
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 ..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-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index 119d33bb8302..92f1596c955b 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.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
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: 77820d419fbe3f7505c0788bca30835e8c4f7552
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Dec 19 04:45:32 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Dec 19 05:47:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77820d41
games-emulation/pcsx2: add 1.7.3738
Note may be one of last few releases with wxGTK support as upstream
is planning to go Qt6-only (not merged yet). When this happens new
releases will be masked until Qt6 is unmasked in ::gentoo.
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/Manifest | 1 +
games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 237
2 files changed, 238 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ba64d50a4cff..d2c09dbfd961 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B
d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e
SHA512
0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B
bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea
SHA512
cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
+DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B
51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66
SHA512
7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B
7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10
SHA512
2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B
f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487
SHA512
5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B
39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84
SHA512
cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
new file mode 100644
index ..92f1596c955b
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic wxwidgets
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git;
+else
+ HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+ HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+ HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+ HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+ SRC_URI="
+ https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+ -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+
https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+ -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+ vulkan? (
+
https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+ -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+ ->
${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+ )"
+ KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/;
+
+LICENSE="
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/xz-utils
+ app-arch/zstd:=
+
[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
commit: f96dba3c41f644e150f070bc617afc7ccb1f25eb
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Dec 18 05:25:44 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Dec 18 05:38:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96dba3c
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/pcsx2/pcsx2-.ebuild | 5 -
1 file changed, 5 deletions(-)
diff --git a/games-emulation/pcsx2/pcsx2-.ebuild
b/games-emulation/pcsx2/pcsx2-.ebuild
index de7b59537121..119d33bb8302 100644
--- a/games-emulation/pcsx2/pcsx2-.ebuild
+++ b/games-emulation/pcsx2/pcsx2-.ebuild
@@ -68,7 +68,6 @@ RDEPEND="
)
!qt6? (
dev-libs/glib:2
- media-libs/libsamplerate
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3[wayland?]
x11-libs/wxGTK:${WX_GTK_VER}[X]
@@ -92,7 +91,6 @@ FILECAPS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.7.0-crcs.patch
"${FILESDIR}"/${PN}-1.7.3329-lto.patch
- "${FILESDIR}"/${PN}-1.7.3329-musl.patch
"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
@@ -144,9 +142,6 @@ src_prepare() {
sed -e "/EmuFolders::AppRoot =/s|=.*|=
\"${EPREFIX}/usr/share/PCSX2\";|" \
-i pcsx2/Frontend/CommonHost.cpp || die
- # non-cubeb pulseaudio is only used for usb-mic without qt6, not output
- use pulseaudio || :> cmake/FindPulseAudio.cmake || die
-
if [[ ${PV} != ]]; then
sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-i cmake/Pcsx2Utils.cmake || die
