[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     0ee6e8f7f063044c104a431bfdc7b9cdc3f577e2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 10:28:21 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 11:05:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee6e8f7

games-emulation/pcsx2: add comment about upstream

May be useful to know for anyone working on this.

Upstream doesn't seem to want to hear of non-appimage issues.
They also dislike that we do workarounds for these issues and
wants it pristine (no patch/sed, even tiny changes like changing
the path to find resources in /usr/share given been seemingly
refusing to add a cmake option to change it) and using bundled libs.

Hopefully may change if it gets a dedicated linux contributor, as
there's currently none and it's at most just drive-by PRs which
don't get maintained and eventually break.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index b9d68d63b68b..e2f804a6b008 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -161,13 +161,17 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=yes
 		-DDISABLE_SETCAP=yes
 		-DENABLE_TESTS=$(usex test)
-		-DUSE_SYSTEM_LIBS=yes
 		-DUSE_VTUNE=no
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWAYLAND_API=$(usex wayland)
 		-DX11_API=yes # fails if X libs are missing even if disabled
 		-DXDG_STD=yes
 
+		# note that the current upstream is somewhat hostile to using system
+		# libs, system installs, or any modifications and may disregard any
+		# bugs that is not reproducible with the appimage using bundled libs
+		-DUSE_SYSTEM_LIBS=yes
+
 		# sse4.1 is the bare minimum required, -m is required at build time
 		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
 		# https://github.com/PCSX2/pcsx2/pull/4329
@@ -189,7 +193,6 @@ src_test() {
 }
 
 src_install() {
-	# package mode was removed turning cmake_src_install into a noop
 	newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
 
 	insinto /usr/share/${PN}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Arthur Zamarin]

commit:     1cc6829aae3eb85a7dd1cb55286d5ab39069721e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 06:04:59 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 06:04:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc6829a

games-emulation/pcsx2: Stabilize 2.0.2 amd64, #937791

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
index c6e2125c4f67..7a3de4849efb 100644
--- a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
@@ -13,7 +13,7 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     0e89c6dd79fff830d4b5ef1bc7fe21eac2d51c04
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 06:16:40 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 07:00:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e89c6dd

games-emulation/pcsx2: drop 1.7.5835

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 179 ----------------------------
 2 files changed, 180 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 5a2591016c17..cd43c8ab365f 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1 @@
-DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7
 DIST pcsx2-1.7.5913.tar.gz 15669443 BLAKE2B 1b1e353b544791fb52d9e181e66fcdf0bc7039878a80279b855d05fdab4f1010f45db685d4ab6ae141f497cd72a6e007f583725345a9ef1c9a6d69dc46a77547 SHA512 a8c2e6879527d4864de97ece74aefcbe34093c169a19aafe7558aef872a449be5209209f800ca71b4d259689583f10188b8385439b769688910dc5c3b291c408

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
deleted file mode 100644
index 50a1ae3cb150..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ /dev/null
@@ -1,179 +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 optfeature toolchain-funcs
-
-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 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-qt/qtbase:6[concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	media-libs/freetype
-	media-libs/libglvnd[X]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl2[haptic,joystick]
-	media-libs/libwebp:=
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	vulkan? (
-		media-libs/shaderc
-		media-libs/vulkan-loader
-	)
-	wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	clang? ( sys-devel/clang:* )
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
-	"${FILESDIR}"/${PN}-1.7.5835-musl-header.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() {
-	# note that upstream only supports clang and ignores gcc issues, e.g.
-	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
-	# (CMakeLists.txt also gives a big warning if compiler is not clang)
-	if use clang && ! tc-is-clang; then
-		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# pthread_attr_setaffinity_np is not supported on musl, may be possible
-	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
-	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-DENABLE_TESTS=$(usex test)
-		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no
-		-DUSE_VULKAN=$(usex vulkan)
-
-		# note that upstream hardly support native wayland, may or may not work
-		# https://github.com/PCSX2/pcsx2/pull/10179
-		-DWAYLAND_API=$(usex wayland)
-		# not optional given libX11 is hard-required either way and upstream
-		# seemingly has no intention to drop the requirement at the moment
-		# https://github.com/PCSX2/pcsx2/issues/11149
-		-DX11_API=yes
-
-		# not packaged due to bug #885471, but still disable for no automagic
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
-
-		# 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
-
-	# calls aplay or gst-play/launch-1.0 as fallback
-	# https://github.com/PCSX2/pcsx2/issues/11141
-	optfeature "UI sound effects support" \
-		media-sound/alsa-utils \
-		media-libs/gst-plugins-base:1.0
-
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
-		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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     7a69c49823cad92414a1c599fe83d22abe62c697
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 06:37:22 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 07:00:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a69c498

games-emulation/pcsx2: update live

Shouldn't really need this warning anymore.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 350881495989..308668c6eee2 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -167,13 +167,4 @@ pkg_postinst() {
 	optfeature "UI sound effects support" \
 		media-sound/alsa-utils \
 		media-libs/gst-plugins-base:1.0
-
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
-		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
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     103d11fb8de95fd3cc438436d79376469cab2b27
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 06:38:48 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 07:00:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103d11fb

games-emulation/pcsx2: add 2.0.2

Noticed a bit late that this started getting releases again,
will be getting notifications in the future.

Will no longer bother with development releases unless this
becomes severely outdated+broken again.

Still need the backtrace patch (removed in 9999) given this
hasn't got the USE_BACKTRACE change.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest           |   1 +
 games-emulation/pcsx2/pcsx2-2.0.2.ebuild | 170 +++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index cd43c8ab365f..1197af6b0738 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,2 @@
 DIST pcsx2-1.7.5913.tar.gz 15669443 BLAKE2B 1b1e353b544791fb52d9e181e66fcdf0bc7039878a80279b855d05fdab4f1010f45db685d4ab6ae141f497cd72a6e007f583725345a9ef1c9a6d69dc46a77547 SHA512 a8c2e6879527d4864de97ece74aefcbe34093c169a19aafe7558aef872a449be5209209f800ca71b4d259689583f10188b8385439b769688910dc5c3b291c408
+DIST pcsx2-2.0.2.tar.gz 16071515 BLAKE2B 328ea302ab2a7f7c4784844005ad4091d3f0b571c80f2a122136cc152fd46d4b1db4541e53ada09fc6cd15ebf37ae494911cadbbc7c57b92b494da355f67fcef SHA512 d442b1c5f9dbd1dca23261c56d0a433771928827b1ff9ebf5bea9cf5c5013defab659e7f0b63f5ce5c6ad856461c00f6ac98498a229300f8d58b9ea0ebf21507

diff --git a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
new file mode 100644
index 000000000000..c6e2125c4f67
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.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 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+	"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
+	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.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() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# pthread_attr_setaffinity_np is not supported on musl, may be possible
+	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
+	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no # not packaged
+		-DUSE_VULKAN=$(usex vulkan)
+
+		# note that upstream hardly support native wayland, may or may not work
+		# https://github.com/PCSX2/pcsx2/pull/10179
+		-DWAYLAND_API=$(usex wayland)
+		# not optional given libX11 is hard-required either way and upstream
+		# seemingly has no intention to drop the requirement at the moment
+		# https://github.com/PCSX2/pcsx2/issues/11149
+		-DX11_API=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
+
+	# calls aplay or gst-play/launch-1.0 as fallback
+	# https://github.com/PCSX2/pcsx2/issues/11141
+	optfeature "UI sound effects support" \
+		media-sound/alsa-utils \
+		media-libs/gst-plugins-base:1.0
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     986f91b89169b9c88e42d25de0d8b70e8d816515
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sat Jul 20 19:11:08 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 23:49:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986f91b8

games-emulation/pcsx2: drop myself as a maintainer

Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/37641
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/metadata.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index ddf894bc0a0f..46bb9ff953de 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ykonotopov@gnome.org</email>
-		<name>Yuri Konotopov</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     0df91d146c3f3244d3deca68aa179f11700ea249
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 05:36:51 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 05:41:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df91d14

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index ed8749726f75..350881495989 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -80,7 +80,6 @@ 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
 	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
 	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
 )
@@ -117,8 +116,9 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
 		-DENABLE_TESTS=$(usex test)
+		-DUSE_BACKTRACE=no # not packaged (bug #885471)
 		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no
+		-DUSE_VTUNE=no # not packaged
 		-DUSE_VULKAN=$(usex vulkan)
 
 		# note that upstream hardly support native wayland, may or may not work

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     ed833563e0ab46723360185ffad1e718270d71fb
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 06:00:46 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 06:00:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed833563

games-emulation/pcsx2: Stabilize 1.7.5913 amd64, #935903

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5913.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
index ed8749726f75..eabda37bc8cf 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
@@ -13,7 +13,7 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     76b305ad8db7a784104266ecd4fdf6489763b18a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 09:17:57 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 09:33:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b305ad

games-emulation/pcsx2: update live

Upstream has done away with all submodules and hardcoded the sources
in the repo which does work out for us given removes the ned for the
custom tarball.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 452519d49d92..f8d4b9f5a3aa 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,9 +9,10 @@ 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"
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
 	KEYWORDS="-* ~amd64"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     d9b68f01f592bcffb3e33dd178b6fd3d635cc134
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 09:24:51 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 09:33:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b68f01

games-emulation/pcsx2: add 1.7.5913

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5913.ebuild | 173 ++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index fad0d732cb4d..5a2591016c17 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,2 @@
 DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7
+DIST pcsx2-1.7.5913.tar.gz 15669443 BLAKE2B 1b1e353b544791fb52d9e181e66fcdf0bc7039878a80279b855d05fdab4f1010f45db685d4ab6ae141f497cd72a6e007f583725345a9ef1c9a6d69dc46a77547 SHA512 a8c2e6879527d4864de97ece74aefcbe34093c169a19aafe7558aef872a449be5209209f800ca71b4d259689583f10188b8385439b769688910dc5c3b291c408

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
new file mode 100644
index 000000000000..f8d4b9f5a3aa
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.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 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+	"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.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() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+
+		# note that upstream hardly support native wayland, may or may not work
+		# https://github.com/PCSX2/pcsx2/pull/10179
+		-DWAYLAND_API=$(usex wayland)
+		# not optional given libX11 is hard-required either way and upstream
+		# seemingly has no intention to drop the requirement at the moment
+		# https://github.com/PCSX2/pcsx2/issues/11149
+		-DX11_API=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
+
+	# calls aplay or gst-play/launch-1.0 as fallback
+	# https://github.com/PCSX2/pcsx2/issues/11141
+	optfeature "UI sound effects support" \
+		media-sound/alsa-utils \
+		media-libs/gst-plugins-base:1.0
+
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
+		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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     3f01d005375468afec9796be60c0e4793589a854
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 07:16:10 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 07:16:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f01d005

games-emulation/pcsx2: Stabilize 1.7.5835 amd64, #934010

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index 3b09dfdebe2d..87e19f866161 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     39ee5dd284c74c4feb4402e08463042cdeef2f91
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 17:30:43 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue May 21 17:39:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ee5dd2

games-emulation/pcsx2: add 1.7.5835

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5835.ebuild | 175 ++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 895637e5b424..201c1e51c713 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
 DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
 DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d
+DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
new file mode 100644
index 000000000000..295c925c4305
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
+
+if [[ ${PV} == 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 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5817-missing-headers.patch
+	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 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() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+
+		# note that upstream hardly support native wayland, may or may not work
+		# https://github.com/PCSX2/pcsx2/pull/10179
+		-DWAYLAND_API=$(usex wayland)
+		# not optional given libX11 is hard-required either way and upstream
+		# seemingly has no intention to drop the requirement at the moment
+		# https://github.com/PCSX2/pcsx2/issues/11149
+		-DX11_API=yes
+
+		# not packaged due to bug #885471, but still disable for no automagic
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
+
+		# 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
+
+	# calls aplay or gst-play/launch-1.0 as fallback
+	# https://github.com/PCSX2/pcsx2/issues/11141
+	optfeature "UI sound effects support" \
+		media-sound/alsa-utils \
+		media-libs/gst-plugins-base:1.0
+
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
+		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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     6e84d051c84ffbf63ec5146b6a1a3a4b0d7d7050
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 05:27:38 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 13 05:27:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e84d051

games-emulation/pcsx2: Stabilize 1.7.5724 amd64, #931830

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
index 634e5d0a4e32..1bf5c7c73e38 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     b23bc2d3b322c8dd4ddc34ad7d7ceba1574e5e36
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 13:06:36 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 13:06:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23bc2d3

games-emulation/pcsx2: add link in comment about wayland too

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index d8fea1ceb110..69486b68cc68 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -114,9 +114,10 @@ src_configure() {
 		-DUSE_VTUNE=no
 		-DUSE_VULKAN=$(usex vulkan)
 
-		# Note that upstream hardly support wayland, may or may not work
+		# note that upstream hardly support native wayland, may or may not work
+		# https://github.com/PCSX2/pcsx2/pull/10179
 		-DWAYLAND_API=$(usex wayland)
-		# Not optional given libX11 is hard-required either way and upstream
+		# not optional given libX11 is hard-required either way and upstream
 		# seemingly has no intention to drop the requirement at the moment
 		# https://github.com/PCSX2/pcsx2/issues/11149
 		-DX11_API=yes

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     79002c26340590f597b01953215546a758c9e239
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 12:49:59 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 13:01:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79002c26

games-emulation/pcsx2: optfeature on alsa-utils/gst-plugins-base

Unlikely to be (both) missing on the average desktop system but warn
in case given upstream ranted about someone not having alsa-utils
on Arch in the linked issue and it could very well happen here too.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 6 +++++-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
index 5c49263139b5..634e5d0a4e32 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -152,6 +152,10 @@ src_install() {
 pkg_postinst() {
 	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
 
+	# calls aplay (or gst-play/launch-1.0 as fallback in next version)
+	# https://github.com/PCSX2/pcsx2/issues/11141
+	optfeature "UI sound effects support" media-sound/alsa-utils
+
 	if [[ ${REPLACING_VERSIONS##* } ]] &&
 		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
 		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 23abb02ad48f..d8fea1ceb110 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -157,6 +157,12 @@ src_install() {
 pkg_postinst() {
 	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
 
+	# calls aplay or gst-play/launch-1.0 as fallback
+	# https://github.com/PCSX2/pcsx2/issues/11141
+	optfeature "UI sound effects support" \
+		media-sound/alsa-utils \
+		media-libs/gst-plugins-base:1.0
+
 	if [[ ${REPLACING_VERSIONS##* } ]] &&
 		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
 		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     875047b58fb944e418c67286d47154895a77079c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 12:38:33 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 13:01:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875047b5

games-emulation/pcsx2: extend comment about x11/wayland apis

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 5c49263139b5..23abb02ad48f 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -113,8 +113,13 @@ src_configure() {
 		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no
 		-DUSE_VULKAN=$(usex vulkan)
+
+		# Note that upstream hardly support wayland, may or may not work
 		-DWAYLAND_API=$(usex wayland)
-		-DX11_API=yes # X libs are currently hard-required either way
+		# Not optional given libX11 is hard-required either way and upstream
+		# seemingly has no intention to drop the requirement at the moment
+		# https://github.com/PCSX2/pcsx2/issues/11149
+		-DX11_API=yes
 
 		# not packaged due to bug #885471, but still disable for no automagic
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     5d9a3785c0e4c9c5055b8724612df53cf1ab6e27
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 07:16:56 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 07:24:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9a3785

games-emulation/pcsx2: update dlopen comment

No longer links directly with it, but still using glad for dlopen.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
index b1a0cb87549d..5c49263139b5 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
-# dlopen: qtsvg, vulkan-loader, wayland
+# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
 	app-arch/lz4:=
 	app-arch/zstd:=

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index b1a0cb87549d..5c49263139b5 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -27,7 +27,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
-# dlopen: qtsvg, vulkan-loader, wayland
+# dlopen: libglvnd, qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
 	app-arch/lz4:=
 	app-arch/zstd:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     d02ee6353c2d370547b34c7b763b8b7de37dca75
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 07:10:04 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 07:24:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02ee635

games-emulation/pcsx2: add 1.7.5724

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 163 ++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 1b49ba4dc5f0..895637e5b424 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,2 @@
 DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
+DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
new file mode 100644
index 000000000000..b1a0cb87549d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 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 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 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() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=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
+
+		# 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     02f80de36e6b9d927e8f594de8cca69ba8625506
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 06:28:08 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 07:24:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f80de3

games-emulation/pcsx2: drop 1.7.5474, 1.7.5560

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   2 -
 games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 161 ----------------------------
 games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 161 ----------------------------
 3 files changed, 324 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d60f8d26c7f6..1b49ba4dc5f0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1 @@
-DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B 2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d SHA512 261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
-DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
 DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
deleted file mode 100644
index b53145e648db..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
-
-if [[ ${PV} == 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 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/lz4:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-qt/qtbase:6[concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	media-libs/libpng:=
-	media-libs/libsdl2[haptic,joystick]
-	media-libs/libwebp:=
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	clang? ( sys-devel/clang:* )
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${PV} != 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() {
-	# note that upstream only supports clang and ignores gcc issues, e.g.
-	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
-	# (CMakeLists.txt also gives a big warning if compiler is not clang)
-	if use clang && ! tc-is-clang; then
-		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# for bundled old glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-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
-
-		# 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
-}

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
deleted file mode 100644
index b53145e648db..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic toolchain-funcs
-
-if [[ ${PV} == 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 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/lz4:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-qt/qtbase:6[concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	media-libs/libpng:=
-	media-libs/libsdl2[haptic,joystick]
-	media-libs/libwebp:=
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	clang? ( sys-devel/clang:* )
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${PV} != 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() {
-	# note that upstream only supports clang and ignores gcc issues, e.g.
-	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
-	# (CMakeLists.txt also gives a big warning if compiler is not clang)
-	if use clang && ! tc-is-clang; then
-		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# for bundled old glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-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
-
-		# 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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     2bd1ce7d2accd459fb4eba76e5e9e53835c0c046
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 06:05:43 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 06:06:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd1ce7d

games-emulation/pcsx2: Stabilize 1.7.5624 amd64, #929002

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5624.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
index 04d9d27fa7e1..b53145e648db 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2b86086f0303322143aa374dcb821d1899272183
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 12:18:18 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 12:29:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b86086f

games-emulation/pcsx2: update live

Bundled glslang is finally gone (traded for system shaderc), so can
remove -fno-sa too.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 004ac26d3f65..2ca40ad4ee99 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	dev-libs/libaio
 	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
+	media-libs/freetype
 	media-libs/libglvnd[X]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
@@ -50,7 +51,10 @@ COMMON_DEPEND="
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
 	wayland? ( dev-libs/wayland )
 "
 # patches is a optfeature but always pull given PCSX2 complaints if it
@@ -101,9 +105,6 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
-	# for bundled old glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     bf85a43216b442ee0c34e2aec8dad6b6506ce737
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 08:02:57 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 08:03:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf85a432

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 5edb77a7b841..004ac26d3f65 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -35,6 +35,7 @@ COMMON_DEPEND="
 	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2cfe0e3557ed857b63bec7d9e1969cc8a96068e6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 12:01:35 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 12:09:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfe0e35

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 04d9d27fa7e1..5edb77a7b841 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -30,7 +30,6 @@ RESTRICT="!test? ( test )"
 # dlopen: qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
 	app-arch/lz4:=
-	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
 	dev-qt/qtbase:6[concurrent,gui,widgets]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     5d2914d102cd4e120d37f628d1d2e5b49cb850d8
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 06:37:11 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 06:37:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2914d1

games-emulation/pcsx2: Stabilize 1.7.5560 amd64, #927318

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
index 04d9d27fa7e1..b53145e648db 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     0fe71912cf6332849f47c1a7612d13edefe5071d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 06:32:32 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 07:01:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe71912

games-emulation/pcsx2: add 1.7.5624

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5624.ebuild | 161 ++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 49389ef7b07e..d60f8d26c7f6 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
 DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B 2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d SHA512 261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
 DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
+DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
new file mode 100644
index 000000000000..04d9d27fa7e1
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 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 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd[X]
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 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() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
+		-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
+
+		# 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     3fb4f8ac47f4e033a9ea5411b672c190ca46ac0a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 14:42:40 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 14:46:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb4f8ac

games-emulation/pcsx2: depend on qtbase[concurrent]

cmake does not check for it but it makes some header-only usage.
Could be DEPEND-only but given the logic in the header prefer
to make that rdepend to be safe (that is hardly worth disabling
anyway). Not worth a revbump.

Closes: https://bugs.gentoo.org/926037
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index b7ca1ce4e8ff..5e4249cd5a8e 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd[X]
 	media-libs/libpng:=

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
index c7fbc6aaca10..b53145e648db 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
-	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd[X]
 	media-libs/libpng:=

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
index 8a507c1db80d..04d9d27fa7e1 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
-	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd[X]
 	media-libs/libpng:=

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 8a507c1db80d..04d9d27fa7e1 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
-	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd[X]
 	media-libs/libpng:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     b6d259e4e62559c09c51e766b45298a70c976dcc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 18:21:17 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 18:26:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d259e4

games-emulation/pcsx2: depend on libglvnd[X]

No need for a revbump given it does not *actually* link with
libGLX but looks for it during configure time.

It could be interesting to force it to be optional (or at least
not last time I tried, but given X libraries currently cannot be
optional either way (and upstream advise against using the wayland
support) it's likely not worth the extra trouble.

Will revisit if ever add a proper USE=X to pcsx2.

Bug: https://bugs.gentoo.org/924765
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index a675a321a728..b7ca1ce4e8ff 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	dev-libs/libaio
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtsvg:6
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
 	media-video/ffmpeg:=

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
index 9521bddc7fc8..c7fbc6aaca10 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	dev-libs/libaio
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtsvg:6
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
index 9810fcf44af1..8a507c1db80d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	dev-libs/libaio
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtsvg:6
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 9810fcf44af1..8a507c1db80d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	dev-libs/libaio
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtsvg:6
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     4ead727e16ab917b6f7b1608549da6ed1424b72a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 08:06:54 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 08:07:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ead727e

games-emulation/pcsx2: Stabilize 1.7.5474 amd64, #924765

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
index 9810fcf44af1..9521bddc7fc8 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     162455cc85593d8bf949869e131fe715533593da
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 10:14:45 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 10:19:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162455cc

games-emulation/pcsx2: add 1.7.5560

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 161 ++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 4608e70cee79..050847187f99 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7
 DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B 2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d SHA512 261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
+DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
new file mode 100644
index 000000000000..9810fcf44af1
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 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 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 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() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
+		-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
+
+		# 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2e17aeea244e5bd84ea37a04881b3a8cbaf8ea00
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 12:39:56 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 14:41:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e17aeea

games-emulation/pcsx2: extend clang comment

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 328235f14174..5166d24d2965 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	# upstream only supports clang and ignores gcc issues, e.g.
 	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
 	if ! tc-is-clang; then
 		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
 		strip-unsupported-flags

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     4fb565f6fc29a54e971143e47a332e42a8a04645
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 13:03:24 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 14:41:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb565f6

games-emulation/pcsx2: add 1.7.5474

If reading this and wondering why this is newly requiring clang, see
the ebuild comment in src_configure (was previously added to 9999).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 161 ++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 35c955606c1c..4608e70cee79 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +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

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
new file mode 100644
index 000000000000..5166d24d2965
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 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/lz4:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	sys-devel/clang:*
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 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() {
+	# upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=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
+
+		# 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     5d465d5586178c6441289109e789cbec2a331118
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 05:01:03 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 07:26:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d465d55

games-emulation/pcsx2: force-remove lower bounds on Qt6 and SDL2

Upstream likes to bump these to very recent ones at arbitrary
points without seemingly being truly required.

Needed to be able to stabilize pcsx2 without bothering to stable
libsdl2-2.28.4 "right now" when 2.28.3 seems just fine still.
pcsx2-9999 had already needed to switch to 2.28.5 too (why..?).

If a version is found problematic, will add the needed lower
bound to *DEPEND only. Odds are very old Qt6 (e.g. 6.2) is likely
broken but these are long gone and won't worry about it.

Using sed given versions keep changing and want to avoid rebasing
a patch every time.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 14 ++++++++++----
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index 223990367c6d..dfb2a1b447ac 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -31,11 +31,11 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
-	>=dev-qt/qtsvg-6.6.0:6
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	media-libs/libsdl2[haptic,joystick]
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
@@ -61,7 +61,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	>=dev-qt/qttools-6.6.0:6[linguist]
+	dev-qt/qttools:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -81,6 +81,12 @@ src_prepare() {
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
 	fi
+
+	# relax Qt6 and SDL2 version requirements which often get restricted
+	# without a specific need, please report a bug to Gentoo (not upstream)
+	# if a still-available older version is really causing issues
+	sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+		-i cmake/SearchForStuff.cmake || die
 }
 
 src_configure() {

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 43536202eed1..178e5a77996c 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,11 +33,11 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
-	>=dev-qt/qtsvg-6.6.0:6
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.5[haptic,joystick]
+	media-libs/libsdl2[haptic,joystick]
 	media-libs/libwebp:=
 	media-video/ffmpeg:=
 	net-libs/libpcap
@@ -64,7 +64,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	>=dev-qt/qttools-6.6.0:6[linguist]
+	dev-qt/qttools:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -84,6 +84,12 @@ src_prepare() {
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
 	fi
+
+	# relax Qt6 and SDL2 version requirements which often get restricted
+	# without a specific need, please report a bug to Gentoo (not upstream)
+	# if a still-available older version is really causing issues
+	sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+		-i cmake/SearchForStuff.cmake || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     45313b7cf62271ff0d7e65b7853c0aafbc18b93e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 05:59:44 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 07:26:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45313b7c

games-emulation/pcsx2: update live, require clang

Likely an easy fix that could be done from our end, but no
longer have the patience to support things that upstream is
refusing to support. Albeit may drop the requirement if it
gets fixed by the time of next bump, but otherwise it'll
likely stick around.

Likely not worth using the llvm eclass here, not linking with
and only need to pick the current compiler.

fwiw forcing clang removes the need for the lto patch.

Also BUILD_DATE option was removed. GIT_TAG bits may also need
updates but will check that next time do a bump as it does not
matter in live. LICENSE may need a bit of reviewing too given
upstream added a compilation of all the licenses used.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 178e5a77996c..586432db9b7e 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake desktop fcaps flag-o-matic
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -65,6 +65,7 @@ DEPEND="
 "
 BDEPEND="
 	dev-qt/qttools:6[linguist]
+	sys-devel/clang:*
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -72,7 +73,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
 )
@@ -93,6 +93,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	if ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
 	if use vulkan; then
 		# for bundled glslang (bug #858374)
 		append-flags -fno-strict-aliasing
@@ -104,7 +111,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
-		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     06a30404ed63237c7cd13d43c0ab989c61479c55
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 06:56:50 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 07:26:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a30404

games-emulation/pcsx2: remove obsolete vulkan filter-lto

ODR issues seem resolved.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 9 ++-------
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index dfb2a1b447ac..b128f9284603 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -90,13 +90,8 @@ src_prepare() {
 }
 
 src_configure() {
-	if use vulkan; then
-		# for bundled glslang (bug #858374)
-		append-flags -fno-strict-aliasing
-
-		# odr violations in pcsx2's vulkan code, disabling as a safety for now
-		filter-lto
-	fi
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 586432db9b7e..328235f14174 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -100,13 +100,8 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
-	if use vulkan; then
-		# for bundled glslang (bug #858374)
-		append-flags -fno-strict-aliasing
-
-		# odr violations in pcsx2's vulkan code, disabling as a safety for now
-		filter-lto
-	fi
+	# for bundled old glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     1e34079bf42aa85ad741402a6e4bbf5aca644440
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 04:56:22 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 07:26:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e34079b

games-emulation/pcsx2: stabilize 1.7.5312 for amd64

1.6.0 is the current "stable" release upstream, but is:
* nearly 4 years old (lacks a *lot* of game fixes)
* 32bit-only (needs multilib on amd64)
* starting to hit issues like bug #922149 (which took a long
  time to be reported, indicating it likely has rather few users)
* has some utf8 locale issues last time I tried it
* ebuild is bit dated and needs update for newer wxgtk
* not really getting used/tested by its gentoo maintainers
  with no real motivation to fix problems

The 64bit Qt6 1.7.x may still be kind of WIP but has matured a fair
amount and 1.6.0 does not seem to offer much advantages over it with
the exception of working on older machines (x86, or anything lacking
sse4.1).

An upstream "real" release will likely take a long time still, and
the situation for 1.6.0 just get worse meanwhile.

So, opting to stable 1.7.x even though it's "nightly" arbitrary
releases and drop 1.6.0 given it's broken in current state.

Bug: https://bugs.gentoo.org/922149
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index b128f9284603..a675a321a728 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ else
 	# unbundling on this package has become unmaintainable and, rather than
 	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f6a0fc872fbd0e619b21e8f557f8e276f30cc1f2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 06:56:45 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 07:09:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a0fc87

games-emulation/pcsx2: update live

Upstream has discovered that unbundling some dependencies reduces
build time.

ARCH_FLAG was removed, it was useful to pass the actual minimal
-m* flags, but -DDISABLE_ADVANCE_SIMD comes close enough and
prevents passing the more problematic -march=native.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7dcbf7dc75d7..43536202eed1 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -29,13 +29,16 @@ RESTRICT="!test? ( test )"
 
 # dlopen: qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
+	app-arch/lz4:=
 	app-arch/xz-utils
+	app-arch/zstd:=
 	dev-libs/libaio
 	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
 	>=dev-qt/qtsvg-6.6.0:6
 	media-libs/libglvnd
 	media-libs/libpng:=
 	>=media-libs/libsdl2-2.28.5[haptic,joystick]
+	media-libs/libwebp:=
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
@@ -94,6 +97,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
 		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_LINKED_FFMPEG=yes
@@ -102,11 +106,6 @@ src_configure() {
 		-DWAYLAND_API=$(usex wayland)
 		-DX11_API=yes # X libs are currently hard-required either way
 
-		# sse4.1 is the bare minimum required, -m is required at build time
-		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
-		# https://github.com/PCSX2/pcsx2/pull/4329
-		-DARCH_FLAG=-msse4.1
-
 		# not packaged due to bug #885471, but still disable for no automagic
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     7e9c844fe4748e43a83217181b32bfa7da5b1cad
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 16:10:24 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 16:15:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9c844f

games-emulation/pcsx2: update live

As usual pcsx2 is picky about sdl2 versions, not that I can
see the reason why (pretty sure this works just fine with
stable libsdl2-2.28.3 and this just annoys stable users
accept keywording it).

May really have to consider just sedding out the version
check for Qt and SDL2 if these keep up (not a patch given
will likely keep getting changed).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 223990367c6d..7dcbf7dc75d7 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtsvg-6.6.0:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	>=media-libs/libsdl2-2.28.5[haptic,joystick]
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     b18ca9569e9a68f47281761a885777067ee5f96b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 11:31:32 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:43:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18ca956

games-emulation/pcsx2: add 1.7.5312

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 155 ++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index da9f8c0707d6..c52d59d08b7f 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,4 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
 DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
+DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
new file mode 100644
index 000000000000..7978166a40b3
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libaio
+	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
+	>=dev-qt/qtsvg-6.6.0:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-qt/qttools-6.6.0:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f4ef4c3241064e84640a494044ccf62c72abfff2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 11:33:55 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:43:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4ef4c32

games-emulation/pcsx2: reword/shorten tarball comment

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.5214.ebuild | 5 ++---
 games-emulation/pcsx2/pcsx2-1.7.5312.ebuild | 5 ++---
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
index cf1118563fd6..462f4b662736 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
+	# unbundling on this package has become unmaintainable and, rather than
+	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
 	KEYWORDS="-* ~amd64"
 fi

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
index 7978166a40b3..223990367c6d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
+	# unbundling on this package has become unmaintainable and, rather than
+	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
 	KEYWORDS="-* ~amd64"
 fi

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7978166a40b3..223990367c6d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,9 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
+	# unbundling on this package has become unmaintainable and, rather than
+	# handle submodules separately, using a tarball that includes them
 	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
 	KEYWORDS="-* ~amd64"
 fi

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2c3b2ee2786b91ed20a6413832b58fdec9aed3dc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 11:31:44 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:43:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3b2ee2

games-emulation/pcsx2: drop 1.7.5133

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.5133.ebuild | 155 ----------------------------
 2 files changed, 156 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c52d59d08b7f..293fe8fddf59 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,4 +1,3 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
 DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862
 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
deleted file mode 100644
index 63a7bbdd2c1d..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
-	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-
-LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
-	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/xz-utils
-	dev-libs/libaio
-	>=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
-	>=dev-qt/qtsvg-6.5.3:6
-	media-libs/libglvnd
-	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.4[haptic,joystick]
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-qt/qttools-6.5.3:6[linguist]
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-	fi
-}
-
-src_configure() {
-	if use vulkan; then
-		# for bundled glslang (bug #858374)
-		append-flags -fno-strict-aliasing
-
-		# odr violations in pcsx2's vulkan code, disabling as a safety for now
-		filter-lto
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_BUILD_DATE=yes
-		-DENABLE_TESTS=$(usex test)
-		-DUSE_LINKED_FFMPEG=yes
-		-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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     9496e226550ee3853e7db5595ef4144d4404f038
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 11:12:20 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 12:44:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9496e226

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index cf1118563fd6..c2e6420ddbfc 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -32,7 +32,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
+	>=dev-qt/qtbase-6.6.0:6[gui,widgets]
 	>=dev-qt/qtsvg-6.6.0:6
 	media-libs/libglvnd
 	media-libs/libpng:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     5ed52f8dd805ee343d8eae04e1ee6568afdd5408
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 05:50:17 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 05:53:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed52f8d

games-emulation/pcsx2: remove -gentoo from version

Sounded like a good idea on paper to identify given upstream can be
picky about non-official builds. However the version gets tied to
savestates and this may be more of an annoyance if trying to get an
old version to convert a save state back to a memory card save.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index e13f2c5a2b74..cf1118563fd6 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -79,7 +79,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     aeb23a8d017cd7550a573a1a1493e8e4f2f8663e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 05:33:48 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 05:53:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb23a8d

games-emulation/pcsx2: add 1.7.5214

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5214.ebuild | 155 ++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index e4f5e210d621..da9f8c0707d6 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
+DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
new file mode 100644
index 000000000000..cf1118563fd6
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libaio
+	>=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
+	>=dev-qt/qtsvg-6.6.0:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-qt/qttools-6.6.0:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2ebfbd01902e9f0b4d32ca7d2cef575ab7eb287b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 05:31:03 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 05:39:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebfbd01

games-emulation/pcsx2: update live

Albeit not quite sure why upstream insists on bumping minimum version,
does not seem to be using anything 6.6.0-specific. As far as I'm aware
it still works with 6.5.x beside the cmake check (similar deal as
the minimum sdl2 version checks).

May be annoying for stable users still on 6.5.x. May consider to
patch out the limitation if this gets frequently bumped while not
seemingly broken, albeit leaving it alone for now.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 63a7bbdd2c1d..e13f2c5a2b74 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -32,8 +32,8 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	>=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
-	>=dev-qt/qtsvg-6.5.3:6
+	>=dev-qt/qtbase-6.6.0:6[gui,network,widgets]
+	>=dev-qt/qtsvg-6.6.0:6
 	media-libs/libglvnd
 	media-libs/libpng:=
 	>=media-libs/libsdl2-2.28.4[haptic,joystick]
@@ -62,7 +62,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	>=dev-qt/qttools-6.5.3:6[linguist]
+	>=dev-qt/qttools-6.6.0:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     8721ba824c7d6b957051f4d5e7433270a347254f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 07:09:03 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 07:56:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8721ba82

games-emulation/pcsx2: drop 1.7.5033

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.5033.ebuild | 155 ----------------------------
 2 files changed, 156 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index cf554a25bc0b..e4f5e210d621 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,2 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
 DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
deleted file mode 100644
index 98a2f8f00c10..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	# formerly was attempting to unbundle most, but upstream dropped every
-	# checks for alternatively using system's and keeping this up has become
-	# unmaintainable, and to simplify now also using tarballs with submodules
-	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
-	KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-
-LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
-	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: qtsvg, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/xz-utils
-	dev-libs/libaio
-	dev-qt/qtbase:6[gui,network,widgets]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd
-	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.2[haptic,joystick]
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-	fi
-}
-
-src_configure() {
-	if use vulkan; then
-		# for bundled glslang (bug #858374)
-		append-flags -fno-strict-aliasing
-
-		# odr violations in pcsx2's vulkan code, disabling as a safety for now
-		filter-lto
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_BUILD_DATE=yes
-		-DENABLE_TESTS=$(usex test)
-		-DUSE_LINKED_FFMPEG=yes
-		-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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     ea02f6c1debe0c5a9ff64adfef2020e766e1e154
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 12:24:54 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 13:35:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea02f6c1

games-emulation/pcsx2: add 1.7.5133

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5133.ebuild | 155 ++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 2a4ba484f723..cf554a25bc0b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
+DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
new file mode 100644
index 000000000000..63a7bbdd2c1d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libaio
+	>=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
+	>=dev-qt/qtsvg-6.5.3:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-qt/qttools-6.5.3:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     195a3bba4e9153a907d6152a2470ee6c0923e62a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 04:46:53 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 04:50:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195a3bba

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 98a2f8f00c10..63a7bbdd2c1d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -32,11 +32,11 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	app-arch/xz-utils
 	dev-libs/libaio
-	dev-qt/qtbase:6[gui,network,widgets]
-	dev-qt/qtsvg:6
+	>=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
+	>=dev-qt/qtsvg-6.5.3:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.28.2[haptic,joystick]
+	>=media-libs/libsdl2-2.28.4[haptic,joystick]
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
@@ -62,7 +62,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
-	dev-qt/qttools:6[linguist]
+	>=dev-qt/qttools-6.5.3:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     8c2f4b7164fa5b2930bee4cb3abfa7133208604b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 10:34:00 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 11:35:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2f4b71

games-emulation/pcsx2: depend on old pcsx2_patches for 1.7.4940

Due to change in install location, but bump is happening at same
time so odds are this revbump will not be used unless trying old
version for regressions.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../pcsx2/{pcsx2-1.7.4940.ebuild => pcsx2-1.7.4940-r1.ebuild}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
similarity index 99%
rename from games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
index 6089f51c3411..4976851a41d4 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild
@@ -75,7 +75,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	games-emulation/pcsx2_patches
+	<games-emulation/pcsx2_patches-0_p20230917
 "
 DEPEND="
 	${COMMON_DEPEND}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     a5c243495666fd87f2d022bac33d5a43c7eaa07f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 10:09:20 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 11:35:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c24349

games-emulation/pcsx2: install in mono path, handle translations

Translations ignore AppRoot and insist on using the location that pcsx2
is at. Rather than modify further, install everything in /usr/lib/${PN}
and keep a symlink for PATH (fortunately using a wrapper does not seem
necessary). Unfortunately upstream has no interest in a more standard
installation so this may be better going forward.

Also tidy a bit.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index bb34c0a768df..7024be408faa 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -55,7 +55,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	games-emulation/pcsx2_patches
+	>=games-emulation/pcsx2_patches-0_p20230917
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -69,10 +69,6 @@ BDEPEND="
 	)
 "
 
-FILECAPS=(
-	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
@@ -82,9 +78,6 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
-	sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
-		-i pcsx2/Pcsx2Config.cpp || die
-
 	if [[ ${PV} != 9999 ]]; then
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
@@ -134,19 +127,22 @@ src_test() {
 }
 
 src_install() {
-	newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
-
-	insinto /usr/share/${PN}
-	doins -r "${BUILD_DIR}"/bin/resources
+	insinto /usr/lib/${PN}
+	doins -r "${BUILD_DIR}"/bin/.
 
-	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+	fperms +x /usr/lib/${PN}/pcsx2-qt
+	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
 
 	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
 	make_desktop_entry ${PN} ${PN^^}
+
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+
+	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
 }
 
 pkg_postinst() {
-	fcaps_pkg_postinst
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
 
 	local replacing=
 	if [[ ${REPLACING_VERSIONS##* } ]]; then

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     5766d7228b9df5837563d68d79dc13021f3c356d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 10:58:29 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 11:35:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5766d722

games-emulation/pcsx2: add 1.7.5033

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.5033.ebuild | 155 ++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ddff241a7cae..ea922468de55 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
+DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c

diff --git a/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
new file mode 100644
index 000000000000..98a2f8f00c10
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5033.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libaio
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.2[haptic,joystick]
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20230917
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
+		-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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     8e19ddfad1745322789c0928fdf784e2755807e5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 10:50:10 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 11:35:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e19ddfa

games-emulation/pcsx2: reduce postinst messages

Should not be super interesting at this point and has been fairly
stable despite packaging annoyances, albeit keep warning for those
upgrading from 1.6.0.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 37 +++++----------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7024be408faa..98a2f8f00c10 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -144,39 +144,12 @@ src_install() {
 pkg_postinst() {
 	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
 
-	local replacing=
-	if [[ ${REPLACING_VERSIONS##* } ]]; then
-		if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then
-			replacing=old
-		elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then
-			replacing=wx
-		else
-			replacing=any
-		fi
-	fi
-
-	if [[ ${replacing} == old ]]; then
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
+		elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
+		elog "to backup configs, save states, and memory cards before using."
 		elog
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, notably"
-		elog "it is now a 64bit build using Qt6. Just-in-case it is recommended to"
-		elog "backup your configs, save states, and memory cards before use."
 		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
 	fi
-
-	if [[ ${replacing} == @(|old) && ${PV} != 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
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     cdb771bfd674ceca39e808f36da55b6b75867dd8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 04:14:18 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 04:23:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb771bf

games-emulation/pcsx2: update live

Upstream purged some options and made them hard-required, did not use
most of these but dbus is one of.

Also adjust some comments. Things got changed around X11_API a bit,
but seems it still tries to link with libX11 if (UNIX) regardless, so
still no optional X (given upstream is killing options that they
"do not test" once they get a build failure report, odds are it will
remain this way).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f2a78ab73686..bb34c0a768df 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -24,7 +24,7 @@ LICENSE="
 	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
 "
 SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -40,11 +40,11 @@ COMMON_DEPEND="
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
+	sys-apps/dbus
 	sys-libs/zlib:=
 	virtual/libudev:=
 	x11-libs/libXrandr
 	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
@@ -97,20 +97,18 @@ src_configure() {
 		append-flags -fno-strict-aliasing
 
 		# odr violations in pcsx2's vulkan code, disabling as a safety for now
-		# (vulkan support tend to receive major changes, is more on WIP side)
 		filter-lto
 	fi
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
-		-DDBUS_API=$(usex dbus)
 		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWAYLAND_API=$(usex wayland)
-		-DX11_API=yes # fails if X libs are missing even if disabled
+		-DX11_API=yes # X libs are currently hard-required either way
 
 		# sse4.1 is the bare minimum required, -m is required at build time
 		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     c8ecb03553e32d0bff681f236e13f0c0406260b0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 16:03:46 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 16:03:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ecb035

games-emulation/pcsx2: drop 1.7.4795

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   2 -
 games-emulation/pcsx2/pcsx2-1.7.4795.ebuild | 277 ----------------------------
 2 files changed, 279 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index e6a9f19955a0..ddff241a7cae 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,9 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2 SHA512 2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
 DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
-DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B 88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89 SHA512 991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
deleted file mode 100644
index 7d24c2ae54cd..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4795.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 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-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]
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-FILECAPS=(
-	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
-	"${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
-)
-
-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 soundtouch 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
-
-		# 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() {
-	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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     a6344190b62e7ba9972dfc0d4beb135b6498d5ed
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 04:35:04 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 05:02:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6344190

games-emulation/pcsx2: update live, give up unbundling

We already had to go out of our way to unbundle a few extras, but
now upstream has removed all checks for alternatively using system
libraries (that someone had sent a PR for to add before) and this
is becoming too much of a pain to go against and very fragile.

May possibly revisit when it does a non-nightly release.

CMakeLists.txt set a very high lower bound on SDL2 for some reason,
but well, it's packaged.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 99 ++-------------------------------
 1 file changed, 5 insertions(+), 94 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f41481a3cf53..f2a78ab73686 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,26 +9,10 @@ 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
-		)
-	"
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
 	KEYWORDS="-* ~amd64"
 fi
 
@@ -47,16 +31,12 @@ RESTRICT="!test? ( test )"
 # dlopen: qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
 	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
 	dev-libs/libaio
-	dev-libs/libchdr
-	dev-libs/libzip:=[zstd]
 	dev-qt/qtbase:6[gui,network,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd
 	media-libs/libpng:=
-	>=media-libs/libsdl2-2.0.22[haptic,joystick]
+	>=media-libs/libsdl2-2.28.2[haptic,joystick]
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
@@ -80,7 +60,6 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	x11-base/xorg-proto
-	test? ( dev-cpp/gtest )
 "
 BDEPEND="
 	dev-qt/qttools:6[linguist]
@@ -98,59 +77,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
-	"${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
-	"${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
-	"${FILESDIR}"/${PN}-1.7.4943-system-libzip-zstd.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == 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
 
@@ -160,17 +88,6 @@ src_prepare() {
 	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 soundtouch 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
 }
 
@@ -195,12 +112,6 @@ src_configure() {
 		-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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     7d2eab17ddf0c6bdc8ff0f6573d2d9720e91196f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 03:27:05 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 03:39:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2eab17

games-emulation/pcsx2: add 1.7.4940

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   2 +
 games-emulation/pcsx2/pcsx2-1.7.4940.ebuild | 277 ++++++++++++++++++++++++++++
 2 files changed, 279 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 47b74b941337..e6a9f19955a0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,7 +1,9 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.4795.tar.gz 11816914 BLAKE2B b220979ebae7c9115ca464bd52e14f2fd76d02c58159c3cc49947a8ed530b49ab41ec1c0053bd5c5a63aa7d3052214e5c21bdb6000bf153524bba64a916143e2 SHA512 2b4c31deff5efc37cd672f5e9bb3bbda51091208c191cd726b9d25eea6c99a5d9466f8382a4e1e0ba9503be0681243b91b6d1cb3aad9689162275b83341b63e8
+DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
+DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B 88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89 SHA512 991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
new file mode 100644
index 000000000000..6089f51c3411
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4940.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+	HASH_RCHEEVOS=3af1e2fc5188d6e932ee379942f4049ea877e648
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
+			-> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+			-> ${PN}-fmt-${HASH_FMT::10}.tar.gz
+		https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz
+			-> ${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-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]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+FILECAPS=(
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${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
+)
+
+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 soundtouch 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
+
+		# 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() {
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     680e9eb4f6ba3553afb18c59c4a7922a8f9a07fd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 23:35:14 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 00:01:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680e9eb4

games-emulation/pcsx2: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3af6a07551b2..7d24c2ae54cd 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -27,7 +27,8 @@ else
 				-> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
 			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 				-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		)"
+		)
+	"
 	KEYWORDS="-* ~amd64"
 fi
 
@@ -36,7 +37,8 @@ HOMEPAGE="https://pcsx2.net/"
 
 LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
-	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
 SLOT="0"
 IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
@@ -67,22 +69,26 @@ COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
 	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )"
+	wayland? ( dev-libs/wayland )
+"
 # patches is a optfeature but always pull given PCSX2 complaints if it
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	games-emulation/pcsx2_patches"
+	games-emulation/pcsx2_patches
+"
 DEPEND="
 	${COMMON_DEPEND}
 	x11-base/xorg-proto
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
 BDEPEND="
 	dev-qt/qttools:6[linguist]
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
-	)"
+	)
+"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
@@ -95,6 +101,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
 	"${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
 	"${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch
+	"${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
 )
 
 src_unpack() {
@@ -118,7 +125,8 @@ src_unpack() {
 			# also keep vulkan-headers to stay in sync
 			$(usev vulkan '
 				3rdparty/glslang/glslang
-				3rdparty/vulkan-headers')
+				3rdparty/vulkan-headers
+			')
 		)
 
 		git-r3_src_unpack
@@ -158,7 +166,7 @@ src_prepare() {
 			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
 			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
 			cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd
-			lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis
+			lzma rapidjson rapidyaml rcheevos simpleini soundtouch xbyak zydis
 			$(usev vulkan 'glslang vulkan-headers')
 		)
 		find 3rdparty -mindepth 1 -maxdepth 1 -type d \

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     a091e20a286f0e901165241da7af04c32ec33d6f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 09:36:48 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 09:44:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a091e20a

games-emulation/pcsx2: update live

Technically builds without wayland-scanner still, but ECM
(which is now required with wayland) looks for its wayland.xml
and warns if it's missing. It's fairly cheap to depend on and
may avoid unexpected consequences when missing.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 63f79eb0b691..3af6a07551b2 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -77,7 +77,12 @@ DEPEND="
 	${COMMON_DEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools:6[linguist]"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     cc9ce18c02fbef950b77280cf15c6d26ef90ed3d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 02:59:17 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 04:13:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc9ce18c

games-emulation/pcsx2: add 1.7.4624

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.4624.ebuild | 259 ++++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 36a24560f9e3..139f46d9d7e0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B 203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1 SHA512 0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
+DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B 539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a SHA512 af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
new file mode 100644
index 000000000000..0837cde0069d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2697fac5cef42fa8de788e91fa6f4ac924f0b916
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 02:59:47 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 04:13:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2697fac5

games-emulation/pcsx2: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index d2af26b4d0ef..0837cde0069d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -42,8 +42,8 @@ IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
+# dlopen: qtsvg, vulkan-loader, wayland
+COMMON_DEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-cpp/rapidyaml:=
@@ -69,8 +69,13 @@ RDEPEND="
 	sndio? ( media-sound/sndio:= )
 	vulkan? ( media-libs/vulkan-loader )
 	wayland? ( dev-libs/wayland )"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	games-emulation/pcsx2_patches"
 DEPEND="
-	${RDEPEND}
+	${COMMON_DEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
 BDEPEND="dev-qt/qttools:6[linguist]"
@@ -169,6 +174,7 @@ src_configure() {
 		-DDBUS_API=$(usex dbus)
 		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)
+		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWAYLAND_API=$(usex wayland)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f70462ffa87a2fb6214929274f12f484d9cb61e4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 05:07:44 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jun  2 06:53:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70462ff

games-emulation/pcsx2: drop 1.7.4425-r2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest                 |   1 -
 games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild | 245 -------------------------
 2 files changed, 246 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 6bd1232b6bb5..36a24560f9e3 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B 9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31 SHA512 a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
 DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B 203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1 SHA512 0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
deleted file mode 100644
index 14030099b64d..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 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 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 )
-	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 "/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 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() {
-	# 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
-		-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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Andreas K. Hüttel]

commit:     90de363201faff3f2eee6af878a998d0059496fa
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 20:49:25 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 28 20:49:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90de3632

games-emulation/pcsx2: Drop dependency on libbacktrace

... since that library causes a ton of problems.

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 games-emulation/pcsx2/metadata.xml                                    | 1 -
 .../pcsx2/{pcsx2-1.7.4425-r1.ebuild => pcsx2-1.7.4425-r2.ebuild}      | 4 +---
 .../pcsx2/{pcsx2-1.7.4534.ebuild => pcsx2-1.7.4534-r1.ebuild}         | 4 +---
 games-emulation/pcsx2/pcsx2-9999.ebuild                               | 4 +---
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 5e2be35968f1..6e25d9d61e5b 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="backtrace">Display a backtrace on crash using <pkg>sys-libs/libbacktrace</pkg></flag>
 		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 	</use>
 	<upstream>

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
similarity index 97%
rename from games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
index 4b41e151906f..14030099b64d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4425-r2.ebuild
@@ -38,7 +38,7 @@ LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
 	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -63,7 +63,6 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/libXrandr
 	alsa? ( media-libs/alsa-lib )
-	backtrace? ( sys-libs/libbacktrace )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
@@ -159,7 +158,6 @@ src_configure() {
 	use vulkan && append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(
-		$(cmake_use_find_package backtrace Libbacktrace)
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
similarity index 97%
rename from games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
index 1c93197e9991..d2af26b4d0ef 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4534-r1.ebuild
@@ -38,7 +38,7 @@ LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
 	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -63,7 +63,6 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/libXrandr
 	alsa? ( media-libs/alsa-lib )
-	backtrace? ( sys-libs/libbacktrace )
 	dbus? ( sys-apps/dbus )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
@@ -166,7 +165,6 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		$(cmake_use_find_package backtrace Libbacktrace)
 		-DBUILD_SHARED_LIBS=no
 		-DDBUS_API=$(usex dbus)
 		-DDISABLE_BUILD_DATE=yes

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1c93197e9991..d2af26b4d0ef 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -38,7 +38,7 @@ LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
 	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -63,7 +63,6 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/libXrandr
 	alsa? ( media-libs/alsa-lib )
-	backtrace? ( sys-libs/libbacktrace )
 	dbus? ( sys-apps/dbus )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
@@ -166,7 +165,6 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		$(cmake_use_find_package backtrace Libbacktrace)
 		-DBUILD_SHARED_LIBS=no
 		-DDBUS_API=$(usex dbus)
 		-DDISABLE_BUILD_DATE=yes

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     a21051f8ceacb84df069bda7f794cc3b83f29a43
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 23:15:23 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 26 02:38:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21051f8

games-emulation/pcsx2: filter-lto with USE=vulkan

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index be8593008a14..1c93197e9991 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -156,8 +156,14 @@ src_prepare() {
 }
 
 src_configure() {
-	# for bundled glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		# (vulkan support tend to receive major changes, is more on WIP side)
+		filter-lto
+	fi
 
 	local mycmakeargs=(
 		$(cmake_use_find_package backtrace Libbacktrace)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     e74e866773720afd3a2ecd2f810e785c1f98a036
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 23:24:53 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 26 02:38:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74e8667

games-emulation/pcsx2: add 1.7.4534

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.4534.ebuild | 255 ++++++++++++++++++++++++++++
 2 files changed, 256 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 8819ea109be9..6bd1232b6bb5 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B 9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31 SHA512 a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
+DIST pcsx2-1.7.4534.tar.gz 8973035 BLAKE2B 203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1 SHA512 0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
new file mode 100644
index 000000000000..1c93197e9991
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4534.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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 backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# 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 )
+	backtrace? ( sys-libs/libbacktrace )
+	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=(
+		$(cmake_use_find_package backtrace Libbacktrace)
+		-DBUILD_SHARED_LIBS=no
+		-DDBUS_API=$(usex dbus)
+		-DDISABLE_BUILD_DATE=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_VTUNE=no
+		-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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Sam James]

commit:     818a4f4096df066f3a6ca47aad95419c37c581c7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 02:43:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 02:51:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818a4f40

games-emulation/pcsx2: defer to new global USE=vulkan description

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/pcsx2/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index cf7d628cd86c..5e2be35968f1 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -16,7 +16,6 @@
 	<use>
 		<flag name="backtrace">Display a backtrace on crash using <pkg>sys-libs/libbacktrace</pkg></flag>
 		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
-		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     756af8bca06386b8227ef45cdad734ee53a870d7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 17:16:49 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue May 16 17:20:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756af8bc

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index ca3efae59de9..be8593008a14 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -135,8 +135,8 @@ src_unpack() {
 src_prepare() {
 	cmake_src_prepare
 
-	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
-		-i pcsx2/Frontend/CommonHost.cpp || die
+	sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
+		-i pcsx2/Pcsx2Config.cpp || die
 
 	if [[ ${PV} != 9999 ]]; then
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     fc3db82f7d2e647e4f0cfe68cb6c831b0b25458c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 17:05:43 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 10 17:25:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3db82f

games-emulation/pcsx2: drop 1.7.4280

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 237 ----------------------------
 2 files changed, 238 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 73283f95037d..8819ea109be9 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B 822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585 SHA512 60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
 DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B 9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31 SHA512 a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
deleted file mode 100644
index ae1c9c594c50..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 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 backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
-RDEPEND="
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
-	dev-libs/libaio
-	dev-libs/libchdr
-	dev-libs/libfmt:=
-	dev-libs/libzip:=[zstd]
-	dev-qt/qtbase:6[gui,network,widgets]
-	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 )
-	backtrace? ( sys-libs/libbacktrace )
-	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=(
-			# 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=(
-		$(cmake_use_find_package backtrace Libbacktrace)
-		-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,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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     98f07e417114c0077ac7f082483f95dc31522dde
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 16:59:44 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 10 17:25:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f07e41

games-emulation/pcsx2: switch to bundled libfmt for now

May or may not be an easy fix for libfmt-10, but upstream currently
does not really support using system libraries unless someone else
does the fix for them (e.g. closed the rapidyaml-0.5 issue and
left it broken for months).

Given libfmt tend to be volatile and break old code often, switch
to bundled for now. May revisit this later when there's non-nightly
releases, or if (at least) gets fixed for libfmt-10.

Do a revbump given portage does not fully understand rebuilding pcsx2
as being a solution to allow bumping libfmt if the dep is gone.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest                       |  1 +
 ...csx2-1.7.3738.ebuild => pcsx2-1.7.3738-r1.ebuild} | 20 +++++++++++++++++---
 ...csx2-1.7.4425.ebuild => pcsx2-1.7.4425-r1.ebuild} | 16 +++++++++++++---
 games-emulation/pcsx2/pcsx2-9999.ebuild              | 16 +++++++++++++---
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index db45ae12d53c..73283f95037d 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -3,6 +3,7 @@ DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613
 DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B 822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585 SHA512 60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
 DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B 9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31 SHA512 a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
+DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
similarity index 90%
rename from games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
index 87648ee26e9d..b0b340795652 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
 	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
 	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
 	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
 	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
@@ -18,6 +19,8 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
 			-> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+			-> ${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? (
@@ -46,7 +49,6 @@ RDEPEND="
 	>=dev-cpp/rapidyaml-0.5:=
 	dev-libs/libaio
 	dev-libs/libchdr
-	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libzip:=[zstd]
 	media-libs/harfbuzz
 	media-libs/libglvnd
@@ -100,6 +102,10 @@ PATCHES=(
 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
 
@@ -125,6 +131,9 @@ src_unpack() {
 		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
 
@@ -151,7 +160,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 discord-rpc fmt glad imgui include jpgd lzma
 			rapidjson rapidyaml rcheevos simpleini xbyak zydis
 			$(usev vulkan 'glslang vulkan-headers')
 		)
@@ -174,12 +183,17 @@ src_configure() {
 		-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
 
+		# 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

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
similarity index 92%
rename from games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
index ae1c9c594c50..4b41e151906f 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild
@@ -10,6 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
 	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
 	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
 	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
 	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
@@ -17,6 +18,8 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
 			-> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+			-> ${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? (
@@ -46,7 +49,6 @@ RDEPEND="
 	dev-cpp/rapidyaml:=
 	dev-libs/libaio
 	dev-libs/libchdr
-	dev-libs/libfmt:=
 	dev-libs/libzip:=[zstd]
 	dev-qt/qtbase:6[gui,network,widgets]
 	dev-qt/qtsvg:6
@@ -86,6 +88,10 @@ PATCHES=(
 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
 
@@ -111,6 +117,9 @@ src_unpack() {
 		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
 
@@ -136,8 +145,8 @@ 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 demangler discord-rpc glad imgui include jpgd lzma
-			rapidjson rapidyaml rcheevos simpleini xbyak zydis
+			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 \
@@ -163,6 +172,7 @@ src_configure() {
 		# 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)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 2608f0e1b287..ca3efae59de9 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -10,6 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
 	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
 	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
 	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
 	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
@@ -17,6 +18,8 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz
 			-> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz
+			-> ${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? (
@@ -46,7 +49,6 @@ RDEPEND="
 	dev-cpp/rapidyaml:=
 	dev-libs/libaio
 	dev-libs/libchdr
-	dev-libs/libfmt:=
 	dev-libs/libzip:=[zstd]
 	dev-qt/qtbase:6[gui,network,widgets]
 	dev-qt/qtsvg:6
@@ -87,6 +89,10 @@ PATCHES=(
 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
 
@@ -112,6 +118,9 @@ src_unpack() {
 		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
 
@@ -137,8 +146,8 @@ 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 demangler discord-rpc glad imgui include jpgd lzma
-			rapidjson rapidyaml rcheevos simpleini xbyak zydis
+			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 \
@@ -165,6 +174,7 @@ src_configure() {
 		# 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)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     71d84122ca08c2ef35660dceb2d4fa31245de707
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 21:26:52 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 21:34:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d84122

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index ae1c9c594c50..2608f0e1b287 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
 	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa backtrace cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -62,6 +62,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	alsa? ( media-libs/alsa-lib )
 	backtrace? ( sys-libs/libbacktrace )
+	dbus? ( sys-apps/dbus )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
@@ -152,6 +153,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package backtrace Libbacktrace)
 		-DBUILD_SHARED_LIBS=no
+		-DDBUS_API=$(usex dbus)
 		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_VTUNE=no

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f9b82904bd8128128a98f541d0776009a1852024
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 07:49:52 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 08:36:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b82904

games-emulation/pcsx2: add 1.7.4425

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.4425.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 1496d4a0c301..db45ae12d53c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B 822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585 SHA512 60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
+DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B 9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31 SHA512 a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
new file mode 100644
index 000000000000..ae1c9c594c50
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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 backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
+RDEPEND="
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/rapidyaml:=
+	dev-libs/libaio
+	dev-libs/libchdr
+	dev-libs/libfmt:=
+	dev-libs/libzip:=[zstd]
+	dev-qt/qtbase:6[gui,network,widgets]
+	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 )
+	backtrace? ( sys-libs/libbacktrace )
+	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=(
+			# 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=(
+		$(cmake_use_find_package backtrace Libbacktrace)
+		-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,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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     2f420d0c64b33fe486a1ea36fd51b21ee7f227ee
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 04:47:37 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 04:49:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f420d0c

games-emulation/pcsx2: use explicit slot for qttools

Oversight, albeit is unlikely to be an issue unless qttools
is still not split by the time Qt7 comes out.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 951c4e4fe7c8..87648ee26e9d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -81,7 +81,7 @@ DEPEND="
 	test? ( dev-cpp/gtest )"
 BDEPEND="
 	dev-lang/perl
-	qt6? ( dev-qt/qttools[linguist] )
+	qt6? ( dev-qt/qttools:6[linguist] )
 	!qt6? ( sys-devel/gettext )"
 
 FILECAPS=(

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
index a0683b3c3d85..ae1c9c594c50 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
@@ -71,7 +71,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index a0683b3c3d85..ae1c9c594c50 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -71,7 +71,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     a0836b8cd43da0ae917cc83828816656978a62f0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 07:22:09 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 07:39:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0836b8c

games-emulation/pcsx2: add 1.7.4280

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 24fbffc4a4d7..5b6690e3e7cc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37 SHA512 382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
+DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B 822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585 SHA512 60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
new file mode 100644
index 000000000000..a0683b3c3d85
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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 backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland
+RDEPEND="
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/rapidyaml:=
+	dev-libs/libaio
+	dev-libs/libchdr
+	dev-libs/libfmt:=
+	dev-libs/libzip:=[zstd]
+	dev-qt/qtbase:6[gui,network,widgets]
+	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 )
+	backtrace? ( sys-libs/libbacktrace )
+	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
+)
+
+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=(
+		$(cmake_use_find_package backtrace Libbacktrace)
+		-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,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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     c825787cfc67de93148b46bd299c6d2ee3ce078b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 07:20:03 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 07:39:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c825787c

games-emulation/pcsx2: sync live

PV bit was already in other ebuilds, overlooked to sync before
(upstream can be picky about modifications and it doesn't hurt to
indicate this is Gentoo's version while we adjust tag manually).

rapidyaml restriction no longer matter as it works with 0.4 too
now, albeit we don't have <0.5 in tree anymore anyway.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 5d05ef3be008..a0683b3c3d85 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
-	>=dev-cpp/rapidyaml-0.5:=
+	dev-cpp/rapidyaml:=
 	dev-libs/libaio
 	dev-libs/libchdr
 	dev-libs/libfmt:=
@@ -129,7 +129,7 @@ src_prepare() {
 		-i pcsx2/Frontend/CommonHost.cpp || die
 
 	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
 			-i cmake/Pcsx2Utils.cmake || die
 
 		# delete all 3rdparty/* except known-used ones in non-live

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     17cda78d199334cbefafec6e36ee837733159133
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 02:05:28 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 03:18:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cda78d

games-emulation/pcsx2: drop 1.7.4042

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.4042.ebuild | 237 ----------------------------
 2 files changed, 238 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 3bc6aef3e272..24fbffc4a4d7 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B 31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc SHA512 553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
 DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37 SHA512 382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
deleted file mode 100644
index e94d9f32ace2..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     42177c71dd144e397935801799dd37d4e416fc47
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 05:17:05 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 05:44:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42177c71

games-emulation/pcsx2: update live, add IUSE=backtrace

Unsure about the USE choice, library is scarcely used and so
no real point of reference. Considered a generic USE=debug,
but going with a described local USE.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/metadata.xml      | 1 +
 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index efa1131e61ab..cf7d628cd86c 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="backtrace">Display a backtrace on crash using <pkg>sys-libs/libbacktrace</pkg></flag>
 		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index be5cf31b436b..5d05ef3be008 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
 	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
+IUSE="alsa backtrace cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -61,6 +61,7 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/libXrandr
 	alsa? ( media-libs/alsa-lib )
+	backtrace? ( sys-libs/libbacktrace )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-libs/libpulse )
 	sndio? ( media-sound/sndio:= )
@@ -149,6 +150,7 @@ src_configure() {
 	use vulkan && append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(
+		$(cmake_use_find_package backtrace Libbacktrace)
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_BUILD_DATE=yes
 		-DENABLE_TESTS=$(usex test)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f6dba5f29cf07fe56bb626629d1fdace85c5b5dd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 22:27:53 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 22:44:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dba5f2

games-emulation/pcsx2: update live

Upstream still bundles old rapidyaml but it's now compatible with 0.5.

As for the man page, it was removed entirely upstream. It contained
rather outdated info and was not useful anymore either way.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 55f64e2732eb..be5cf31b436b 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -80,7 +80,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
-	"${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
 )
 
 src_unpack() {
@@ -189,8 +188,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r "${BUILD_DIR}"/bin/resources
 
-	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt}
-	newman bin/docs/PCSX2.1 ${PN}.1
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
 
 	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
 	make_desktop_entry ${PN} ${PN^^}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     440d47aba903e382dc6422c4c3fa3b6161ddd4af
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 06:41:58 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 06:41:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440d47ab

games-emulation/pcsx2: add 1.7.4217

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.4217.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index c3008a630dbc..3bc6aef3e272 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B 31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc SHA512 553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
+DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37 SHA512 382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild
new file mode 100644
index 000000000000..e94d9f32ace2
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     811dae60f0634a9ba92a103baf311f521e897fc6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 11:03:31 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 11:32:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811dae60

games-emulation/pcsx2: drop 1.7.3958

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.3958.ebuild | 237 ----------------------------
 2 files changed, 238 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 48c05a44627a..c3008a630dbc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B 1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d SHA512 1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
 DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B 31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc SHA512 553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
deleted file mode 100644
index e94d9f32ace2..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     aff547c621ec5e906c7104ef440636cabb547371
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 22:29:56 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 22:41:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff547c6

games-emulation/pcsx2: add 1.7.4042

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.4042.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 5e61a4289376..48c05a44627a 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B 1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d SHA512 1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
+DIST pcsx2-1.7.4042.tar.gz 9190907 BLAKE2B 31f8cdc8506b1195e66856d10eadae650397df10834934fcd6112d4c7a528deb4f1efa27a196db4861f5bab52a08b9d10926e45192878557e67621e3cbd364cc SHA512 553a2041edc56fb3482fddd4e59e4c6f75339322690ab9df366e148478a8a920f3f9a4e61e98285cf24b5dda4feac030a8f670c33c8bba797a79db97be386114
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
new file mode 100644
index 000000000000..e94d9f32ace2
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.4042.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     eda8d7d1fb76049e1c71237dab717bf6a85220e0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 22:05:47 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 22:51:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda8d7d1

games-emulation/pcsx2: update glslang comment + add bugref

ResourceLimits.h bit can (now) be solved and so isn't entirely
accurate, albeit requires work and unbundling will still increase
the maintenance burden over time as it's not that uncommon for
glslang to break its API.

Unless upstream actively tries to keep up with glslang, it may
be best kept left like that.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 4 ++--
 games-emulation/pcsx2/pcsx2-1.7.3958.ebuild | 4 ++--
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 57249a1e145e..951c4e4fe7c8 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -110,8 +110,8 @@ src_unpack() {
 			3rdparty/rapidyaml/rapidyaml/extern/c4core
 			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
 
-			# uses glslang's StandAlone/ResourceLimits.h unavailable with
-			# system's (also keep bundled vulkan-headers to be in sync)
+			# glslang can be troublesome to unbundle (bug #831217),
+			# also keep vulkan-headers to stay in sync
 			$(usev vulkan '
 				3rdparty/glslang/glslang
 				3rdparty/vulkan-headers')

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
index 176d63a0bcb9..e94d9f32ace2 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
@@ -96,8 +96,8 @@ src_unpack() {
 			3rdparty/rapidyaml/rapidyaml/extern/c4core
 			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
 
-			# uses glslang's StandAlone/ResourceLimits.h unavailable with
-			# system's (also keep bundled vulkan-headers to be in sync)
+			# glslang can be troublesome to unbundle (bug #831217),
+			# also keep vulkan-headers to stay in sync
 			$(usev vulkan '
 				3rdparty/glslang/glslang
 				3rdparty/vulkan-headers')

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 4cddbd425737..55f64e2732eb 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -96,8 +96,8 @@ src_unpack() {
 			3rdparty/rapidyaml/rapidyaml/extern/c4core
 			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
 
-			# uses glslang's StandAlone/ResourceLimits.h unavailable with
-			# system's (also keep bundled vulkan-headers to be in sync)
+			# glslang can be troublesome to unbundle (bug #831217),
+			# also keep vulkan-headers to stay in sync
 			$(usev vulkan '
 				3rdparty/glslang/glslang
 				3rdparty/vulkan-headers')

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     4098f593e47763b98c366f5b4d435bb91c919dc2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 18:54:29 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:11:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4098f593

games-emulation/pcsx2: drop 1.7.3820

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 -
 games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 237 ----------------------------
 2 files changed, 238 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 4fa628dc037b..5e61a4289376 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,5 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B 39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834 SHA512 6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
 DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B 1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d SHA512 1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
deleted file mode 100644
index 91963a439c7b..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic
-
-if [[ ${PV} == 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.0-crcs.patch
-	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
-	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
-	"${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
-
-			# 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
-
-	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}'"/' \
-			-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
-		-DDISABLE_SETCAP=yes
-		-DENABLE_TESTS=$(usex test)
-		-DUSE_SYSTEM_LIBS=yes
-		-DUSE_VTUNE=no
-		-DUSE_VULKAN=$(usex vulkan)
-		-DWAYLAND_API=$(usex wayland)
-		-DX11_API=yes # fails if X libs are missing even if disabled
-		-DXDG_STD=yes
-
-		# 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() {
-	# package mode was removed turning cmake_src_install into a noop
-	newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
-
-	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=
-	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
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     28c4ff24d872f182d40935f6693f94cb754348c7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 22:21:24 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 22:32:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c4ff24

games-emulation/pcsx2: add 1.7.3958

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.3958.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d93cf8e3a65c..4fa628dc037b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,7 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B 39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834 SHA512 6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
+DIST pcsx2-1.7.3958.tar.gz 9146709 BLAKE2B 1e8af858bf73ec1273c073b9bee5a85526c69167555b7b491826a9c86946a6244dc114fec3ec31fb382f60fc4f3a989e24ee3001aa60a640340eb95b3461162d SHA512 1f1c5800bcc564797db6b9e70d0859d7c020470619716b0f501f588780ce4ec1e99e9be550d1cc2750d4378be19a6afb6d5987b9f0e5f0abf2414b498ba5b9ba
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
new file mode 100644
index 000000000000..176d63a0bcb9
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3958.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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
+
+			# 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
+
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     b5530563219a42d294d8910dae7b04207dff51f6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 22:32:45 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 22:40:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5530563

games-emulation/pcsx2: cleanup unused perl bdep

Not important but noticed nothing was using it anymore (or at
least in Qt6-only versions, leaving it alone for wx builds).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 4 +---
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index 7c14ae265d5f..91963a439c7b 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -70,9 +70,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="
-	dev-lang/perl
-	dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools[linguist]"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1ad975e4a014..4cddbd425737 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -70,9 +70,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="
-	dev-lang/perl
-	dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools[linguist]"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     5af6fbc84760770a4a12bb2b018bc01ea8c5ad98
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 09:53:35 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 11:25:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af6fbc8

games-emulation/pcsx2: drop crcs patch in live

Upstream removed the CRC list entirely that I can see,
untested but assume this is no longer useful.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index a052878f071a..1ad975e4a014 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -79,7 +79,6 @@ FILECAPS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.3773-lto.patch

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     5f7c7b47044751ec5a546d2b30007f196fc3f1ff
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 15:39:18 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 15:47:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7c7b47

games-emulation/pcsx2: update live

XDG_STD=yes is now default and the option was replaced by a
legacy option to opt-out which we don't need to pass.

Similar for handling setcap.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index e2f804a6b008..73eae17a4f96 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -159,13 +159,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_BUILD_DATE=yes
-		-DDISABLE_SETCAP=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_VTUNE=no
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWAYLAND_API=$(usex wayland)
 		-DX11_API=yes # fails if X libs are missing even if disabled
-		-DXDG_STD=yes
 
 		# note that the current upstream is somewhat hostile to using system
 		# libs, system installs, or any modifications and may disregard any
@@ -193,10 +191,10 @@ src_test() {
 }
 
 src_install() {
-	newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
+	newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN}
 
 	insinto /usr/share/${PN}
-	doins -r "${BUILD_DIR}"/pcsx2-qt/resources
+	doins -r "${BUILD_DIR}"/bin/resources
 
 	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt}
 	newman bin/docs/PCSX2.1 ${PN}.1

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     0b7309a9168d53db7c8ab0255320f5c6d4a295a4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 06:16:36 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 06:17:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7309a9

games-emulation/pcsx2: adjust postinst elog to be more accurate

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 15 +++++++--------
 games-emulation/pcsx2/pcsx2-1.7.3820.ebuild | 15 +++++++--------
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 13 ++++++-------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 92f1596c955b..740fb1613eaa 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -225,13 +225,12 @@ pkg_postinst() {
 
 	if [[ ${PV} != 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 "${PN}-1.7.x is a development branch where .x increments every changes."
+		elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native"
+		elog "64bit builds). Given it may be a long time before there is a new stable,"
+		elog "Gentoo will carry and update 1.7.x roughly every months."
 		elog
-		elog "Please report an issue if feel a picked nightly release needs to be"
-		elog "updated ahead of time or masked (notably for handling regressions)."
+		elog "Please report an issue if feel a picked version needs to be updated ahead"
+		elog "of time or masked (notably for handling regressions)."
 	fi
 }

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
index eebe34cc10de..caf2e5c05300 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -226,14 +226,13 @@ pkg_postinst() {
 
 	if [[ ${replacing} == @(|old) && ${PV} != 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"
-		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
-		elog "roughly every months."
+		elog "${PN}-1.7.x is a development branch where .x increments every changes."
+		elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native"
+		elog "64bit builds). Given it may be a long time before there is a new stable,"
+		elog "Gentoo will carry and update 1.7.x roughly every months."
 		elog
-		elog "Please report an issue if feel a picked nightly release needs to be"
-		elog "updated ahead of time or masked (notably for handling regressions)."
+		elog "Please report an issue if feel a picked version needs to be updated ahead"
+		elog "of time or masked (notably for handling regressions)."
 	fi
 
 	if [[ ${replacing} == wx ]]; then

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 88c5807335b7..b9d68d63b68b 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -226,14 +226,13 @@ pkg_postinst() {
 
 	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"
-		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
-		elog "roughly every months."
+		elog "${PN}-1.7.x is a development branch where .x increments every changes."
+		elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native"
+		elog "64bit builds). Given it may be a long time before there is a new stable,"
+		elog "Gentoo will carry and update 1.7.x roughly every months."
 		elog
-		elog "Please report an issue if feel a picked nightly release needs to be"
-		elog "updated ahead of time or masked (notably for handling regressions)."
+		elog "Please report an issue if feel a picked version needs to be updated ahead"
+		elog "of time or masked (notably for handling regressions)."
 	fi
 
 	if [[ ${replacing} == wx ]]; then

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     babbb3349e064e71743b372d272b89eba67b03a4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 05:33:08 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 05:46:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babbb334

games-emulation/pcsx2: switch icon in live

The linux_various directory is about to be removed, and this
other icon is higher quality anyway. PCSX2.desktop.in will also
be removed but had already switched to make_desktop_entry.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index eebe34cc10de..88c5807335b7 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -198,7 +198,7 @@ src_install() {
 	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt}
 	newman bin/docs/PCSX2.1 ${PN}.1
 
-	newicon linux_various/PCSX2.xpm ${PN}.xpm
+	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
 	make_desktop_entry ${PN} ${PN^^}
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     39e5ef3b9ea88d074e3b05197864033ce73c5af0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 17:53:31 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 18:06:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e5ef3b

games-emulation/pcsx2: add 1.7.3820, drop 1.7.3818

Early bump to include fix for a notable microVU regression since 3813.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest                                         | 2 +-
 games-emulation/pcsx2/{pcsx2-1.7.3818.ebuild => pcsx2-1.7.3820.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index b99b2a8df7f3..d93cf8e3a65c 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,6 +1,6 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
-DIST pcsx2-1.7.3818.tar.gz 9165699 BLAKE2B adfff6d4c1fc74e6fab052a03ec42b519f3cd9898c5719482e8b9bbdb9d224caf9a4bb95aef3e4f3993944e877e9a4f79e48d74e427c59c70c1480238ee0146b SHA512 4a3bdd4d4b18fa06fd942ed93ff2bc9dd5e332bdf59ba5fc54b185e6e58957d4f5da74e4371cfb6964696a2ed08df61fdc1d3738ce9b781a39c7c08f10e9c99e
+DIST pcsx2-1.7.3820.tar.gz 9166019 BLAKE2B 39bff314dcdea0baebafe51e61d390d235afed77a538de16687fd1bdeb543abc6c44ec3a9dfa75c8466f3ec8808d72997878b2c661a0af890875b05e293a0834 SHA512 6e4d94454143d652e0ea41a0d919153a868856c746aadf90692cb6edeada2ce0ee07802fa815856072905ea28cfa5131752ec34f9947bd911be32e73e34839d5
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3820.ebuild
similarity index 100%
rename from games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
rename to games-emulation/pcsx2/pcsx2-1.7.3820.ebuild

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     9e5a5e76bb743ac23db130f86f9569821ca5258b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 20:24:37 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 20:28:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5a5e76

games-emulation/pcsx2: add 1.7.3818 (qt6-only, masked)

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.3818.ebuild | 244 ++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 6866d173ca7c..b99b2a8df7f3 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
+DIST pcsx2-1.7.3818.tar.gz 9165699 BLAKE2B adfff6d4c1fc74e6fab052a03ec42b519f3cd9898c5719482e8b9bbdb9d224caf9a4bb95aef3e4f3993944e877e9a4f79e48d74e427c59c70c1480238ee0146b SHA512 4a3bdd4d4b18fa06fd942ed93ff2bc9dd5e332bdf59ba5fc54b185e6e58957d4f5da74e4371cfb6964696a2ed08df61fdc1d3738ce9b781a39c7c08f10e9c99e
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
new file mode 100644
index 000000000000..eebe34cc10de
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3818.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 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:=
+	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-lang/perl
+	dev-qt/qttools[linguist]"
+
+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.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=(
+			# 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() {
+	# could depend on >=0.5 for unconditional, but rather not force it yet
+	# https://github.com/PCSX2/pcsx2/issues/7623
+	has_version '>=dev-cpp/rapidyaml-0.5' &&
+		eapply "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch
+
+	cmake_src_prepare
+
+	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
+		-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 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
+		-DDISABLE_SETCAP=yes
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DX11_API=yes # fails if X libs are missing even if disabled
+		-DXDG_STD=yes
+
+		# 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() {
+	# package mode was removed turning cmake_src_install into a noop
+	newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN}
+
+	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=
+	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 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
+
+	if [[ ${replacing} == wx ]]; then
+		ewarn
+		ewarn "Note that wxGTK support been dropped upstream since >=${PN}-1.7.3773,"
+		ewarn "and so USE=qt6 is gone and Qt6 is now always used."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     a86175270f346bb3bba8ecacff684dcf3a6a1a71
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 06:37:54 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 08:30:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8617527

games-emulation/pcsx2: update live to depend on ffmpeg

This dlopen() it, but still using binding := to ensure it builds
with matching headers. The cmake include/library "not found" message
is harmless as long as at least the version is found (emits a warning
if it attempts to use bundled headers, on non-live will fail if
attempts this given headers will be deleted).

Note that recording doesn't really work without qt6 (doesn't even
have menus to select codecs), albeit still uses headers if disabled.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 92f1596c955b..43d70a563a48 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -40,6 +40,7 @@ IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
+# dlopen: ffmpeg, qtsvg, vulkan-loader
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
@@ -53,6 +54,7 @@ RDEPEND="
 	media-libs/libpng:=
 	>=media-libs/libsdl2-2.0.22[haptic,joystick]
 	media-libs/libsoundtouch:=
+	media-video/ffmpeg:=
 	net-libs/libpcap
 	sys-libs/zlib:=
 	virtual/libudev:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     77820d419fbe3f7505c0788bca30835e8c4f7552
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 04:45:32 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 05:47:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77820d41

games-emulation/pcsx2: add 1.7.3738

Note may be one of last few releases with wxGTK support as upstream
is planning to go Qt6-only (not merged yet). When this happens new
releases will be masked until Qt6 is unmasked in ::gentoo.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ba64d50a4cff..d2c09dbfd961 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
+DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
new file mode 100644
index 000000000000..92f1596c955b
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic wxwidgets
+
+if [[ ${PV} == 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
+		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-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() {
+	# could depend on >=0.5 for unconditional, but rather not force it yet
+	# https://github.com/PCSX2/pcsx2/issues/7623
+	has_version '>=dev-cpp/rapidyaml-0.5' &&
+		eapply "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.patch
+
+	cmake_src_prepare
+
+	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
+	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 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_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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f96dba3c41f644e150f070bc617afc7ccb1f25eb
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 05:25:44 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 05:38:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96dba3c

games-emulation/pcsx2: update live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index de7b59537121..119d33bb8302 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -68,7 +68,6 @@ RDEPEND="
 	)
 	!qt6? (
 		dev-libs/glib:2
-		media-libs/libsamplerate
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3[wayland?]
 		x11-libs/wxGTK:${WX_GTK_VER}[X]
@@ -92,7 +91,6 @@ FILECAPS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
 	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
-	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
 	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
@@ -144,9 +142,6 @@ src_prepare() {
 	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
 		-i pcsx2/Frontend/CommonHost.cpp || die
 
-	# non-cubeb pulseaudio is only used for usb-mic without qt6, not output
-	use pulseaudio || :> cmake/FindPulseAudio.cmake || die
-
 	if [[ ${PV} != 9999 ]]; then
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
 			-i cmake/Pcsx2Utils.cmake || die

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     1108b8ddbf22c69e639a22d4c4d371fc6c25a876
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 20:18:02 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 21:32:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1108b8dd

games-emulation/pcsx2: add 1.7.3602

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |   1 +
 games-emulation/pcsx2/pcsx2-1.7.3602.ebuild | 237 ++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 06cde4e6d679..412dd3364c76 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,5 +1,6 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
+DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
new file mode 100644
index 000000000000..de7b59537121
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3602.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic wxwidgets
+
+if [[ ${PV} == 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 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_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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     ba6f86bed05ec36cf1d8312f431db8d855d1a0ea
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 20:18:33 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 21:32:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6f86be

games-emulation/pcsx2: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 25b97c43ac32..de7b59537121 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -16,11 +16,15 @@ else
 	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
+		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
+			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
@@ -152,7 +156,7 @@ src_prepare() {
 			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
 			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
 			cpuinfo cubeb discord-rpc glad imgui include jpgd lzma
-			rapidjson rapidyaml rcheevos simpleini xbyak
+			rapidjson rapidyaml rcheevos simpleini xbyak zydis
 			$(usev vulkan 'glslang vulkan-headers')
 		)
 		find 3rdparty -mindepth 1 -maxdepth 1 -type d \

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     245ba1910f5aa21176afac80e264ebe15db23a16
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 10:06:52 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=245ba191

games-emulation/pcsx2: sync live, fix USE=-vulkan

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 82 +++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index e65ca9879371..25b97c43ac32 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -10,10 +10,14 @@ 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
@@ -25,11 +29,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+ ISC LGPL-2.1+
-	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+	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"
-# TODO: proper IUSE to handle cubeb backends with the now-required bundled copy
-IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
+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 )"
 
@@ -44,7 +47,6 @@ RDEPEND="
 	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
@@ -52,6 +54,9 @@ RDEPEND="
 	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
@@ -59,11 +64,12 @@ RDEPEND="
 	)
 	!qt6? (
 		dev-libs/glib:2
+		media-libs/libsamplerate
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3[wayland?]
 		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		pulseaudio? ( media-libs/libpulse )
 	)
+	sndio? ( media-sound/sndio:= )
 	vulkan? ( media-libs/vulkan-loader )
 	wayland? ( dev-libs/wayland )"
 DEPEND="
@@ -85,31 +91,40 @@ PATCHES=(
 	"${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=()
-		if use vulkan; then
-			EGIT_SUBMODULES+=(
-				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-				3rdparty/vulkan-headers # to keep in sync with glslang
-
-				# system rapidyaml is still used, but this uses another part
-				# of the source and so allow submodule for now
-				# 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
-
-				# 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
+		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
@@ -125,11 +140,8 @@ src_prepare() {
 	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
+	# 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}'"/' \
@@ -137,7 +149,10 @@ src_prepare() {
 
 		# delete all 3rdparty/* except known-used ones in non-live
 		local keep=(
-			cpuinfo glad imgui include jpgd lzma simpleini xbyak
+			# 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 \
@@ -169,6 +184,13 @@ src_configure() {
 		# (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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Andreas Sturmlechner]

commit:     62c8565b3ce460bc68dc3297a3822fa2a4bc7878
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 16:08:50 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 16:08:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c8565b

games-emulation/pcsx2: Drop MatchingGlobalUse "qt6"

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/pcsx2/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 40c13d5f12ff..e4c0e91aeda5 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="qt6">Add support for the Qt 6 application and UI framework</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>
 	<upstream>

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     ad8a136c6631b74af2276fd65abb67c7cfa1e41d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 05:21:04 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 05:24:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8a136c

games-emulation/pcsx2: update live

This was cleaned up upstream.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 36b8e5ccf0b7..e65ca9879371 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -84,7 +84,6 @@ 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-wx-vs-sdl.patch
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
 )
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     bde0ece4d5f3e2c232b65c478340da33bf7d4dcd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 12:37:41 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 12:53:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde0ece4

games-emulation/pcsx2: update live

This may be temporary going by upstream's commit message, so will have
a closer look when doing another nightly release.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index b5e09ffc395f..bbe944648d41 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -96,6 +96,13 @@ src_unpack() {
 			EGIT_SUBMODULES+=(
 				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
 				3rdparty/vulkan-headers # to keep in sync with glslang
+
+				# system rapidyaml is still used, but this uses another part
+				# of the source and so allow submodule for now
+				# 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
 			)
 		fi
 		git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     fc5fdfc8ba5d6e122b7598c68342d3f17a1e07c3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 03:57:12 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 03:58:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5fdfc8

games-emulation/pcsx2: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index e4673dc1422c..b5e09ffc395f 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	qt6? (
 		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
 		net-misc/curl
 	)
 	!qt6? (
@@ -121,8 +122,11 @@ src_prepare() {
 	# GS tests currently fail to build with qt6
 	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
 
-	# delete all 3rdparty/* except known-used ones in non-live
 	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')

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     fb473fc88f7710f84ffd948765a18ae8e1772ebc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 03:56:35 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 03:58:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb473fc8

games-emulation/pcsx2: set git tag for version display

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.3329.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
index e43b31a9499e..b5e09ffc395f 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -122,8 +122,11 @@ src_prepare() {
 	# GS tests currently fail to build with qt6
 	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
 
-	# delete all 3rdparty/* except known-used ones in non-live
 	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')

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     b3e61699fdd64ce2f88a8a1a0125087433b79c8e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 03:00:17 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 03:01:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e61699

games-emulation/pcsx2: rdepend on qtsvg:6 for icons

fwiw skipping revbump given short lived and qt6 is still masked.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.7.3329.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
index e4673dc1422c..e43b31a9499e 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	qt6? (
 		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
 		net-misc/curl
 	)
 	!qt6? (

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     93f2338a21aac12956e09a794d976b4cb5c32a4c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 22:58:57 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 00:27:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f2338a

games-emulation/pcsx2: sync live

See pcsx2-1.7.3329's commit for some details on changes.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 202 +++++++++++++++++++++++---------
 1 file changed, 146 insertions(+), 56 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 00afde986d44..e4673dc1422c 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,108 +1,198 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps git-r3 toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic wxwidgets
 
-DESCRIPTION="A PlayStation 2 emulator"
+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/"
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=(
-	3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-	3rdparty/imgui/imgui # not made to be system-wide
-	3rdparty/vulkan-headers # to keep in sync with glslang
-)
 
-LICENSE="GPL-3 Apache-2.0 OFL-1.1" # TODO: needs review for a full list
+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"
-KEYWORDS=""
-IUSE="pulseaudio test"
-
+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/glib:2
 	dev-libs/libaio
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
-	dev-libs/libxml2:2
 	dev-libs/libzip:=[zstd]
-	media-libs/alsa-lib
 	media-libs/cubeb
-	media-libs/freetype
+	media-libs/harfbuzz
 	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
-	media-libs/libsdl2[haptic,joystick,sound]
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
 	media-libs/libsoundtouch:=
 	net-libs/libpcap
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/libudev:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
 	x11-libs/libX11
-	x11-libs/libXext
 	x11-libs/libXrandr
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	pulseaudio? ( media-sound/pulseaudio )
-"
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		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"
-BDEPEND="test? ( dev-cpp/gtest )"
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	dev-lang/perl
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( sys-devel/gettext )"
 
 FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+	-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-clang16.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
 
-	# unbundle, use sed over patch for less chances to break -9999
-	# note: gentoo's zstd lacks a cmake module which upstream tries to use
-	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
-		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)\nalias_library(chdr-static PkgConfig::chdr)' \
-		-e '/system_library.*zstd/,/endif()/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)\nalias_library(Zstd::Zstd PkgConfig::zstd)' \
-		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
-		-i cmake/SearchForStuff.cmake || die
+	# 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
 
-	# pulseaudio is only used for usb-mic, not audio output
-	use pulseaudio || > 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
+
+	# delete all 3rdparty/* except known-used ones in non-live
+	if [[ ${PV} != 9999 ]]; then
+		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() {
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
+	use qt6 || setup-wxwidgets
+
+	# for bundled glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
 
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=FALSE
-		-DDISABLE_ADVANCE_SIMD=TRUE
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DDISABLE_SETCAP=TRUE
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DDISABLE_PCSX2_WRAPPER=yes
+		-DDISABLE_SETCAP=yes
 		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=TRUE
-		-DQT_BUILD=FALSE # TODO when qt6 is in tree
-		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
-		-DUSE_SYSTEM_LIBS=TRUE
-		-DUSE_VTUNE=FALSE
-		-DXDG_STD=TRUE
+		-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
 	)
 
-	setup-wxwidgets
 	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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[James Le Cuirot]

commit:     88ee248e77faf1ed9b00e4a6213b4534c3899107
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Aug 10 00:13:36 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 21:59:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ee248e

games-emulation/pcsx2: Remove outdated pkg_setup()

AFter removing -DARCH_FLAGS= and adding -DDISABLE_ADVANCE_SIMD=ON the
build system takes care of adding these required flags themselves.

Doing it in the ebuild is now redundant.

See: https://github.com/gentoo/gentoo/commit/4af9aade2199538e6ace3ec8d2d272cdfdb9edc6

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26800
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3885455b5d81..00afde986d44 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
+inherit cmake fcaps git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
@@ -65,14 +65,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
 )
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		append-flags -mxsave
-	fi
-}
-
 src_prepare() {
 	cmake_src_prepare
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     f77d7930a9bf7c0a53a01235807e9c76624f95c6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 21:02:32 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 21:03:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77d7930

games-emulation/pcsx2: add games@ as maintainer

Like many other emulators, and been handling this on the sides already.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 347ab91abc92..0d8f2efac4cd 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
 		<remote-id type="github">PCSX2/pcsx2</remote-id>

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     4d612b2c012fd7f16b31eb01492a7e31e1317922
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 06:25:42 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 25 06:43:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d612b2c

games-emulation/pcsx2: update live

Upstream added a generic function to ease unbundling which
has USE_SYSTEM_LIBS to enable all at once, but not everything
is covered yet (e.g. no cubeb/chdr/glslang).

Also switch to using aliases to have less files to modify.

I expect this to break again soon'ish as upstream continues
to work on this (please report or ping on IRC, I do not try
to build this often to check).

Closes: https://bugs.gentoo.org/847343
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 6ec992906f64..14345f880fa8 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -73,15 +73,12 @@ src_prepare() {
 	cmake_src_prepare
 
 	# unbundle, use sed over patch for less chances to break -9999
+	# note: gentoo's zstd lacks a cmake module which upstream tries to use
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
-		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
-		-e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \
-		-e '/add_subdir.*zstd/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)' \
+		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)\nalias_library(chdr-static PkgConfig::chdr)' \
+		-e '/system_library.*zstd/,/endif()/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)\nalias_library(Zstd::Zstd PkgConfig::zstd)' \
 		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
-	sed -e 's/chdr-static/PkgConfig::chdr/' \
-		-e 's/Zstd::Zstd/PkgConfig::zstd/' \
-		-i pcsx2/CMakeLists.txt || die
 
 	# pulseaudio is only used for usb-mic, not audio output
 	use pulseaudio || > cmake/FindPulseAudio.cmake || die
@@ -103,9 +100,9 @@ src_configure() {
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS=$(usex test)
 		-DPACKAGE_MODE=TRUE
-		-DQT_BUILD=FALSE # TODO
+		-DQT_BUILD=FALSE # TODO when qt6 is in tree
 		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
-		-DUSE_SYSTEM_YAML=TRUE
+		-DUSE_SYSTEM_LIBS=TRUE
 		-DUSE_VTUNE=FALSE
 		-DXDG_STD=TRUE
 	)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     e808632da1235b69f255a013bc21923ff8c064cd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 15:05:16 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu May 19 15:20:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e808632d

games-emulation/pcsx2: fix live unbundling, now does use zstd

Thanks-to: Samuel Bauer
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 0d816ee8c404..6ec992906f64 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -24,6 +24,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/xz-utils
+	app-arch/zstd:=
 	dev-cpp/rapidyaml:=
 	dev-libs/glib:2
 	dev-libs/libaio
@@ -72,14 +73,15 @@ src_prepare() {
 	cmake_src_prepare
 
 	# unbundle, use sed over patch for less chances to break -9999
-	# (zstd is only used by libzip, so can remove entirely)
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
 		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
 		-e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \
-		-e '/add_subdir.*zstd/d' \
+		-e '/add_subdir.*zstd/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)' \
 		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
-	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
+	sed -e 's/chdr-static/PkgConfig::chdr/' \
+		-e 's/Zstd::Zstd/PkgConfig::zstd/' \
+		-i pcsx2/CMakeLists.txt || die
 
 	# pulseaudio is only used for usb-mic, not audio output
 	use pulseaudio || > cmake/FindPulseAudio.cmake || die

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Sam James]

commit:     b29976518ce1e4693b08b0e45544e14f913ab6d3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 01:49:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 17 05:33:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2997651

games-emulation/pcsx2: [QA] drop (very) stale GCC version checks

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild | 4 +---
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
index 8a6662ae3aa4..763aa3e53529 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
@@ -53,9 +53,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		# -mxsave flag is needed when GCC >= 8.2 is used
 		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
+		append-flags -mxsave
 	fi
 }
 

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 8c462bcb79c6..0d816ee8c404 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -64,9 +64,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		# -mxsave flag is needed when GCC >= 8.2 is used
 		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
+		append-flags -mxsave
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     28a18e46865836f0f7ff7d1951625c74c97076c3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 05:48:45 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 05:58:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a18e46

games-emulation/pcsx2: update live, unbundle libzip[zstd]

It uses libzip for savestates and enables zstd when doing so.

Also adjust comments and explicitly disable QT_BUILD, mostly
as a reminder to do later when Qt6 is in the tree.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index bdd694c0a1c5..8c462bcb79c6 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
+	dev-libs/libzip:=[zstd]
 	media-libs/alsa-lib
 	media-libs/cubeb
 	media-libs/freetype
@@ -73,8 +74,11 @@ src_prepare() {
 	cmake_src_prepare
 
 	# unbundle, use sed over patch for less chances to break -9999
+	# (zstd is only used by libzip, so can remove entirely)
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
 		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
+		-e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \
+		-e '/add_subdir.*zstd/d' \
 		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
 	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
@@ -99,7 +103,8 @@ src_configure() {
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS=$(usex test)
 		-DPACKAGE_MODE=TRUE
-		-DSDL2_API=TRUE # uses SDL2 either way but option is needed if wxGTK[sdl]
+		-DQT_BUILD=FALSE # TODO
+		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
 		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
 		-DXDG_STD=TRUE

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     dac7013159c6d311379a5becb7040d72afb419ae
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 10:59:46 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 11:42:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac70131

games-emulation/pcsx2: drop 1.6.0-r2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 109 ----------------------------
 1 file changed, 109 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
deleted file mode 100644
index a9b0dc2b9ffb..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://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(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/libudev[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:3[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-setcap.patch"
-)
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
-	fi
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
-
-	# 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
-		-DDISABLE_SETCAP=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=TRUE
-		-DOPENCL_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
-		-DUSE_VTUNE=FALSE
-	)
-
-	setup-wxwidgets
-	cmake_src_configure
-}
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     10d36fa14ec205e5991456ca309f69d8058d2412
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 04:03:50 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 04:03:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d36fa1

games-emulation/pcsx2: stabilize 1.6.0-r3 for amd64, x86

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
index 1986a75b650e..8a6662ae3aa4 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     10f9fe1390f5f25e2ef68f44021259b231cc4518
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 19:26:15 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 19:33:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f9fe13

games-emulation/pcsx2: update live

Newly attempts to pass options to bundled subprojects but errors
out due to being unbundled.

Thanks-to: Samuel Bauer
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f5543f61bed1..bdd694c0a1c5 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -75,6 +75,7 @@ src_prepare() {
 	# unbundle, use sed over patch for less chances to break -9999
 	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
 		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
+		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
 		-i cmake/SearchForStuff.cmake || die
 	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     1f781826a1c70818ec1168862af737ef81c67bfd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 22:47:21 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 23:09:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f781826

games-emulation/pcsx2: drop passing unnecessary toolchain file

Undocumented not-for-ebuilds MYCMAKEARGS was used as a way to
replace the toolchain file, however Gentoo's is perfectly fine
here thanks to `multilib_toolchain_setup x86` setting this up.

Still revbump to ~arch as a precaution, but should be fine.

Could use some other fixups but ideal would be for a new release
(or maybe start looking into snapshots after upstream stops doing
major changes) to get rid of all this 32bit stuff.

Bug: https://bugs.gentoo.org/833100
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild | 103 ++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
new file mode 100644
index 000000000000..cc399bd2cc8a
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="https://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(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:3[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+FILECAPS=(
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-setcap.patch"
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		# -mxsave flag is needed when GCC >= 8.2 is used
+		# https://bugs.gentoo.org/685156
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
+	fi
+}
+
+src_configure() {
+	multilib_toolchain_setup x86
+	# Build with ld.gold fails
+	# https://github.com/PCSX2/pcsx2/issues/1671
+	tc-ld-disable-gold
+
+	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+	# if it something other than "Devel|Debug|Release"
+	local CMAKE_BUILD_TYPE="Release"
+
+	local mycmakeargs=(
+		-DARCH_FLAG=
+		-DDISABLE_BUILD_DATE=TRUE
+		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DDISABLE_SETCAP=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=TRUE
+		-DOPENCL_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
+	)
+
+	setup-wxwidgets
+	cmake_src_configure
+}
+
+src_install() {
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     fe1e9d63e138d4cf1bd4b6ae255c8f70805c9321
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 20:54:41 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 21:08:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1e9d63

games-emulation/pcsx2: fix build with wxGTK[sdl], adjust options

SDL2_API is essentially an unused option, but an old cmake check
still use it when it detects wxGTK was built with sdl support.

Also sorted options and removed CMAKE_LIBRARY_PATH as it does
not install plugins anymore.

Thanks-to: Jusef N.
Closes: https://github.com/gentoo/gentoo/pull/23989
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 98c547c226ce..f5543f61bed1 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -96,13 +96,12 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
-		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TESTS=$(usex test)
 		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DSDL2_API=TRUE # uses SDL2 either way but option is needed if wxGTK[sdl]
 		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
+		-DXDG_STD=TRUE
 	)
 
 	setup-wxwidgets

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     8275c2ddac7e1e12ebaaada06b8722ebb127e8db
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 21:08:03 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 21:16:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8275c2dd

games-emulation/pcsx2: update live

Meant to unbundle these + add IUSE=vulkan, but it uses an header
that's not normally installed by system glslang. May be better to
wait and see before doing more given this is all very new.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 98a12b52d531..98c547c226ce 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,7 +9,11 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=( 3rdparty/imgui/imgui )
+EGIT_SUBMODULES=(
+	3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
+	3rdparty/imgui/imgui # not made to be system-wide
+	3rdparty/vulkan-headers # to keep in sync with glslang
+)
 
 LICENSE="GPL-3 Apache-2.0 OFL-1.1" # TODO: needs review for a full list
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Michał Górny]

commit:     ae06c3c92830a8708c88f7091a9b4a42014f6d92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  6 19:07:44 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 20:52:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae06c3c9

games-emulation/pcsx2: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 112 ----------------------------
 1 file changed, 112 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
deleted file mode 100644
index 7bdeda838f0d..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://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(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/libudev[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:3[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-FILECAPS=(
-	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-setcap.patch"
-)
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
-	fi
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
-
-	# 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
-		-DDISABLE_SETCAP=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=TRUE
-		-DOPENCL_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
-		-DUSE_VTUNE=FALSE
-	)
-
-	setup-wxwidgets
-	cmake_src_configure
-}
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Agostino Sarubbo]

commit:     e5e6184474b4f35748582a184c1838b1e7afbb0e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  6 15:02:08 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 15:02:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e61844

games-emulation/pcsx2: x86 stable wrt bug #828358

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index 36422246430f..a9b0dc2b9ffb 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     abd16ff756bf379588199276c605bd88c1a4630f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  5 22:47:25 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan  5 23:09:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd16ff7

games-emulation/pcsx2: update live for imgui

Enable submodule as it doesn't have its own build system nor
cmake/pkgconfig files for detection, so unbundling doesn't
seem viable (maybe if more packages come to need this).

Also cleanup removed SDL2_API option, and add extra licenses
for installed fonts.

Should be possible to remove freetype dependency (and a few
others) but build system isn't entirely cleared of these yet.
Leave alone in -9999 for now as it's rapidly changing.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 2df1c8c2ebc9..98a12b52d531 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,9 +9,9 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=()
+EGIT_SUBMODULES=( 3rdparty/imgui/imgui )
 
-LICENSE="GPL-3"
+LICENSE="GPL-3 Apache-2.0 OFL-1.1" # TODO: needs review for a full list
 SLOT="0"
 KEYWORDS=""
 IUSE="pulseaudio test"
@@ -42,6 +42,7 @@ RDEPEND="
 	x11-libs/libICE
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXrandr
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	pulseaudio? ( media-sound/pulseaudio )
 "
@@ -96,8 +97,6 @@ src_configure() {
 		-DXDG_STD=TRUE
 
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
 		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
 	)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Sam James]

commit:     258dfb878744489122d34388f315893feea7ba1d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  2 05:51:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 05:51:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258dfb87

games-emulation/pcsx2: Stabilize 1.6.0-r2 amd64, #828358

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index a358ecfb9dae..36422246430f 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     44e830cfcd062429cd2a99f008e3020de14bd166
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 20:27:41 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 20:41:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e830cf

games-emulation/pcsx2: unbundle cubeb+libchdr, make pulse optional

Optimally be nice to get these handled upstream, but just
a rough sed for now.

cubeb seems to work well from a quick try.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index c80113c34e62..2df1c8c2ebc9 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,16 +9,12 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=(
-	# TODO: unbundle
-	3rdparty/cubeb/cubeb
-	3rdparty/libchdr/libchdr
-)
+EGIT_SUBMODULES=()
 
-LICENSE="GPL-3 BSD ISC"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="pulseaudio test"
 
 RESTRICT="!test? ( test )"
 
@@ -27,16 +23,17 @@ RDEPEND="
 	dev-cpp/rapidyaml:=
 	dev-libs/glib:2
 	dev-libs/libaio
+	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
+	media-libs/cubeb
 	media-libs/freetype
 	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
 	media-libs/libsdl2[haptic,joystick,sound]
 	media-libs/libsoundtouch:=
-	media-sound/pulseaudio
 	net-libs/libpcap
 	sys-libs/zlib
 	virtual/libudev:=
@@ -46,6 +43,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	pulseaudio? ( media-sound/pulseaudio )
 "
 DEPEND="
 	${RDEPEND}
@@ -66,6 +64,19 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	cmake_src_prepare
+
+	# unbundle, use sed over patch for less chances to break -9999
+	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
+		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \
+		-i cmake/SearchForStuff.cmake || die
+	sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die
+
+	# pulseaudio is only used for usb-mic, not audio output
+	use pulseaudio || > cmake/FindPulseAudio.cmake || die
+}
+
 src_configure() {
 	# Build with ld.gold fails
 	# https://github.com/PCSX2/pcsx2/issues/1671

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     20799a02b1ce02cd457cda4463c0bc5592d89d64
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 05:21:12 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 08:13:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20799a02

games-emulation/pcsx2: update live ebuild

ebuild could use more attention before an eventual release (unbundling,
re-checking options/deps, wayland, making tests run), but this is just
quickfixes to at least let it build.

Two new dependencies:
* rapidyaml(new package): replaces yaml-cpp
* cubeb(submodule): replaces portaudio
pcsx2 isn't currently wired to use system's cubeb and it also isn't
packaged, so use submodule for now -- but it'd be good to package it
eventually given other packages like yuzu (which could be nice to have
in ::gentoo eventually) can use it as well. An ebuild would also help
for more proper backend support, but for now hard depend on pulseaudio
given it's the only one it links with. The cubeb introduction in PCSX2
is very recent so it may also be good to wait and see.

Also update licenses for cubeb(ISC) and libchdr(BSD).

/usr/bin/PCSX2 was also renamed to pcsx2, update ebuild to match.
Removed QA_* instead of updating them given the messages do not
seem to trigger anymore.

Runtime wasn't really tested, could be issues -- but it'd be expected
with upstream changing things around.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 40 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 6c56bf44c0de..c80113c34e62 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,9 +9,13 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=( 3rdparty/libchdr/libchdr )
+EGIT_SUBMODULES=(
+	# TODO: unbundle
+	3rdparty/cubeb/cubeb
+	3rdparty/libchdr/libchdr
+)
 
-LICENSE="GPL-3"
+LICENSE="GPL-3 BSD ISC"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
@@ -19,33 +23,37 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/bzip2
 	app-arch/xz-utils
-	dev-cpp/yaml-cpp:=
+	dev-cpp/rapidyaml:=
+	dev-libs/glib:2
 	dev-libs/libaio
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
+	media-libs/freetype
+	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
 	media-libs/libsdl2[haptic,joystick,sound]
-	media-libs/libsoundtouch
-	media-libs/portaudio
+	media-libs/libsoundtouch:=
+	media-sound/pulseaudio
 	net-libs/libpcap
 	sys-libs/zlib
-	virtual/libudev
-	virtual/opengl
+	virtual/libudev:=
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/libICE
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
 )
 
 pkg_setup() {
@@ -73,7 +81,6 @@ src_configure() {
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS="$(usex test)"
-		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
@@ -87,12 +94,3 @@ src_configure() {
 	setup-wxwidgets
 	cmake_src_configure
 }
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/PCSX2/* usr/bin/PCSX2"
-	cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Ionen Wolkens]

commit:     edd8cb31db21dd4335c13b1b68920864ccd702e9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 21:15:28 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 21:22:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd8cb31

games-emulation/pcsx2: use shared=off to fix live build

It's not installed libraries.

Closes: https://bugs.gentoo.org/809614
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index acc1b5e7b76..6c56bf44c0d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -68,6 +68,7 @@ src_configure() {
 	local CMAKE_BUILD_TYPE="Release"
 	local mycmakeargs=(
 		-DARCH_FLAG=
+		-DBUILD_SHARED_LIBS=FALSE
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Sam James]

commit:     64f20699d4506e962ad688e43c823fb48392c1c3
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Fri Apr  9 17:03:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 04:24:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f20699

games-emulation/pcsx2: update to match upstream changes

Closes: https://bugs.gentoo.org/778362
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/20313
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 6fd902402b8..acc1b5e7b76 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=()
+EGIT_SUBMODULES=( 3rdparty/libchdr/libchdr )
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -23,7 +23,7 @@ RDEPEND="
 	app-arch/xz-utils
 	dev-cpp/yaml-cpp:=
 	dev-libs/libaio
-	dev-libs/libfmt:=
+	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
 	media-libs/libpng:=
@@ -71,6 +71,7 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
+		-DENABLE_TESTS="$(usex test)"
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[David Seifert]

commit:     03215998f924c0d6cf72a79bc70d0b21b48e6844
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 22:26:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 22:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03215998

games-emulation/pcsx2: Set WX_GTK_VER before inherit

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 8 +++++---
 games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 8 +++++---
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 5 +++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index c5dffc68389..7bdeda838f0 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_/-}"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
-	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
@@ -96,7 +98,7 @@ src_configure() {
 		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	setup-wxwidgets
 	cmake_src_configure
 }
 

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index d394535a100..a358ecfb9da 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_/-}"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
-	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+	x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}"
 
@@ -93,7 +95,7 @@ src_configure() {
 		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	setup-wxwidgets
 	cmake_src_configure
 }
 

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1555b343b49..6fd902402b8 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
@@ -38,7 +39,7 @@ RDEPEND="
 	x11-libs/libICE
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/wxGTK:3.0-gtk3[X]
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
@@ -81,7 +82,7 @@ src_configure() {
 		-DUSE_VTUNE=FALSE
 	)
 
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	setup-wxwidgets
 	cmake_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     33307a72972b7e5a0191ef291f72eb7490c7fa47
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Feb 25 14:38:04 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 08:25:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33307a72

games-emulation/pcsx2: drop unused dependencies

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../{pcsx2-9999.ebuild => pcsx2-1.6.0-r2.ebuild}   | 79 ++++++++++++----------
 games-emulation/pcsx2/pcsx2-9999.ebuild            |  5 +-
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
similarity index 50%
copy from games-emulation/pcsx2/pcsx2-9999.ebuild
copy to games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index b1c9556114d..39f1ff3ec9e 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -2,54 +2,50 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+MY_PV="${PV/_/-}"
 
-inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=()
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-RESTRICT="!test? ( test )"
+KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-cpp/yaml-cpp:=
-	dev-libs/libaio
-	dev-libs/libfmt:=
-	dev-libs/libxml2:2
-	media-libs/alsa-lib
-	media-libs/libpng:=
-	media-libs/libsamplerate
-	media-libs/libsdl2[haptic,joystick,sound]
-	media-libs/libsoundtouch
-	media-libs/portaudio
-	net-libs/libpcap
-	sys-libs/zlib
-	virtual/libudev
-	virtual/opengl
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/wxGTK:3.0-gtk3[X]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
+	app-arch/bzip2[abi_x86_32(-)]
+	app-arch/xz-utils[abi_x86_32(-)]
+	dev-libs/libaio[abi_x86_32(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:3[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.4-r301:3.0-gtk3[abi_x86_32(-),X]
 "
-BDEPEND="test? ( dev-cpp/gtest )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 FILECAPS=(
 	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-disable-setcap.patch"
+)
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		# -mxsave flag is needed when GCC >= 8.2 is used
@@ -61,6 +57,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	# Build with ld.gold fails
 	# https://github.com/PCSX2/pcsx2/issues/1671
 	tc-ld-disable-gold
@@ -68,19 +65,31 @@ src_configure() {
 	# 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
 		-DDISABLE_SETCAP=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=TRUE
+		-DOPENCL_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
-		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
 	)
 
@@ -93,6 +102,6 @@ src_install() {
 	#  https://github.com/PCSX2/pcsx2/issues/417
 	#  https://github.com/PCSX2/pcsx2/issues/3077
 	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/PCSX2/* usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
 	cmake_src_install
 }

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index b1c9556114d..5f738f270f9 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -40,10 +40,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/wxGTK:3.0-gtk3[X]
 "
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
-"
+DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     e43dde232ea4d5fb3392d17614b942e7c82f64c1
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Feb 25 14:39:15 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 08:25:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43dde23

games-emulation/pcsx2: do not set suid with USE=-filecaps

Closes: https://bugs.gentoo.org/771795
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/19649
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index 39f1ff3ec9e..d394535a100 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 FILECAPS=(
-	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
 )
 
 PATCHES=(

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 5f738f270f9..1555b343b49 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
-	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     be3305b87e1c74bb5b56ebbe603a94f8f76be032
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Feb 25 14:57:23 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 08:25:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3305b8

games-emulation/pcsx2: drop unused EXTRA_PLUGINS cmake option on 9999

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 91117108c37..b1c9556114d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -73,7 +73,6 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
-		-DEXTRA_PLUGINS=FALSE
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Michał Górny]

commit:     a51108f95730fca06767ad51cda5a27302c5e472
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 08:31:18 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 10:10:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51108f9

games-emulation/pcsx2: Update HOMEPAGE

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index 2146346a3b6..c5dffc68389 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -7,7 +7,7 @@ MY_PV="${PV/_/-}"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
+HOMEPAGE="https://pcsx2.net/"
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 0430a248168..91117108c37 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
+HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
 EGIT_SUBMODULES=()
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Sam James]

commit:     90a4df53c0ec4810f761a7bf0bf27dd2255f593a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 01:25:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 01:25:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a4df53

games-emulation/pcsx2: Stabilize 1.6.0-r1 amd64, #769593

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index 595b6a12632..2146346a3b6 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Thomas Deutschmann]

commit:     5b567f15006d70684975ed29f1bb5570154a3340
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 20:11:09 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 20:12:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b567f15

games-emulation/pcsx2: x86 stable (bug #769593)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index 0333043f873..595b6a12632 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     148353de27ca857649ed6d6488bd4b83d10587f0
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 08:16:55 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 08:44:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148353de

games-emulation/pcsx2: add missing test dep on -9999

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 9612469e095..0430a248168 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -13,6 +13,9 @@ EGIT_SUBMODULES=()
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/bzip2
@@ -41,6 +44,7 @@ DEPEND="${RDEPEND}
 	dev-cpp/pngpp
 	dev-cpp/sparsehash
 "
+BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
 	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     7e3c77ade9e7d31ee2485f58877a42d06fc0d7cd
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 08:16:17 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 08:44:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3c77ad

games-emulation/pcsx2: add missing dependency on -9999

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 192f835dfe6..9612469e095 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
 	media-libs/libpng:=
+	media-libs/libsamplerate
 	media-libs/libsdl2[haptic,joystick,sound]
 	media-libs/libsoundtouch
 	media-libs/portaudio

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     2fb6595fb15e93b8c04a59034a27d517fcde3030
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Fri Jan  8 11:07:20 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 08:44:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb6595f

games-emulation/pcsx2: switch to native build on amd64

Closes: https://bugs.gentoo.org/740250
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Co-authored-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18931
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 51 ++++++++++++++-------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index c6a8c52c162..192f835dfe6 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake fcaps flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -13,29 +13,28 @@ EGIT_SUBMODULES=()
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
 RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-cpp/yaml-cpp:=[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	dev-libs/libfmt:=[abi_x86_32(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/libudev[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:3[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-gtk3[abi_x86_32(-),X]
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-cpp/yaml-cpp:=
+	dev-libs/libaio
+	dev-libs/libfmt:=
+	dev-libs/libxml2:2
+	media-libs/alsa-lib
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick,sound]
+	media-libs/libsoundtouch
+	media-libs/portaudio
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libudev
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/wxGTK:3.0-gtk3[X]
 "
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
@@ -57,7 +56,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	multilib_toolchain_setup x86
 	# Build with ld.gold fails
 	# https://github.com/PCSX2/pcsx2/issues/1671
 	tc-ld-disable-gold
@@ -65,13 +63,6 @@ src_configure() {
 	# 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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     184059373078ce9051f344fecacd2e7697c4c399
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sun Jan  3 16:42:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 08:44:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18405937

games-emulation/pcsx2: update to match upstream changes

Closes: https://bugs.gentoo.org/762157
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 764020699ad..c6a8c52c162 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ IUSE=""
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
 	app-arch/xz-utils[abi_x86_32(-)]
+	dev-cpp/yaml-cpp:=[abi_x86_32(-)]
 	dev-libs/libaio[abi_x86_32(-)]
 	dev-libs/libfmt:=[abi_x86_32(-)]
 	dev-libs/libxml2:2[abi_x86_32(-)]
@@ -34,7 +35,7 @@ RDEPEND="
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
-	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+	x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
@@ -82,11 +83,9 @@ src_configure() {
 		-DXDG_STD=TRUE
 
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DGTK3_API=TRUE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
+		-DUSE_SYSTEM_YAML=TRUE
 		-DUSE_VTUNE=FALSE
 	)
 
@@ -99,6 +98,6 @@ src_install() {
 	#  https://github.com/PCSX2/pcsx2/issues/417
 	#  https://github.com/PCSX2/pcsx2/issues/3077
 	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/PCSX2/* usr/bin/PCSX2"
 	cmake_src_install
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Patrice Clement]

commit:     4a5a35dbff21c977c55b60b2137aaf793055a5fa
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Tue Nov 10 09:42:31 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 21:27:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5a35db

games-emulation/pcsx2: update live version to match upstream changes.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/18210
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3de99b80312..764020699ad 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
+EGIT_SUBMODULES=()
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -18,6 +19,7 @@ RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
 	app-arch/xz-utils[abi_x86_32(-)]
 	dev-libs/libaio[abi_x86_32(-)]
+	dev-libs/libfmt:=[abi_x86_32(-)]
 	dev-libs/libxml2:2[abi_x86_32(-)]
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/libpng:=[abi_x86_32(-)]
@@ -39,6 +41,10 @@ DEPEND="${RDEPEND}
 	dev-cpp/sparsehash
 "
 
+FILECAPS=(
+	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+)
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		# -mxsave flag is needed when GCC >= 8.2 is used
@@ -69,6 +75,7 @@ src_configure() {
 		-DARCH_FLAG=
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DDISABLE_SETCAP=TRUE
 		-DEXTRA_PLUGINS=FALSE
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
@@ -76,9 +83,7 @@ src_configure() {
 
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DEGL_API=FALSE
 		-DGTK3_API=TRUE
-		-DOPENCL_API=FALSE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     c1fdef8c9edcfa255d536c4c59a6eb2f56115297
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sat Oct 24 14:45:05 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 07:35:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fdef8c

games-emulation/pcsx2: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/18022
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0.ebuild | 101 -------------------------------
 1 file changed, 101 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
deleted file mode 100644
index b264a1d56a5..00000000000
--- a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
+++ /dev/null
@@ -1,101 +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 flag-o-matic multilib toolchain-funcs 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(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/libudev[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:3[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.4-r301:3.0-gtk3[abi_x86_32(-),X]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
-	fi
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
-
-	# 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=TRUE
-		-DOPENCL_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
-		-DUSE_VTUNE=FALSE
-	)
-
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
-	cmake_src_configure
-}
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Matt Turner]

commit:     d7efb1e817116aff6601895c819318f696385f1c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 23:05:23 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:24:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7efb1e8

games-emulation/pcsx2: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild | 108 ----------------------------
 1 file changed, 108 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
deleted file mode 100644
index 09a4415c3fa..00000000000
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
-MY_PV="${PV/_/-}"
-
-inherit cmake-utils l10n multilib toolchain-funcs 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"
-IUSE=""
-
-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-1.2.4[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]
-"
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
-	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-xgetbv.patch
-)
-
-clean_locale() {
-	rm -R "${S}"/locales/"${1}" || die
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
-			die "${PN} does not compile with gcc less than 4.8"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do clean_locale
-}
-
-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" need-wxwidgets unicode
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
-	cmake-utils_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Andreas Sturmlechner]

commit:     f9d61b4710ae85510401fcb8d85871ec91e4c103
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 23 16:09:13 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 24 15:41:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d61b47

games-emulation/pcsx2: add missing flag-o-matic inherit

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15930
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
index e6691265aa2..b264a1d56a5 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 MY_PV="${PV/_/-}"
 
-inherit cmake multilib toolchain-funcs wxwidgets
+inherit cmake flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 85ff7e5fe0f..3de99b80312 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     360965ce575b94e63e59d0b530468c135e5c85ba
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Fri May  8 08:24:45 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:41:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360965ce

games-emulation/pcsx2: disable gold linker for -9999

See-Also: https://github.com/PCSX2/pcsx2/issues/1671
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/15710
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 0f0a49453d1..85ff7e5fe0f 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
 	x11-libs/libXext[abi_x86_32(-)]
 	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
 "
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
 	dev-cpp/pngpp
 	dev-cpp/sparsehash
@@ -52,6 +51,9 @@ pkg_setup() {
 
 src_configure() {
 	multilib_toolchain_setup x86
+	# Build with ld.gold fails
+	# https://github.com/PCSX2/pcsx2/issues/1671
+	tc-ld-disable-gold
 
 	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
 	# if it something other than "Devel|Debug|Release"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     6cc4f0535c328061e134d740164849c7c9410c84
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sun May 17 08:59:15 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:41:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc4f053

games-emulation/pcsx2: drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |  1 -
 games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild | 99 -----------------------------
 2 files changed, 100 deletions(-)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index e31c9cbc2d7..15e66eee855 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,3 +1,2 @@
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
-DIST pcsx2-1.6.0_rc.tar.gz 17914747 BLAKE2B e088997a7dc8632070f6bcb70defe0ea226fe250bcefd76ab7499d765ba38e7c249fa4e7048815c173fb2e529ef9cd7e139e03b5a178e5dbcaacab6442bb5517 SHA512 41da55efe0652dc2494c7266375a00f7942f45cfbc2602ab981739102876781c474e54758a9c556f189f7b2e34c81fd1f027cfbc4033fb3b817d63387a9c9db3
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
deleted file mode 100644
index 58e7478a41b..00000000000
--- a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
+++ /dev/null
@@ -1,99 +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 toolchain-funcs 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(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	virtual/libudev[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:3[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.4-r301:3.0-gtk3[abi_x86_32(-),X]
-"
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
-	fi
-}
-
-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=TRUE
-		-DOPENCL_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
-		-DUSE_VTUNE=FALSE
-	)
-
-	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
-	cmake_src_configure
-}
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-	cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     6f8e98f277d07ebe527624ac3624db81d03fdcd5
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Fri May  8 08:23:00 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:41:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8e98f2

games-emulation/pcsx2: version bump to 1.6.0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/Manifest           |   1 +
 games-emulation/pcsx2/pcsx2-1.6.0.ebuild | 101 +++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ec8552bfec1..e31c9cbc2d7 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,2 +1,3 @@
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
 DIST pcsx2-1.6.0_rc.tar.gz 17914747 BLAKE2B e088997a7dc8632070f6bcb70defe0ea226fe250bcefd76ab7499d765ba38e7c249fa4e7048815c173fb2e529ef9cd7e139e03b5a178e5dbcaacab6442bb5517 SHA512 41da55efe0652dc2494c7266375a00f7942f45cfbc2602ab981739102876781c474e54758a9c556f189f7b2e34c81fd1f027cfbc4033fb3b817d63387a9c9db3
+DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
new file mode 100644
index 00000000000..e6691265aa2
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake multilib toolchain-funcs 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(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:3[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.4-r301:3.0-gtk3[abi_x86_32(-),X]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pngpp
+	dev-cpp/sparsehash
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		# -mxsave flag is needed when GCC >= 8.2 is used
+		# https://bugs.gentoo.org/685156
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
+	fi
+}
+
+src_configure() {
+	multilib_toolchain_setup x86
+	# Build with ld.gold fails
+	# https://github.com/PCSX2/pcsx2/issues/1671
+	tc-ld-disable-gold
+
+	# 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=TRUE
+		-DOPENCL_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
+	)
+
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	cmake_src_configure
+}
+
+src_install() {
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Agostino Sarubbo]

commit:     5f795aac35c83a6ffa3921eea06f7e3aacbc0b51
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:39:22 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:39:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f795aac

games-emulation/pcsx2: x86 stable wrt bug #712370

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index 67dd5e6ad8a..fc48152454b 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Agostino Sarubbo]

commit:     52a8263f43e0ce99c334c4121823947b94e7669f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 11:45:27 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 11:45:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a8263f

games-emulation/pcsx2: amd64 stable wrt bug #712370

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index 23f15b711cb..67dd5e6ad8a 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     c95b0e6bc129e31fe6df66e70a0d131b2496f771
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Mon Mar  9 15:20:59 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 12:06:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95b0e6b

games-emulation/pcsx2-9999: explicitly disable opencl and vtune

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/14900
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 3d4ef37cb3a..0f0a49453d1 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -76,9 +76,11 @@ src_configure() {
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
 		-DGTK3_API=TRUE
+		-DOPENCL_API=FALSE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
 	)
 
 	WX_GTK_VER="3.0-gtk3" setup-wxwidgets

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     374226702cb0c2959056cc493cdb90e3da009714
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Mon Mar  9 15:19:57 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 12:06:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37422670

games-emulation/pcsx2: version bump to 1.6.0-rc

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/Manifest              |  1 +
 games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild | 99 +++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d6e6fc1a539..ec8552bfec1 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,2 @@
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
+DIST pcsx2-1.6.0_rc.tar.gz 17914747 BLAKE2B e088997a7dc8632070f6bcb70defe0ea226fe250bcefd76ab7499d765ba38e7c249fa4e7048815c173fb2e529ef9cd7e139e03b5a178e5dbcaacab6442bb5517 SHA512 41da55efe0652dc2494c7266375a00f7942f45cfbc2602ab981739102876781c474e54758a9c556f189f7b2e34c81fd1f027cfbc4033fb3b817d63387a9c9db3

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
new file mode 100644
index 00000000000..58e7478a41b
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.6.0_rc.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake multilib toolchain-funcs 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(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:3[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.4-r301:3.0-gtk3[abi_x86_32(-),X]
+"
+# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
+DEPEND="${RDEPEND}
+	dev-cpp/pngpp
+	dev-cpp/sparsehash
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		# -mxsave flag is needed when GCC >= 8.2 is used
+		# https://bugs.gentoo.org/685156
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
+	fi
+}
+
+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=TRUE
+		-DOPENCL_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
+	)
+
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	cmake_src_configure
+}
+
+src_install() {
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[David Seifert]

commit:     a383af6a8ae5e3f2e30aa592655e7c4b9962a2e6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 17:05:25 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 17:05:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a383af6a

games-emulation/pcsx2: [QA] Remove unnecessary -DCMAKE_INSTALL_PREFIX arguments

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild | 1 -
 games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild | 1 -
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
index 0ddc30dd7ba..1d948bfb065 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
@@ -86,7 +86,6 @@ src_configure() {
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index 11e3f7bd7c9..f4c574ef75a 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -65,7 +65,6 @@ src_configure() {
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f5e4931ead1..24784ff6467 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -72,7 +72,6 @@ src_configure() {
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     a61920a613743a40d9bfe6f6285b7d59b5fdc521
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Fri Oct 11 16:03:28 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 05:22:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61920a6

games-emulation/pcsx2: fix dependencies on -9999

1. Don't block recent x11-libs/wxGTK[sdl]
2. Depend on x11-libs/gtk+:3

Closes: https://bugs.gentoo.org/696866
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/13258
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 9e646daf585..c0a277f41a0 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -28,11 +28,11 @@ RDEPEND="
 	sys-libs/zlib[abi_x86_32(-)]
 	virtual/libudev[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:2[abi_x86_32(-)]
+	x11-libs/gtk+:3[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-gtk3[abi_x86_32(-),-sdl,X]
+	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
 "
 # Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     57b4a9d03988ca21db72dab9b524aec96f18504a
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Tue Aug 27 11:03:52 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 15:54:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b4a9d0

games-emulation/pcsx2: ebuild enhancements.

Closes: https://bugs.gentoo.org/692208

Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/12798
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../{pcsx2-9999.ebuild => pcsx2-1.4.0-r2.ebuild}   | 45 +++++++++-------------
 games-emulation/pcsx2/pcsx2-9999.ebuild            | 22 +++++------
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
similarity index 64%
copy from games-emulation/pcsx2/pcsx2-9999.ebuild
copy to games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index f79952eccb6..d31cad3370a 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -1,55 +1,47 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+MY_PV="${PV/_/-}"
 
-inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake-utils multilib wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
 	app-arch/xz-utils[abi_x86_32(-)]
 	dev-libs/libaio[abi_x86_32(-)]
-	dev-libs/libxml2:2[abi_x86_32(-)]
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsdl[abi_x86_32(-),joystick,sound]
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
-	net-libs/libpcap[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/libudev[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(-),-sdl,X]
+	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
 "
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
 	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
+	dev-cpp/sparsehash
 "
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		# -mxsave flag is needed when GCC >= 8.2 is used
-		# https://bugs.gentoo.org/685156
-		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
-			append-flags -mxsave
-		fi
-	fi
-}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-xgetbv.patch
+)
 
 src_configure() {
 	multilib_toolchain_setup x86
@@ -80,17 +72,16 @@ src_configure() {
 		-DGTK3_API=FALSE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
+		-DSDL2_API=FALSE
 		-DWX28_API=FALSE
 	)
 
-	WX_GTK_VER="3.0" need-wxwidgets unicode
+	WX_GTK_VER="3.0" setup-wxwidgets
 	cmake-utils_src_configure
 }
 
 src_install() {
 	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
 	cmake-utils_src_install
 }

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f79952eccb6..9e646daf585 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
 
@@ -25,20 +25,19 @@ RDEPEND="
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	net-libs/libpcap[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
 	virtual/libudev[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(-),-sdl,X]
+	x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),-sdl,X]
 "
 # Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
 	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
+	dev-cpp/sparsehash
 "
 
 pkg_setup() {
@@ -77,20 +76,21 @@ src_configure() {
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
+		-DGTK3_API=TRUE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
-		-DWX28_API=FALSE
 	)
 
-	WX_GTK_VER="3.0" need-wxwidgets unicode
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
 	cmake-utils_src_configure
 }
 
 src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
 	cmake-utils_src_install
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     21bbe718f0351390f638220b40e1090b669c3b65
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 13:50:39 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 13:50:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bbe718

games-emulation/pcsx2: add missing slot for libxml2 on -9999

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 8f76b115aca..f79952eccb6 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
 	app-arch/xz-utils[abi_x86_32(-)]
 	dev-libs/libaio[abi_x86_32(-)]
-	dev-libs/libxml2[abi_x86_32(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/libpng:=[abi_x86_32(-)]
 	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Joonas Niilola]

commit:     3f0762336f75db97453e6221e0df7a53cfd2565b
Author:     Ilya Trukhanov <lahvuun <AT> gmail <DOT> com>
AuthorDate: Mon Jul 22 17:22:37 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 13:47:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f076233

games-emulation/pcsx2: add libxml2 and libpcap dependencies

Required for Linux networking support since:
https://github.com/PCSX2/pcsx2/commit/da1eb056a395e32b20f3ff26e5b12632492f2821

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ilya Trukhanov <lahvuun <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12514
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 78e81473e33..8f76b115aca 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -18,11 +18,13 @@ RDEPEND="
 	app-arch/bzip2[abi_x86_32(-)]
 	app-arch/xz-utils[abi_x86_32(-)]
 	dev-libs/libaio[abi_x86_32(-)]
+	dev-libs/libxml2[abi_x86_32(-)]
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/libpng:=[abi_x86_32(-)]
 	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
 	virtual/libudev[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[David Seifert]

commit:     dee141e3e2daa619de3ccf981101ba47e8a1cadb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 20:23:10 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 26 20:23:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee141e3

games-emulation/pcsx2: [QA] Remove unused virtual/jpeg dependency

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-emulation/pcsx2/{pcsx2-1.4.0.ebuild => pcsx2-1.4.0-r1.ebuild} | 3 +--
 games-emulation/pcsx2/pcsx2-9999.ebuild                             | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
similarity index 97%
rename from games-emulation/pcsx2/pcsx2-1.4.0.ebuild
rename to games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
index ac18cbd565e..0ddc30dd7ba 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,6 @@ RDEPEND="
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/gtk+:2[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 5526d71d9d2..78e81473e33 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -24,7 +24,6 @@ RDEPEND="
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
 	virtual/libudev[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/gtk+:2[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Andreas Sturmlechner]

commit:     d102ca15be045ed97a4d91783c8a261ba363c104
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Mon May  6 11:34:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May  8 17:03:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d102ca15

games-emulation/pcsx2: append -mxsave compiler flag with gcc >= 8.2

Closes: https://bugs.gentoo.org/685156
Closes: https://github.com/gentoo/gentoo/pull/11915

Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/11915
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 8a2a3fc4c02..f287474f505 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,12 @@ pkg_setup() {
 		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
 			die "${PN} does not compile with gcc less than 4.8"
 		fi
+
+		# -mxsave flag is needed when GCC >= 8.2 is used
+		# https://bugs.gentoo.org/685156
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Andreas Sturmlechner]

commit:     43f4fcf7220a6525b517454af455d9512b356fde
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Mon May  6 14:25:24 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May  8 17:03:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f4fcf7

games-emulation/pcsx2: drop check for old gcc version

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f287474f505..5526d71d9d2 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -42,10 +42,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
-			die "${PN} does not compile with gcc less than 4.8"
-		fi
-
 		# -mxsave flag is needed when GCC >= 8.2 is used
 		# https://bugs.gentoo.org/685156
 		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Michał Górny]

commit:     63f72d4c5ec950a080be28f51dee984844b1bf2e
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Oct 25 18:53:03 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 08:03:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f72d4c

games-emulation/pcsx2: update live ebuild.

1. EAPI version bump.
2. Added virtual/libudev dependency.
3. Dropped l10n.eclass

Closes: https://bugs.gentoo.org/669398
Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/10229
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1ab14376a93..8a2a3fc4c02 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
+EAPI=6
 
-inherit cmake-utils git-r3 l10n multilib toolchain-funcs wxwidgets
+inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -26,6 +25,7 @@ RDEPEND="
 	media-libs/portaudio[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
 	virtual/jpeg:62[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/gtk+:2[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
@@ -40,10 +40,6 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/sparsehash-1.5
 "
 
-clean_locale() {
-	rm -R "${S}"/locales/"${1}" || die
-}
-
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
 		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
@@ -52,11 +48,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do clean_locale
-}
-
 src_configure() {
 	multilib_toolchain_setup x86
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Michael Palimaka]

commit:     cef1f3b1fcc32ebab39054aa5752a15a63063002
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Thu Nov  2 17:25:49 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 07:12:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef1f3b1

games-emulation/pcsx2: require libsdl[haptic] for onepad plugin.

Thanks to Bernard Cafarelli for hint.

 games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1c8978c8bad..1ab14376a93 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-libs/libaio[abi_x86_32(-)]
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),joystick,sound]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Michał Górny]

commit:     28dcfba3c4f4150bb33f6467ce4c0f75674a5d84
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 16:16:00 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 09:38:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28dcfba3

games-emulation/pcsx2: use HTTPS for GitHub and HOMEPAGE

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 2 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild  | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index efeb3022163..cfd1606f91a 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -8,7 +8,7 @@ MY_PV="${PV/_/-}"
 inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="http://www.pcsx2.net"
+HOMEPAGE="https://www.pcsx2.net"
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index a80184b7aa8..1c8978c8bad 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,11 +7,8 @@ PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_J
 inherit cmake-utils git-r3 l10n multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="http://www.pcsx2.net"
-EGIT_REPO_URI=(
-	"https://github.com/PCSX2/pcsx2.git"
-	"git://github.com/PCSX2/pcsx2.git"
-)
+HOMEPAGE="https://www.pcsx2.net"
+EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Michał Górny]

commit:     c278daaa38d03f36002669458171d1b9f23ec97c
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sun May 21 19:55:05 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 24 12:14:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c278daaa

games-emulation/pcsx2: update to match latest upstream changes.

Closes: https://github.com/gentoo/gentoo/pull/4707

 games-emulation/pcsx2/pcsx2-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 2e87ee9a6c8..a80184b7aa8 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	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/libsdl2[abi_x86_32(-),joystick,sound]
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
@@ -34,7 +34,7 @@ RDEPEND="
 	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]
+	x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
 "
 # Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
@@ -89,7 +89,7 @@ src_configure() {
 		-DGTK3_API=FALSE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
-		-DSDL2_API=FALSE
+		-DSDL2_API=TRUE
 		-DWX28_API=FALSE
 	)
 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Agostino Sarubbo]

commit:     e311699b68109ecd0cf8fa63ad15cd341cd6c78a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 11:40:58 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 11:40:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e311699b

games-emulation/pcsx2: x86 stable wrt bug #590684

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index 8d75f31..205910c 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[Agostino Sarubbo]

commit:     4fe80a6ef63a239a3c6d92214bfc18ba530049f1
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 11:38:43 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 11:38:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe80a6e

games-emulation/pcsx2: amd64 stable wrt bug #590684

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index 06305d2..8d75f31 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 RDEPEND="