[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[Florian Schmaus]

commit:     73627f6d8729986ac58c69667e20904aca25cddb
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Feb 18 10:13:36 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 10:13:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=73627f6d

games-emulation/rpcs: include soundtouch

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 9e9a829bd..d9f599d7a 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -8,7 +8,8 @@ inherit cmake flag-o-matic git-r3 xdg
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-EGIT_SUBMODULES=( '-*' 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl' )
+EGIT_SUBMODULES=( 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl'
+	'3rdparty/SoundTouch/soundtouch' )
 # Delete sources when ensuring yaml-cpp compiled with fexceptions
 EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 

[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[Arthur Zamarin]

commit:     2916f3c39c3cdeaf04dcb988b9e7b4d9c282f568
Author:     Gregory Williams <gregwills85 <AT> gmail <DOT> com>
AuthorDate: Fri Oct 28 16:36:48 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 16:36:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2916f3c3

games-emulation/rpcs3: Add missing dependencies

Signed-off-by: Gregory Williams <gregwills85 <AT> gmail.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 9d98a7d11..79dbf9f98 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -21,9 +21,12 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	app-arch/p7zip
+	dev-libs/hidapi
 	dev-libs/libevdev
 	dev-libs/pugixml
+	dev-libs/xxhash
 	media-libs/cubeb
+	media-libs/glew
 	media-libs/libpng
 	media-libs/openal
 	sys-libs/zlib"

[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[David Roman]

commit:     2ac8755a01f7ee322fecfe9870f5934c54c9902e
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 11 09:23:09 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jan 11 09:33:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ac8755a

games-emulation/rpcs3: update live

Closes: https://bugs.gentoo.org/893430
Closes: https://bugs.gentoo.org/897760
Closes: https://bugs.gentoo.org/912983
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 games-emulation/rpcs3/rpcs3-9999.ebuild | 74 +++++++++++++++++----------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 79dbf9f98b..e25d866035 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,60 +8,58 @@ inherit cmake flag-o-matic git-r3 xdg
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-EGIT_SUBMODULES=( 'asmjit' 'llvm' '3rdparty/flatbuffers' '3rdparty/wolfssl'
+EGIT_SUBMODULES=( 'asmjit' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
 	'3rdparty/SoundTouch/soundtouch' )
 # Delete sources when ensuring yaml-cpp compiled with fexceptions
 EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
 
-DEPEND="alsa? ( media-libs/alsa-lib )
-	faudio? ( app-emulation/faudio )
-	pulseaudio? ( media-sound/pulseaudio )
+DEPEND="
 	app-arch/p7zip
+	dev-libs/flatbuffers
 	dev-libs/hidapi
 	dev-libs/libevdev
 	dev-libs/pugixml
 	dev-libs/xxhash
+	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
 	media-libs/cubeb
 	media-libs/glew
-	media-libs/libpng
+	media-libs/libglvnd
+	media-libs/libpng:=
 	media-libs/openal
-	sys-libs/zlib"
-#	dev-cpp/yaml-cpp
+	media-video/ffmpeg:=
+	net-misc/curl
+	sys-devel/llvm:=
+	sys-libs/zlib
+	virtual/libusb:1
+	alsa? ( media-libs/alsa-lib )
+	faudio? ( app-emulation/faudio )
+	pulseaudio? ( media-libs/libpulse )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+"
 RDEPEND="${DEPEND}"
-BDEPEND=""
 
-IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
-
-src_unpack() {
-	git clone https://github.com/intel/ittapi "${WORKDIR}"/ittapi
-	git-r3_src_unpack
-}
+QA_PREBUILT="usr/share/rpcs3/test/.*"
+QA_WX_LOAD="usr/share/rpcs3/test/*"
 
 src_prepare() {
-	append-cflags -DNDEBUG -Wno-error=stringop-truncation
-	append-cppflags -DNDEBUG -Wno-error=stringop-truncation
-
-	# Disable cache
-	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/set(.*_FLAGS/d' \
-		CMakeLists.txt || die
+	# Disable automagic ccache
+	sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die
 
 	# Unbundle hidapi
 	sed -i -e '/hidapi\.h/{s:":<hidapi/:;s/"/>/}' rpcs3/Input/hid_pad_handler.h || die
-	sed -i -e '/hidapi/d' 3rdparty/CMakeLists.txt
-	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(hidapi-hidraw REQUIRED hidapi-hidraw)' rpcs3/CMakeLists.txt
+	sed -i -e '/hidapi/d' 3rdparty/CMakeLists.txt || die
+	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(hidapi-hidraw REQUIRED hidapi-hidraw)' \
+		rpcs3/CMakeLists.txt || die
 	sed -i -e 's/3rdparty::hidapi/hidapi-hidraw/' rpcs3/CMakeLists.txt rpcs3/rpcs3qt/CMakeLists.txt || die
-	sed -i -e 's/hid_write_control/hid_write/' rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
-
-	# Move ittapi to the right place via cmake
-	local regex='/GIT_EXECUTABLE} clone/s!(.*!(COMMAND mv '
-	regex+="${WORKDIR}"
-	regex+='/ittapi \${ITTAPI_SOURCE_DIR}!'
-	sed -i -e "${regex}" \
-		llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt || die ${regex}
+	sed -i -e 's/hid_write_control/hid_write/' \
+		rpcs3/Input/dualsense_pad_handler.cpp rpcs3/Input/ds4_pad_handler.cpp || die
 
 	# Unbundle cubeb
 	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
@@ -86,23 +84,27 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
-		-DBUILD_LLVM_SUBMODULE=ON # ennoying really
 		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
-		-DUSE_DISCORD_RPC=$(usex discord)
-		-DUSE_FAUDIO=$(usex faudio)
 		-DUSE_PRECOMPILED_HEADERS=ON
 		-DUSE_SYSTEM_CURL=ON
+		-DUSE_SYSTEM_FFMPEG=ON
+		-DUSE_SYSTEM_FLATBUFFERS=ON
 		-DUSE_SYSTEM_LIBPNG=ON
 		-DUSE_SYSTEM_LIBUSB=ON
 		-DUSE_SYSTEM_PUGIXML=ON
 		-DUSE_SYSTEM_XXHASH=ON
 		-DUSE_SYSTEM_ZLIB=ON
+		-DUSE_DISCORD_RPC=$(usex discord)
+		-DUSE_FAUDIO=$(usex faudio)
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWITH_LLVM=$(usex llvm)
 	)
 	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
-	CMAKE_BUILD_TYPE=RELEASE cmake_src_configure
+	cmake_src_configure
+
 	sed -i -e 's/FFMPEG_LIB_AVFORMAT-NOTFOUND/avformat/' -e 's/FFMPEG_LIB_AVCODEC-NOTFOUND/avcodec/' \
 		-e 's/FFMPEG_LIB_AVUTIL-NOTFOUND/avutil/' -e 's/FFMPEG_LIB_SWSCALE-NOTFOUND/swscale/' \
 		-e 's/FFMPEG_LIB_SWRESAMPLE-NOTFOUND/swresample/' "${BUILD_DIR}"/build.ninja || die

[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[David Roman]

commit:     42f3c0c3837e731da27884887591c9d5de03c7c6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 20 03:43:24 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Jan 20 03:43:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42f3c0c3

games-emulation/rpcs3: lock vulkan SDKs version

Upstream only supports 1.3.268 for now.

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index e25d866035..9d29476c8c 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -40,7 +40,10 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
 	pulseaudio? ( media-libs/libpulse )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		~dev-util/glslang-1.3.268
+		~media-libs/vulkan-loader-1.3.268
+	)
 	wayland? ( dev-libs/wayland )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[David Roman]

commit:     867bc32066b3f7c6ebe684f11bf89a31958c210d
Author:     kernaltrap8 <kernaltrap <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 21:09:59 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Jun 25 21:09:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=867bc320

games-emulation/rpcs3: fix llvm USE description in metadata.xml

Signed-off-by: kernaltrap8 <kernaltrap <AT> gmail.com>

 games-emulation/rpcs3/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
index 95c264d48..64cbd48f9 100644
--- a/games-emulation/rpcs3/metadata.xml
+++ b/games-emulation/rpcs3/metadata.xml
@@ -8,7 +8,7 @@
 <use>
 	<flag name="discord">Enables Discord Rich Presence</flag>
 	<flag name="faudio">Add faudio sound backend support</flag>
-	<flag name="llvm">Use llvm idk what for</flag>
+	<flag name="llvm">Use llvm backend for PPU cache generation</flag>
 	<flag name="vulkan">Build vulkan renderer</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/

[Julien Roy]

commit:     348a0f435e29a8766c4672a442f3e4b1659671a6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon Dec 16 15:31:48 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Dec 16 15:31:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=348a0f43

games-emulation/rpcs3: update live

- add fusion submodule
- add opencv USE flag
- fix build with GCC 15

Closes: https://bugs.gentoo.org/946346
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 games-emulation/rpcs3/metadata.xml      |  1 +
 games-emulation/rpcs3/rpcs3-9999.ebuild | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
index 64cbd48f9..65cadeec8 100644
--- a/games-emulation/rpcs3/metadata.xml
+++ b/games-emulation/rpcs3/metadata.xml
@@ -9,6 +9,7 @@
 	<flag name="discord">Enables Discord Rich Presence</flag>
 	<flag name="faudio">Add faudio sound backend support</flag>
 	<flag name="llvm">Use llvm backend for PPU cache generation</flag>
+	<flag name="opencv">Enable PS Move support</flag>
 	<flag name="vulkan">Build vulkan renderer</flag>
 </use>
 </pkgmetadata>

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index b7d0273b2..3b0817ab4 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -20,6 +20,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_SUBMODULES=(
 	'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
 	'3rdparty/SoundTouch/soundtouch' '3rdparty/zstd/zstd' '3rdparty/stblib/stb' '3rdparty/OpenAL/openal-soft'
+	'3rdparty/fusion/fusion'
 	)
 	# Delete sources when ensuring yaml-cpp compiled with fexceptions
 	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
@@ -40,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="discord faudio +llvm vulkan wayland"
+IUSE="discord faudio +llvm opencv vulkan wayland"
 
 DEPEND="
 	app-arch/p7zip
@@ -52,6 +53,7 @@ DEPEND="
 	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
 	dev-qt/qtmultimedia:6
 	dev-qt/qtsvg:6
+	media-libs/alsa-lib
 	media-libs/cubeb
 	media-libs/glew
 	media-libs/libglvnd
@@ -62,7 +64,9 @@ DEPEND="
 	llvm-core/llvm:=
 	sys-libs/zlib
 	virtual/libusb:1
+	x11-libs/libX11
 	faudio? ( app-emulation/faudio )
+	opencv? ( media-libs/opencv )
 	vulkan? ( media-libs/vulkan-loader[wayland?] )
 	wayland? ( dev-libs/wayland )
 "
@@ -124,6 +128,10 @@ src_prepare() {
 	# sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \
 	#	rpcs3/rpcs3qt/CMakeLists.txt || die
 
+	# Fix build with GCC 15
+	# https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd
+	sed -i '/<algorithm>/a#include <cstdint>' 3rdparty/glslang/glslang/SPIRV/SpvBuilder.h || die
+
 	cmake_src_prepare
 }
 
@@ -143,12 +151,13 @@ src_configure() {
 		-DUSE_SYSTEM_ZLIB=ON
 		-DUSE_DISCORD_RPC=$(usex discord)
 		-DUSE_FAUDIO=$(usex faudio)
+		-DUSE_SYSTEM_OPENCV=$(usex opencv)
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWITH_LLVM=$(usex llvm)
+		$(cmake_use_find_package wayland Wayland)
 	)
 	# These options are defined conditionally to suppress QA notice
 	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
-	use vulkan && mycmakeargs+=( $(cmake_use_find_package wayland Wayland) )
 
 	cmake_src_configure