* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2021-02-20 10:10 Michał Górny
0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2021-02-20 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 91844fc261e827777441311e7f2fda5d5ef98079
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 08:09:48 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 10:10:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91844fc2
games-emulation/pcsx2: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch | 26 -------
.../pcsx2/files/pcsx2-1.4.0-xgetbv.patch | 26 -------
games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild | 86 ----------------------
4 files changed, 139 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 15e66eee855..bb30d90e594 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1 @@
-DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
deleted file mode 100644
index cfc941f2824..00000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 9 Jan 2017 18:37:44 +0400
-Subject: [PATCH] x86emitter: gcc 5 compilation fix
-
----
- common/src/x86emitter/cpudetect.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp
-index 717ca89..cf94d7f 100644
---- a/common/src/x86emitter/cpudetect.cpp
-+++ b/common/src/x86emitter/cpudetect.cpp
-@@ -16,6 +16,9 @@
- #include "PrecompiledHeader.h"
- #include "cpudetect_internal.h"
- #include "internal.h"
-+#if defined(__GNUC__)
-+#include "x86intrin.h"
-+#endif
-
- using namespace x86Emitter;
-
---
-2.10.2
-
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
deleted file mode 100644
index e90b0df9b6e..00000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 171e7f016dc9e132f9faf40a22f0312d45d356a5 Mon Sep 17 00:00:00 2001
-From: Jonathan Li <jonathan.li@hotmail.co.uk>
-Date: Fri, 11 May 2018 01:42:27 +0100
-Subject: [PATCH] common: Work around GCC8 _xgetbv bug
-
-clang and earlier GCC versions do not provide the _xgetbv intrinsic.
-GCC8 does, but unfortunately it's broken.
-(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684).
-
-Re-use our _xgetbv implementation to avoid the bug, but rename it to
-avoid compilation errors as well.
----
- common/include/x86emitter/x86_intrin.h | 7 ++++---
- common/src/x86emitter/cpudetect.cpp | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
---- a/common/include/intrin_x86.h
-+++ b/common/include/intrin_x86.h
-@@ -107 +107 @@ static __inline__ __attribute__((always_inline)) void __cpuidex(int CPUInfo[], c
--static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index)
-+static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv_pcsx2(unsigned int index)
---- a/common/src/x86emitter/cpudetect.cpp
-+++ b/common/src/x86emitter/cpudetect.cpp
-@@ -273 +276 @@ void x86capabilities::Identify()
-- if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
-+ if((_xgetbv_pcsx2(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
deleted file mode 100644
index fc48152454b..00000000000
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-MY_PV="${PV/_/-}"
-
-inherit cmake multilib wxwidgets
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
-SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="
- app-arch/bzip2[abi_x86_32(-)]
- app-arch/xz-utils[abi_x86_32(-)]
- dev-libs/libaio[abi_x86_32(-)]
- media-libs/alsa-lib[abi_x86_32(-)]
- media-libs/libpng:=[abi_x86_32(-)]
- media-libs/libsdl[abi_x86_32(-),joystick,sound]
- media-libs/libsoundtouch[abi_x86_32(-)]
- media-libs/portaudio[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- x11-libs/gtk+:2[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/wxGTK:3.0[abi_x86_32(-),X]
-"
-DEPEND="${RDEPEND}
- dev-cpp/pngpp
- dev-cpp/sparsehash
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc5.patch
- "${FILESDIR}"/${P}-xgetbv.patch
-)
-
-src_configure() {
- multilib_toolchain_setup x86
-
- # pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
- # if it something other than "Devel|Debug|Release"
- local CMAKE_BUILD_TYPE="Release"
-
- if use amd64; then
- # Passing correct CMAKE_TOOLCHAIN_FILE for amd64
- # https://github.com/PCSX2/pcsx2/pull/422
- local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
- fi
-
- local mycmakeargs=(
- -DARCH_FLAG=
- -DDISABLE_BUILD_DATE=TRUE
- -DDISABLE_PCSX2_WRAPPER=TRUE
- -DEXTRA_PLUGINS=FALSE
- -DOPTIMIZATION_FLAG=
- -DPACKAGE_MODE=TRUE
- -DXDG_STD=TRUE
-
- -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
- -DDOC_DIR=/usr/share/doc/"${PF}"
- -DEGL_API=FALSE
- -DGTK3_API=FALSE
- -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
- # wxGTK must be built against same sdl version
- -DSDL2_API=FALSE
- -DWX28_API=FALSE
- )
-
- WX_GTK_VER="3.0" setup-wxwidgets
- cmake_src_configure
-}
-
-src_install() {
- # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
- QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2022-02-19 10:45 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2022-02-19 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 67703b687d646403482c2b87d61626874097b2ba
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 10:08:27 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 10:45:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67703b68
games-emulation/pcsx2: fix wxwidgets detection, ignore /usr/lib64
PCSX2 tries to force a wx-config path while FindwxWidgets.cmake
would otherwise use the eclass' WX_CONFIG. Results in a build
failure if the wx-config-3.0 symlink points to the gtk2 version.
This previously worked by accident when cmake is in cross-compilation
mode given wx-config32-3.0 doesn't exist and fell back to WX_CONFIG.
Dirty fix but also force-ignore /usr/lib64 like the toolchain file
used to for now, many checks are fragile (e.g. GLU). Ultimately
these workarounds shouldn't be needed next release (64bit).
Thanks-to: Yuri Konotopov <ykonotopov <AT> gnome.org>
Bug: https://bugs.gentoo.org/833100
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.6.0-wx-config.patch | 20 ++++++++++++++++++++
games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild | 4 ++++
2 files changed, 24 insertions(+)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch
new file mode 100644
index 000000000000..bfa12b893dcd
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch
@@ -0,0 +1,20 @@
+Don't attempt to use /usr/bin/wx-config-3.0 which can point to the
+wrong wx-config depending on eselect'ed wxGTK profile. Furthermore
+that path does not use ESYSROOT.
+
+If unset, FindwxWidgets.cmake will use WX_CONFIG environment
+set by the wxwidgets eclass.
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -50,4 +50,5 @@
+ # lib32-wx3.0 => /usr/bin/wx-config32-3.0
+ # FindwxWidgets only searches for wx-config.
++#[[
+ if(CMAKE_CROSSCOMPILING)
+ # May need to fix the filenames for lib32-wx3.0.
+@@ -71,4 +72,5 @@
+ endif()
+ endif()
++#]]
+
+ find_package(wxWidgets COMPONENTS base core adv)
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
index cc399bd2cc8a..1986a75b650e 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
@@ -46,6 +46,7 @@ FILECAPS=(
PATCHES=(
"${FILESDIR}/${P}-disable-setcap.patch"
+ "${FILESDIR}/${P}-wx-config.patch"
)
pkg_setup() {
@@ -87,6 +88,9 @@ src_configure() {
# wxGTK must be built against same sdl version
-DSDL2_API=TRUE
-DUSE_VTUNE=FALSE
+
+ # mimic old toolchain file behavior (bug #833100 comment #20)
+ -DCMAKE_SYSTEM_IGNORE_PATH="${ESYSROOT}"/usr/lib64
)
setup-wxwidgets
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2022-09-27 23:46 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2022-09-27 23:46 UTC (permalink / raw
To: gentoo-commits
commit: b081f691a861628da5a9cbb59ca726108fc5e499
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 22:37:49 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 23:44:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b081f691
games-emulation/pcsx2: drop unnecessary patch
Ended up using -Werror=strict-prototypes to test things, but as far
as I'm aware this shouldn't be "needed" with clang16 either unless
something passes that -Werror. Should still get fixed upstream but
want less patches to manage here. Will revisit if needed.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.3329-clang16.patch | 19 -------------------
games-emulation/pcsx2/pcsx2-1.7.3329.ebuild | 1 -
games-emulation/pcsx2/pcsx2-9999.ebuild | 1 -
3 files changed, 21 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
deleted file mode 100644
index 331101ed6a1c..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/870412
---- a/3rdparty/cpuinfo/src/api.c
-+++ b/3rdparty/cpuinfo/src/api.c
-@@ -78 +78 @@
--const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
-+const struct cpuinfo_uarch_info* cpuinfo_get_uarchs(void) {
---- a/cmake/FindPCAP.cmake
-+++ b/cmake/FindPCAP.cmake
-@@ -47 +47 @@
--check_c_source_compiles("int main() { return 0; }" PCAP_LINKS_SOLO)
-+check_c_source_compiles("int main(void) { return 0; }" PCAP_LINKS_SOLO)
-@@ -55 +55 @@
-- check_c_source_compiles("int main() { return 0; }" PCAP_NEEDS_THREADS)
-+ check_c_source_compiles("int main(void) { return 0; }" PCAP_NEEDS_THREADS)
---- a/tests/ctest/CMakeLists.txt
-+++ b/tests/ctest/CMakeLists.txt
-@@ -20 +20 @@
-- int main() {
-+ int main(void) {
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
index b5e09ffc395f..6dd06cea5dcb 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -81,7 +81,6 @@ FILECAPS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.7.0-crcs.patch
- "${FILESDIR}"/${PN}-1.7.3329-clang16.patch
"${FILESDIR}"/${PN}-1.7.3329-lto.patch
"${FILESDIR}"/${PN}-1.7.3329-musl.patch
"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index bbe944648d41..f84ec7bab70e 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -81,7 +81,6 @@ FILECAPS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.7.0-crcs.patch
- "${FILESDIR}"/${PN}-1.7.3329-clang16.patch
"${FILESDIR}"/${PN}-1.7.3329-lto.patch
"${FILESDIR}"/${PN}-1.7.3329-musl.patch
"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2022-10-01 13:19 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2022-10-01 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 0c06dec36acae7fa390460376aff96bdef21ab03
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 12:50:08 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 13:17:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c06dec3
games-emulation/pcsx2: live temporary quick fixes
PCSX2 upstream has replaced the cubeb submodule by hard-including
it in its source /and/ modified them. Meaning unbundling is not
reasonable anymore without non-modified system copy.
New unbundling patch now omits cubeb, however this "fix" is partial
given cubeb will do automagic for its backends. Still need to
implement IUSE="jack alsa sndio ...". There's also a rust backend
full with crates but may not bother with that one in pcsx2's ebuild
(will explore how to handle these when do another nightly release).
Also need a new submodule (rcheevos), which may be possible to
force-unbundle (not looked at yet).
Users having problems with any of the above are advised to stick
to non-live =pcsx2-1.7*, or at least for now.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.3351-unbundle.patch | 34 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 10 +++++--
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
new file mode 100644
index 000000000000..014548ae9882
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3351-unbundle.patch
@@ -0,0 +1,34 @@
+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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f84ec7bab70e..36b8e5ccf0b7 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -25,9 +25,10 @@ DESCRIPTION="PlayStation 2 emulator"
HOMEPAGE="https://pcsx2.net/"
LICENSE="
- GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
+ GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ ISC LGPL-2.1+
LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
SLOT="0"
+# TODO: proper IUSE to handle cubeb backends with the now-required bundled copy
IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
RESTRICT="!test? ( test )"
@@ -40,7 +41,6 @@ RDEPEND="
dev-libs/libchdr
>=dev-libs/libfmt-7.1.3:=
dev-libs/libzip:=[zstd]
- media-libs/cubeb
media-libs/harfbuzz
media-libs/libglvnd
media-libs/libpng:=
@@ -84,8 +84,8 @@ PATCHES=(
"${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.3329-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
+ "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
)
src_unpack() {
@@ -102,6 +102,10 @@ src_unpack() {
3rdparty/rapidyaml/rapidyaml
3rdparty/rapidyaml/rapidyaml/extern/c4core
3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
+
+ # TODO?: check if easy to unbundle when look at next nightly bump
+ # (there is a -DUSE_ACHIVEMENTS to be optional too)
+ 3rdparty/rcheevos/rcheevos
)
fi
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2022-10-21 10:27 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2022-10-21 10:27 UTC (permalink / raw
To: gentoo-commits
commit: ca34cd1a112d4775ba5cbd5c22cf47f8161c7897
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 10:05:26 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 10:27:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca34cd1a
games-emulation/pcsx2: add 1.7.3468
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 3 +
.../files/pcsx2-1.7.3468-cubeb-automagic.patch | 56 +++++
games-emulation/pcsx2/metadata.xml | 1 +
games-emulation/pcsx2/pcsx2-1.7.3468.ebuild | 233 +++++++++++++++++++++
4 files changed, 293 insertions(+)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 3a8dfeb3dde4..7315d0ecf127 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,4 +1,7 @@
DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
+DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
+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
DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
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
new file mode 100644
index 000000000000..804cf29af397
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
@@ -0,0 +1,56 @@
+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/metadata.xml b/games-emulation/pcsx2/metadata.xml
index e4c0e91aeda5..efa1131e61ab 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,6 +14,7 @@
<name>Gentoo Games Project</name>
</maintainer>
<use>
+ <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
<flag name="vulkan">Enable support for Vulkan</flag>
</use>
<upstream>
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
new file mode 100644
index 000000000000..25b97c43ac32
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
@@ -0,0 +1,233 @@
+# 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} == 9999 ]]; 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:=
+ dev-cpp/rapidyaml:=
+ dev-libs/libaio
+ dev-libs/libchdr
+ >=dev-libs/libfmt-7.1.3:=
+ dev-libs/libzip:=[zstd]
+ media-libs/harfbuzz
+ media-libs/libglvnd
+ media-libs/libpng:=
+ >=media-libs/libsdl2-2.0.22[haptic,joystick]
+ media-libs/libsoundtouch:=
+ net-libs/libpcap
+ 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
+ media-libs/libsamplerate
+ 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 )"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+ test? ( dev-cpp/gtest )"
+BDEPEND="
+ dev-lang/perl
+ qt6? ( dev-qt/qttools[linguist] )
+ !qt6? ( sys-devel/gettext )"
+
+FILECAPS=(
+ -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+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
+)
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ local EGIT_SUBMODULES=(
+ # 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
+ 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)
+ $(usev vulkan '
+ 3rdparty/glslang/glslang
+ 3rdparty/vulkan-headers')
+ )
+
+ git-r3_src_unpack
+ else
+ default
+
+ mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
+ mv fast_float-${HASH_FASTFLOAT} \
+ "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
+
+ rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
+ mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
+
+ if use vulkan; then
+ rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+ mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+ mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+ fi
+ fi
+}
+
+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\";|" \
+ -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} != 9999 ]]; then
+ sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+ -i cmake/Pcsx2Utils.cmake || die
+
+ # delete all 3rdparty/* except known-used ones in non-live
+ 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 discord-rpc glad imgui include jpgd lzma
+ rapidjson rapidyaml rcheevos simpleini xbyak
+ $(usev vulkan 'glslang vulkan-headers')
+ )
+ find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+ -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+ fi
+}
+
+src_configure() {
+ use qt6 || setup-wxwidgets
+
+ # for bundled glslang (bug #858374)
+ use vulkan && append-flags -fno-strict-aliasing
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=no
+ -DDISABLE_BUILD_DATE=yes
+ -DDISABLE_PCSX2_WRAPPER=yes
+ -DDISABLE_SETCAP=yes
+ -DENABLE_TESTS=$(usex test)
+ -DPACKAGE_MODE=yes
+ -DQT_BUILD=$(usex qt6)
+ -DUSE_SYSTEM_LIBS=yes
+ -DUSE_VTUNE=no
+ -DUSE_VULKAN=$(usex vulkan)
+ -DWAYLAND_API=$(usex wayland)
+ -DXDG_STD=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
+ -DARCH_FLAG=-msse4.1
+
+ # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
+ -DCHECK_ALSA=$(usex alsa)
+ -DCHECK_JACK=$(usex jack)
+ -DCHECK_PULSE=$(usex pulseaudio)
+ -DCHECK_SNDIO=$(usex sndio)
+ -DLAZY_LOAD_LIBS=no
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build unittests
+}
+
+src_install() {
+ cmake_src_install
+
+ use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ local replacing_old
+ if [[ ${REPLACING_VERSIONS##* } ]] &&
+ ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
+ then
+ replacing_old=
+ elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
+ elog "it is recommended to backup your save states and memory cards before use."
+ elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+ fi
+
+ if [[ ${PV} != 9999 && ( ! ${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
+ 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)."
+ fi
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2022-10-27 22:19 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2022-10-27 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 9af2648cf253fc21104e174ed1d85171c11f477a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 21:30:34 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 22:17:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af2648c
games-emulation/pcsx2: drop 1.7.3329
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/Manifest | 1 -
.../pcsx2/files/pcsx2-1.7.3329-unbundle.patch | 41 -----
.../pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch | 9 -
games-emulation/pcsx2/pcsx2-1.7.3329.ebuild | 201 ---------------------
4 files changed, 252 deletions(-)
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 7315d0ecf127..06cde4e6d679 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.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
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-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
deleted file mode 100644
index 450329522183..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
+++ /dev/null
@@ -1,41 +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)
-@@ -243,3 +240,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)
-
-@@ -269,5 +267,3 @@
- if(CUBEB_API)
-- add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL)
-- target_compile_options(cubeb PRIVATE "-w")
-- target_compile_options(speex PRIVATE "-w")
-+ find_package(cubeb REQUIRED)
- endif()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
deleted file mode 100644
index d00f9553993d..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1
-/only/ if wxGTK was built with USE=sdl or else get a cmake unused options
-warning. Test code also fails with -Werror=strict-prototypes (clang16).
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -191,3 +191,2 @@
- if(NOT PCSX2_CORE)
-- WX_vs_SDL()
- endif()
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
deleted file mode 100644
index 6dd06cea5dcb..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ /dev/null
@@ -1,201 +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} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
- HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
- HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
- SRC_URI="
- https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.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 GPL-2+ LGPL-2.1+
- LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 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:=
- dev-cpp/rapidyaml:=
- dev-libs/libaio
- dev-libs/libchdr
- >=dev-libs/libfmt-7.1.3:=
- dev-libs/libzip:=[zstd]
- media-libs/cubeb
- media-libs/harfbuzz
- media-libs/libglvnd
- media-libs/libpng:=
- media-libs/libsamplerate
- >=media-libs/libsdl2-2.0.22[haptic,joystick]
- media-libs/libsoundtouch:=
- net-libs/libpcap
- sys-libs/zlib:=
- virtual/libudev:=
- x11-libs/libX11
- x11-libs/libXrandr
- 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]
- pulseaudio? ( media-libs/libpulse )
- )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-cpp/gtest )"
-BDEPEND="
- dev-lang/perl
- qt6? ( dev-qt/qttools[linguist] )
- !qt6? ( sys-devel/gettext )"
-
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-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.3329-unbundle.patch
- "${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- local EGIT_SUBMODULES=()
- if use vulkan; then
- EGIT_SUBMODULES+=(
- 3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
- 3rdparty/vulkan-headers # to keep in sync with glslang
- )
- fi
- git-r3_src_unpack
- else
- default
- if use vulkan; then
- rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
- mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
- mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
- fi
- fi
-}
-
-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\";|" \
- -i pcsx2/Frontend/CommonHost.cpp || die
-
- # pulseaudio is only used for usb-mic and without qt6, not for audio output
- { use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
-
- # GS tests currently fail to build with qt6
- use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
-
- if [[ ${PV} != 9999 ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
- -i cmake/Pcsx2Utils.cmake || die
-
- # delete all 3rdparty/* except known-used ones in non-live
- local keep=(
- cpuinfo glad imgui include jpgd lzma simpleini xbyak
- $(usev vulkan 'glslang vulkan-headers')
- )
- find 3rdparty -mindepth 1 -maxdepth 1 -type d \
- -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
- fi
-}
-
-src_configure() {
- use qt6 || setup-wxwidgets
-
- # for bundled glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_BUILD_DATE=yes
- -DDISABLE_PCSX2_WRAPPER=yes
- -DDISABLE_SETCAP=yes
- -DENABLE_TESTS=$(usex test)
- -DPACKAGE_MODE=yes
- -DQT_BUILD=$(usex qt6)
- -DUSE_SYSTEM_LIBS=yes
- -DUSE_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -DXDG_STD=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
- -DARCH_FLAG=-msse4.1
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- cmake_src_install
-
- use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- local replacing_old
- if [[ ${REPLACING_VERSIONS##* } ]] &&
- ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
- then
- replacing_old=
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
- elog "it is recommended to backup your save states and memory cards before use."
- elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
- fi
-
- if [[ ${PV} != 9999 && ( ! ${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
- 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)."
- fi
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2022-12-24 16:03 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2022-12-24 16:03 UTC (permalink / raw
To: gentoo-commits
commit: f7db54db79dff86b89c25f3e4828c41ae47d67ac
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 15:32:27 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 16:01:27 2022 +0000
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 <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.3773-lto.patch | 9 +++
games-emulation/pcsx2/pcsx2-9999.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 000000000000..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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 43d70a563a48..17916151687b 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.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} == 9999 ]]; 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} != 9999 ]]; 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 discord-rpc glad imgui include jpgd lzma
+ cpuinfo cubeb demangler discord-rpc glad imgui include jpgd lzma
rapidjson rapidyaml rcheevos simpleini xbyak zydis
$(usev vulkan 'glslang vulkan-headers')
)
@@ -167,23 +153,19 @@ src_prepare() {
}
src_configure() {
- use qt6 || setup-wxwidgets
-
# for bundled glslang (bug #858374)
use vulkan && append-flags -fno-strict-aliasing
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DDISABLE_BUILD_DATE=yes
- -DDISABLE_PCSX2_WRAPPER=yes
-DDISABLE_SETCAP=yes
-DENABLE_TESTS=$(usex test)
- -DPACKAGE_MODE=yes
- -DQT_BUILD=$(usex qt6)
-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
# sse4.1 is the bare minimum required, -m is required at build time
@@ -207,26 +189,43 @@ src_test() {
}
src_install() {
- cmake_src_install
+ # package mode was removed turning cmake_src_install into a noop
+ newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
- use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+ insinto /usr/share/${PN}
+ doins -r "${BUILD_DIR}"/pcsx2-qt/resources
+
+ 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
+ make_desktop_entry ${PN} ${PN^^}
}
pkg_postinst() {
fcaps_pkg_postinst
- local replacing_old
- if [[ ${REPLACING_VERSIONS##* } ]] &&
- ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
- then
- replacing_old=
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
- elog "it is recommended to backup your save states and memory cards before use."
- elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+ 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
+ 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 [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
- [[ -v replacing_old ]] && elog
+ if [[ ${replacing} == @(|old) && ${PV} != 9999 ]]; 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"
@@ -236,4 +235,10 @@ pkg_postinst() {
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)."
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
}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2023-04-05 13:25 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2023-04-05 13:25 UTC (permalink / raw
To: gentoo-commits
commit: ed0b72095d7a4830faf1d3e4e8580f04cefbdcae
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 5 12:40:21 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 5 13:21:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0b7209
games-emulation/pcsx2: drop 1.7.4217
Signed-off-by: Ionen Wolkens <ionen <AT> 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..000000000000
--- 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") && 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-1.7.4217.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild
deleted file mode 100644
index e94d9f32ace2..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4217.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} == 9999 ]]; 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]
- 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/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 )"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
-
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-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() {
- if [[ ${PV} == 9999 ]]; then
- local EGIT_SUBMODULES=(
- # 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
- 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
-
- # glslang can be troublesome to unbundle (bug #831217),
- # also keep vulkan-headers to stay in sync
- $(usev vulkan '
- 3rdparty/glslang/glslang
- 3rdparty/vulkan-headers')
- )
-
- git-r3_src_unpack
- else
- default
-
- mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
- mv fast_float-${HASH_FASTFLOAT} \
- "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
-
- rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
- mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
-
- if use vulkan; then
- rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
- mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
- mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
- fi
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
- -i pcsx2/Frontend/CommonHost.cpp || die
-
- if [[ ${PV} != 9999 ]]; then
- 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
- 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 demangler discord-rpc glad imgui include jpgd lzma
- rapidjson rapidyaml rcheevos simpleini xbyak zydis
- $(usev vulkan 'glslang vulkan-headers')
- )
- find 3rdparty -mindepth 1 -maxdepth 1 -type d \
- -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
- fi
-}
-
-src_configure() {
- # for bundled glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_BUILD_DATE=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
-
- # 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
- -DARCH_FLAG=-msse4.1
-
- # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
- -DCHECK_ALSA=$(usex alsa)
- -DCHECK_JACK=$(usex jack)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
-
- 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
-
- newicon bin/resources/icons/AppIconLarge.png ${PN}.png
- make_desktop_entry ${PN} ${PN^^}
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- 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
- 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} != 9999 ]]; 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
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2023-07-01 9:07 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2023-07-01 9:07 UTC (permalink / raw
To: gentoo-commits
commit: b8ec138c25f79c286acaf13a84905b32ea93649e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 08:54:08 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 09:07:18 2023 +0000
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 <ionen <AT> 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..000000000000
--- 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 <orbea@riseup.net>
-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.
- {0x00000000, 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,
- FR,
- DE,
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
deleted file mode 100644
index 1047105d646a..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Lazy fix for -Werror=odr and don't rely on the CMAKE macro to
-pass -fno-lto to the problematic FastJmp.cpp source with lto.
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -268,3 +268,3 @@
-
--if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-+if (USE_GCC)
- # GCC LTO doesn't work with asm statements
---- a/pcsx2/PAD/Linux/Device.h
-+++ b/pcsx2/PAD/Linux/Device.h
-@@ -31,3 +31,3 @@
-
--enum DeviceType
-+enum PADDeviceType
- {
-@@ -101,3 +101,3 @@
- DeviceAPI api;
-- DeviceType type;
-+ PADDeviceType type;
-
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
deleted file mode 100644
index 9ef82985dc99..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://github.com/PCSX2/pcsx2/commit/6386be09c2e disabled PACKAGE_MODE
-for reasons that make no sense as far as installing from an ebuild goes.
-
-Skip the error and handle the rest from the ebuild.
---- a/pcsx2-qt/CMakeLists.txt
-+++ b/pcsx2-qt/CMakeLists.txt
-@@ -7,3 +7,2 @@
- if (PACKAGE_MODE)
-- message(FATAL_ERROR "Package mode is not supported for Qt builds.")
- else()
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
deleted file mode 100644
index aee1608ea754..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 @@
- 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.3738-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
deleted file mode 100644
index b0b340795652..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2023 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} == 9999 ]]; 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 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:=
- >=dev-cpp/rapidyaml-0.5:=
- dev-libs/libaio
- dev-libs/libchdr
- dev-libs/libzip:=[zstd]
- media-libs/harfbuzz
- media-libs/libglvnd
- media-libs/libpng:=
- >=media-libs/libsdl2-2.0.22[haptic,joystick]
- media-libs/libsoundtouch:=
- net-libs/libpcap
- 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 )"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-cpp/gtest )"
-BDEPEND="
- dev-lang/perl
- qt6? ( dev-qt/qttools:6[linguist] )
- !qt6? ( sys-devel/gettext )"
-
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-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.3602-rapidyaml-0.5.0.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; 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
- 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
-
- # glslang can be troublesome to unbundle (bug #831217),
- # also keep vulkan-headers to stay in sync
- $(usev vulkan '
- 3rdparty/glslang/glslang
- 3rdparty/vulkan-headers')
- )
-
- git-r3_src_unpack
- else
- default
-
- mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
- mv fast_float-${HASH_FASTFLOAT} \
- "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
-
- rmdir "${S}"/3rdparty/fmt/fmt || die
- mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die
-
- rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
- mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
-
- if use vulkan; then
- rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
- mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
- mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
- fi
- fi
-}
-
-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\";|" \
- -i pcsx2/Frontend/CommonHost.cpp || die
-
- if [[ ${PV} != 9999 ]]; then
- sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
- -i cmake/Pcsx2Utils.cmake || die
-
- # delete all 3rdparty/* except known-used ones in non-live
- 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 discord-rpc fmt glad imgui include jpgd lzma
- rapidjson rapidyaml rcheevos simpleini xbyak zydis
- $(usev vulkan 'glslang vulkan-headers')
- )
- find 3rdparty -mindepth 1 -maxdepth 1 -type d \
- -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
- fi
-}
-
-src_configure() {
- use qt6 || setup-wxwidgets
-
- # for bundled glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -DDISABLE_BUILD_DATE=yes
- -DDISABLE_PCSX2_WRAPPER=yes
- -DDISABLE_SETCAP=yes
- -DENABLE_TESTS=$(usex test)
- -DPACKAGE_MODE=yes
- -DQT_BUILD=$(usex qt6)
- -DUSE_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -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
- -DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now"
-
- # 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
-
- # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
- -DCHECK_ALSA=$(usex alsa)
- -DCHECK_JACK=$(usex jack)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- cmake_src_install
-
- use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- local replacing_old
- if [[ ${REPLACING_VERSIONS##* } ]] &&
- ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
- then
- replacing_old=
- elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
- elog "it is recommended to backup your save states and memory cards before use."
- elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
- fi
-
- if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
- [[ -v replacing_old ]] && 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
-}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
deleted file mode 100644
index d2af26b4d0ef..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
+++ /dev/null
@@ -1,253 +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} == 9999 ]]; 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 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="
- 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/libsoundtouch:=
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- 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:= )
- vulkan? ( media-libs/vulkan-loader )
- wayland? ( dev-libs/wayland )"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; 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
- 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
-
- # glslang can be troublesome to unbundle (bug #831217),
- # also keep vulkan-headers to stay in sync
- $(usev vulkan '
- 3rdparty/glslang/glslang
- 3rdparty/vulkan-headers')
- )
-
- git-r3_src_unpack
- else
- default
-
- mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
- mv fast_float-${HASH_FASTFLOAT} \
- "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
-
- rmdir "${S}"/3rdparty/fmt/fmt || die
- mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die
-
- rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
- mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
-
- if use vulkan; then
- rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
- mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
- mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
- fi
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
- -i pcsx2/Pcsx2Config.cpp || die
-
- if [[ ${PV} != 9999 ]]; then
- 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
- 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 demangler discord-rpc fmt glad imgui include jpgd
- lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis
- $(usev vulkan 'glslang vulkan-headers')
- )
- find 3rdparty -mindepth 1 -maxdepth 1 -type d \
- -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || 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
- # (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_VTUNE=no
- -DUSE_VULKAN=$(usex vulkan)
- -DWAYLAND_API=$(usex wayland)
- -DX11_API=yes # fails if X libs are missing even if disabled
-
- # 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
- -DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now"
-
- # 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
-
- # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
- -DCHECK_ALSA=$(usex alsa)
- -DCHECK_JACK=$(usex jack)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
-
- insinto /usr/share/${PN}
- doins -r "${BUILD_DIR}"/bin/resources
-
- dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
- newicon bin/resources/icons/AppIconLarge.png ${PN}.png
- make_desktop_entry ${PN} ${PN^^}
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- 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
- 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} != 9999 ]]; 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
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2023-08-06 4:32 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2023-08-06 4:32 UTC (permalink / raw
To: gentoo-commits
commit: ecfb63aac9ba9449e8cba57d9b7683c17752c567
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 00:48:11 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 04:27:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfb63aa
games-emulation/pcsx2: drop 1.7.4624
Signed-off-by: Ionen Wolkens <ionen <AT> 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 d986666bdaa4..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..000000000000
--- 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..000000000000
--- 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} == 9999 ]]; 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 dbus 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
- 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/libsoundtouch:=
- media-video/ffmpeg:=
- net-libs/libpcap
- net-misc/curl
- 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:= )
- 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="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
- test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-FILECAPS=(
- -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
- "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
- "${FILESDIR}"/${PN}-1.7.3773-lto.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; 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
- 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
-
- # glslang can be troublesome to unbundle (bug #831217),
- # also keep vulkan-headers to stay in sync
- $(usev vulkan '
- 3rdparty/glslang/glslang
- 3rdparty/vulkan-headers')
- )
-
- git-r3_src_unpack
- else
- default
-
- mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
- mv fast_float-${HASH_FASTFLOAT} \
- "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
-
- rmdir "${S}"/3rdparty/fmt/fmt || die
- mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die
-
- rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
- mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
-
- if use vulkan; then
- rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
- mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
- mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
- fi
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
- -i pcsx2/Pcsx2Config.cpp || die
-
- if [[ ${PV} != 9999 ]]; then
- 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
- 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 demangler discord-rpc fmt glad imgui include jpgd
- lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis
- $(usev vulkan 'glslang vulkan-headers')
- )
- find 3rdparty -mindepth 1 -maxdepth 1 -type d \
- -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || 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
- # (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
-
- # 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
- -DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now"
-
- # 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
-
- # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
- -DCHECK_ALSA=$(usex alsa)
- -DCHECK_JACK=$(usex jack)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
-
- insinto /usr/share/${PN}
- doins -r "${BUILD_DIR}"/bin/resources
-
- dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
- newicon bin/resources/icons/AppIconLarge.png ${PN}.png
- make_desktop_entry ${PN} ${PN^^}
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- 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
- 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} != 9999 ]]; 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
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2023-08-25 4:41 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2023-08-25 4:41 UTC (permalink / raw
To: gentoo-commits
commit: a08a828b4f780c33942e24591da4faa6c8508521
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 04:36:02 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 04:41:00 2023 +0000
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 <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch | 8 ++++++++
games-emulation/pcsx2/pcsx2-9999.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 000000000000..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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7d24c2ae54cd..f41481a3cf53 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.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() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2023-11-27 5:15 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2023-11-27 5:15 UTC (permalink / raw
To: gentoo-commits
commit: d2b2beabf1fb184106dc3b8eab5f8163ce96641c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 04:40:38 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 05:15:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b2beab
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/pcsx2-1.7.5232-cubeb-automagic.patch | 31 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.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 000000000000..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-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index c2e6420ddbfc..7978166a40b3 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.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() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2024-03-20 7:17 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2024-03-20 7:17 UTC (permalink / raw
To: gentoo-commits
commit: db171da487e687bc393c3b413480a8c276a716fc
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 05:18:22 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 07:01:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db171da4
games-emulation/pcsx2: drop 1.7.5312
Signed-off-by: Ionen Wolkens <ionen <AT> 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..000000000000
--- 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; 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() {
- # for bundled old glslang (bug #858374)
- use vulkan && append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=no
- -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 # 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
-
- # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
- -DCHECK_ALSA=$(usex alsa)
- -DCHECK_JACK=$(usex jack)
- -DCHECK_PULSE=$(usex pulseaudio)
- -DCHECK_SNDIO=$(usex sndio)
- -DLAZY_LOAD_LIBS=no
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build unittests
-}
-
-src_install() {
- insinto /usr/lib/${PN}
- doins -r "${BUILD_DIR}"/bin/.
-
- 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 -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
-
- 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 "The executable was also renamed from 'PCSX2' to 'pcsx2'."
- fi
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2024-05-17 5:21 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2024-05-17 5:21 UTC (permalink / raw
To: gentoo-commits
commit: d09ffa75a9a07a02a6060fef6d76268832b23ba2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 04:59:16 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 17 05:14:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09ffa75
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
| 18 ++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
--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 000000000000..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 <atomic>
+ #include <condition_variable>
++#include <cstring>
+
+ class Error;
+--- a/pcsx2/SPU2/defs.h
++++ b/pcsx2/SPU2/defs.h
+@@ -6,4 +6,5 @@
+ #include "GS/MultiISA.h"
+
++#include <algorithm>
+ #include <array>
+
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 69486b68cc68..643fe6a2b122 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.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() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/
@ 2024-05-31 4:37 Ionen Wolkens
0 siblings, 0 replies; 15+ messages in thread
From: Ionen Wolkens @ 2024-05-31 4:37 UTC (permalink / raw
To: gentoo-commits
commit: 799e337522114be710544bc8adc93f669f32b60d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 04:32:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 31 04:37:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799e3375
games-emulation/pcsx2: update live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/pcsx2-1.7.5855-no-libbacktrace.patch | 30 ++++++++++++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch
new file mode 100644
index 000000000000..220095f57aeb
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch
@@ -0,0 +1,30 @@
+libbacktrace used to be packaged in Gentoo but was last-rited due
+to [1], and as of [2] pcsx2 no longer let it be optional albeit the
+code to allow this still exists behind __APPLE__ which lacksit.
+
+May be revisited to see if re-packaging may be sane (not looked
+into the issue much, could potentially mask libbacktrace and pcsx2
+on musl, or even bundle libbacktrace), but for now drop the
+dependency again as it is fairly trivial.
+
+[1] https://bugs.gentoo.org/885471
+[2] https://github.com/PCSX2/pcsx2/commit/d48f527d6d88dfbf87
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -71,3 +71,2 @@
+
+- find_package(Libbacktrace REQUIRED)
+ find_package(PkgConfig REQUIRED)
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -161,3 +161,2 @@
+ ${DBUS_LINK_LIBRARIES}
+- libbacktrace::libbacktrace
+ X11::X11
+--- a/common/CrashHandler.cpp
++++ b/common/CrashHandler.cpp
+@@ -178,3 +178,3 @@
+
+-#elif !defined(__APPLE__)
++#elif 0
+
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3b09dfdebe2d..452519d49d92 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.4667-flags.patch
"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+ "${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
)
src_prepare() {
@@ -121,9 +122,6 @@ src_configure() {
# 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
-
# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
-DCHECK_ALSA=$(usex alsa)
-DCHECK_JACK=$(usex jack)
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-05-31 4:37 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-27 22:19 [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-05-31 4:37 Ionen Wolkens
2024-05-17 5:21 Ionen Wolkens
2024-03-20 7:17 Ionen Wolkens
2023-11-27 5:15 Ionen Wolkens
2023-08-25 4:41 Ionen Wolkens
2023-08-06 4:32 Ionen Wolkens
2023-07-01 9:07 Ionen Wolkens
2023-04-05 13:25 Ionen Wolkens
2022-12-24 16:03 Ionen Wolkens
2022-10-21 10:27 Ionen Wolkens
2022-10-01 13:19 Ionen Wolkens
2022-09-27 23:46 Ionen Wolkens
2022-02-19 10:45 Ionen Wolkens
2021-02-20 10:10 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox