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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-07-13 22:12 Pieter
  0 siblings, 0 replies; 21+ messages in thread
From: Pieter @ 2025-07-13 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     c074539967842797f61bb182c0bb8bfcc1338e92
Author:     Pieter <pieter.kn0101 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 13 22:05:38 2025 +0000
Commit:     Pieter <pieter.kn0101 <AT> gmail <DOT> com>
CommitDate: Sun Jul 13 22:05:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c0745399

games-emulation/rpcs3: replace dependency app-arch/p7zip with app-arch/7zip as recommended by the gentoo wiki: https://wiki.gentoo.org/wiki/P7zip and https://bugs.gentoo.org/914736

Signed-off-by: Pieter <pieter.kn0101 <AT> gmail.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
index 0b0917d219..10645ed94b 100644
--- a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
+++ b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
@@ -49,7 +49,7 @@ SLOT="0"
 IUSE="discord faudio +llvm opencv vulkan wayland"
 
 DEPEND="
-	app-arch/p7zip
+	app-arch/7zip
 	app-arch/zstd
 	dev-libs/flatbuffers
 	dev-libs/hidapi

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 55df1972f1..cf3763fe88 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -49,7 +49,7 @@ SLOT="0"
 IUSE="discord faudio +llvm opencv vulkan wayland"
 
 DEPEND="
-	app-arch/p7zip
+	app-arch/7zip
 	app-arch/zstd
 	dev-libs/flatbuffers
 	dev-libs/hidapi


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-08-27 16:22 Takuya Wakazono
  0 siblings, 0 replies; 21+ messages in thread
From: Takuya Wakazono @ 2025-08-27 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     53827b06c095fcf948c8eded28a082d06f9a87b3
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 26 21:18:37 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Aug 27 14:06:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=53827b06

games-emulation/rpcs3: unbundle system libraries

- miniupnpc
  https://github.com/RPCS3/rpcs3/commit/aa7758a20fec5cf26b8bab43fb8fc6804d821763
- rtmidi
  https://github.com/RPCS3/rpcs3/commit/9126d617c534ca521e87ed0170a87ae59331933d

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

 games-emulation/rpcs3/rpcs3-9999.ebuild | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index b315d91920..4506379c55 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -7,8 +7,6 @@ inherit cmake flag-o-matic xdg optfeature
 
 ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff" # remotes/origin/a32_port~71
 GLSLANG_COMMIT="fc9889c889561c5882e83819dcaffef5ed45529b" # tags/15.3.0
-MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953" # tags/miniupnpd_2_3_9
-RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b" # tags/6.0.0
 WOLFSSL_COMMIT="decea12e223869c8f8f3ab5a53dc90b69f436eb2" # tags/5.8.2-stable
 SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17" # master
 YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba" # master
@@ -21,7 +19,7 @@ HOMEPAGE="https://rpcs3.net/"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
 	EGIT_SUBMODULES=(
-	'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
+	'asmjit' '3rdparty/glslang' '3rdparty/wolfssl'
 	'3rdparty/SoundTouch/soundtouch' '3rdparty/fusion/fusion' '3rdparty/GPUOpen/VulkanMemoryAllocator'
 	'3rdparty/feralinteractive/feralinteractive' '3rdparty/yaml-cpp'
 	)
@@ -31,8 +29,6 @@ else
 		https://github.com/RPCS3/rpcs3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz -> ${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz
 		https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${PN}-glslang-${GLSLANG_COMMIT}.tar.gz
-		https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
-		https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
 		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
 		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz
 			-> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
@@ -66,7 +62,9 @@ DEPEND="
 	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/openal
+	media-libs/rtmidi
 	media-video/ffmpeg:=
+	net-libs/miniupnpc:=
 	net-misc/curl
 	llvm-core/llvm:=
 	sys-libs/zlib
@@ -94,12 +92,6 @@ src_prepare() {
 		rmdir "${S}/3rdparty/glslang/glslang" || die
 		mv "${WORKDIR}/glslang-${GLSLANG_COMMIT}" "${S}/3rdparty/glslang/glslang" || die
 
-		rmdir "${S}/3rdparty/miniupnp/miniupnp" || die
-		mv "${WORKDIR}/miniupnp-${MINIUPNP_COMMIT}" "${S}/3rdparty/miniupnp/miniupnp" || die
-
-		rmdir "${S}/3rdparty/rtmidi/rtmidi" || die
-		mv "${WORKDIR}/rtmidi-${RTMIDI_COMMIT}" "${S}/3rdparty/rtmidi/rtmidi" || die
-
 		rmdir "${S}/3rdparty/wolfssl/wolfssl" || die
 		mv "${WORKDIR}/wolfssl-${WOLFSSL_COMMIT}" "${S}/3rdparty/wolfssl/wolfssl" || die
 
@@ -152,7 +144,9 @@ src_configure() {
 		-DUSE_SYSTEM_HIDAPI=ON
 		-DUSE_SYSTEM_LIBPNG=ON
 		-DUSE_SYSTEM_LIBUSB=ON
+		-DUSE_SYSTEM_MINIUPNPC=ON
 		-DUSE_SYSTEM_PUGIXML=ON
+		-DUSE_SYSTEM_RTMIDI=ON
 		-DUSE_SYSTEM_ZLIB=ON
 		-DUSE_SYSTEM_ZSTD=ON
 		-DUSE_DISCORD_RPC=$(usex discord)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-08-23  5:46 Erica Nebula
  0 siblings, 0 replies; 21+ messages in thread
From: Erica Nebula @ 2025-08-23  5:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f32f3c4aad8c212ba1237deae8941b6de8c0d638
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Sat Aug 23 05:35:12 2025 +0000
Commit:     Erica Nebula <EricaNebula <AT> proton <DOT> me>
CommitDate: Sat Aug 23 05:43:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f32f3c4a

games-emulation/rpcs3: Handle new Feral GameMode submodule

- RPCS3 added GameMode Support here:

    https://github.com/RPCS3/rpcs3/commit/ef566186be9b43f55c2422fe9f037f0f2b45055c#diff-03192d01a7c525c4017bdf9ad6eb8a58b749f38d8fb8f3a92d2c4dfe45ce8bf7

- The selected commit hash is the same one you get if you manually clone
  the RPCS3 repo and update submodules. I also updated the other
  submodule hashes where appropriate with the same approach, and added
  comments explaining what branch or tag they correlate to.

- The submodule is only needed during compilation; Using gamemode
  functionality requires games-util/gamemode be installed on the system.
  Added an optfeature message to let users know.

- This update also includes the prep work for whenever the next point
  release happens; SRC_URI is updated and the archive will be moved to
  the right 3rdparty folder.

Signed-off-by: Erica Nebula <EricaNebula <AT> Proton.me>

 games-emulation/rpcs3/rpcs3-9999.ebuild | 35 +++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index fc497adb88..5ca92b3cd2 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic xdg
-
-ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
-GLSLANG_COMMIT="fc9889c889561c5882e83819dcaffef5ed45529b"
-MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953"
-RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
-WOLFSSL_COMMIT="b077c81eb635392e694ccedbab8b644297ec0285"
-SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17"
-YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
-FUSION_COMMIT="066d4a63b2c714b20b0a8073a01fda7c5c6763f6"
-VULKANMEMORYALLOCATOR_COMMIT="6ec8481c8a13db586d7b3ba58f4eb9bbf017edf0"
+inherit cmake flag-o-matic xdg optfeature
+
+ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff" # remotes/origin/a32_port~71
+GLSLANG_COMMIT="fc9889c889561c5882e83819dcaffef5ed45529b" # tags/15.3.0
+MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953" # tags/miniupnpd_2_3_9
+RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b" # tags/6.0.0
+WOLFSSL_COMMIT="decea12e223869c8f8f3ab5a53dc90b69f436eb2" # tags/5.8.2-stable
+SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17" # master
+YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba" # master
+FUSION_COMMIT="066d4a63b2c714b20b0a8073a01fda7c5c6763f6" # tags/1.2.8
+VULKANMEMORYALLOCATOR_COMMIT="1d8f600fd424278486eade7ed3e877c99f0846b1" # tags/3.3.0
+GAMEMODE_COMMIT="c54d6d4243b0dd0afcb49f2c9836d432da171a2b" # tags/1.8.2
 
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
@@ -22,9 +23,8 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_SUBMODULES=(
 	'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
 	'3rdparty/SoundTouch/soundtouch' '3rdparty/fusion/fusion' '3rdparty/GPUOpen/VulkanMemoryAllocator'
+	'3rdparty/feralinteractive/feralinteractive' '3rdparty/yaml-cpp'
 	)
-	# Delete sources when ensuring yaml-cpp compiled with fexceptions
-	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 	inherit git-r3
 else
 	SRC_URI="
@@ -40,6 +40,7 @@ else
 		https://github.com/xioTechnologies/Fusion/archive/${FUSION_COMMIT}.tar.gz -> ${PN}-fusion-${FUSION_COMMIT}.tar.gz
 		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
 			-> ${PN}-VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+		https://github.com/FeralInteractive/gamemode/archive/${GAMEMODE_COMMIT}.tar.gz -> ${PN}-GameMode.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -116,6 +117,10 @@ src_prepare() {
 		mv "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" \
 			"${S}/3rdparty/GPUOpen/VulkanMemoryAllocator" || die
 
+		rmdir "${S}/3rdparty/feralinteractive/feralinteractive" || die
+		mv "${WORKDIR}/gamemode-${GAMEMODE_COMMIT}" \
+			"${S}/3rdparty/feralinteractive/feralinteractive" || die
+
 		#Define RPCS3 Version
 		{ echo "#define RPCS3_GIT_VERSION \"${PV}\""
 		echo '#define RPCS3_GIT_BRANCH "master"'
@@ -189,3 +194,7 @@ src_install() {
 	# remove unneccessary files to save some space
 	rm -rf "${ED}/usr/share/rpcs3/"{git,test} || die
 }
+
+pkg_postinst() {
+	optfeature "FeralInteractive GameMode support" games-util/gamemode
+}
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-07-07  1:25 Erica Nebula
  0 siblings, 0 replies; 21+ messages in thread
From: Erica Nebula @ 2025-07-07  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     931a54e820ea53e887cbd6f065ba31e886202ce7
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Mon Jul  7 01:16:55 2025 +0000
Commit:     Erica Nebula <EricaNebula <AT> proton <DOT> me>
CommitDate: Mon Jul  7 01:16:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=931a54e8

games-emulation/rpcs3: Fix typos in YAMLCPP SRC_URI

Downloaded archive was using the wrong hash in the filename and had a
trailing hyphen. Unpacked folder had the correct name so this has no
impact on build.

Signed-off-by: Erica Nebula <EricaNebula <AT> Proton.me>

 games-emulation/rpcs3/Manifest            | 2 +-
 games-emulation/rpcs3/rpcs3-0.0.37.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/rpcs3/Manifest b/games-emulation/rpcs3/Manifest
index e0ea2bc86e..13b3f3baa0 100644
--- a/games-emulation/rpcs3/Manifest
+++ b/games-emulation/rpcs3/Manifest
@@ -7,4 +7,4 @@ DIST rpcs3-miniupnp-d66872e34d9ff83a07f8b71371b13419b2089953.tar.gz 540745 BLAKE
 DIST rpcs3-rtmidi-1e5b49925aa60065db52de44c366d446a902547b.tar.gz 515635 BLAKE2B 4a4809bd2c1f03b0ecda9a2583c84fb7f0a040f362bcd96f2639b062b8a5dbdb4da214f1f14d56664e59f0c964413db8f6d1722ece59c9a36629fb50d2b56c92 SHA512 c5f221cecbcee5085a75264b9c5f4eb4f8096d8f7425908678a3429f97fd4177d4f1781c5ef9f46093353878eabffc76b2f9af049ea4ba6dee05f1c7999f1b9f
 DIST rpcs3-soundtouch-3982730833b6daefe77dcfb32b5c282851640c17.tar.gz 607787 BLAKE2B 58358d00186830ad0d9a23a551949d9437cc6a949b835c623730f06371f166bcf43433b96c3b80572d4ab907775258051bbea73f9cd7e2d9a0c36fa5ec4bf525 SHA512 aa42aac667ed701df29fec5b75a1878e6c7404d8e66a9238d930a14f994fca37f350108c7ba4cbce899b0155976b454031a6425b28809a0ffe15d1a1709ade1f
 DIST rpcs3-wolfssl-b077c81eb635392e694ccedbab8b644297ec0285.tar.gz 24936390 BLAKE2B 717d36c5fe3e64089bf550844caaa61cdd532d6b37216427d7bcbd9af12df0cf7bd474d8e79c217d28646f69b7d1a388eb50ea1006760b06d09b74ff140d734e SHA512 14e198ca5f90ba38f61bc6237f9e5d63e0a9631bf8360d02cc34759d8415b8b0a9bae30e122e08a2aa29027e787bb81359c8d26f853fe1c3410356d92f1b95d5
-DIST rpcs3-yaml-cpp-3982730833b6daefe77dcfb32b5c282851640c17-.tar.gz 1019142 BLAKE2B 8c7b4e1c788a07c1092be813555b1774a713693dd995183671d60b1896f96e105631447cb8c69bbcb13c380388b632d38a2c59be19903bc259ae6b57a181612a SHA512 0d06856bacb6c3cb987299c650baffcb2647a4b9a53394a7ce5c75301b527574d41cb0dfe9bf2e997e04588786d5aa7232437472a2e5fec422e8aa56aba0ea14
+DIST rpcs3-yaml-cpp-456c68f452da09d8ca84b375faa2b1397713eaba.tar.gz 1019142 BLAKE2B 8c7b4e1c788a07c1092be813555b1774a713693dd995183671d60b1896f96e105631447cb8c69bbcb13c380388b632d38a2c59be19903bc259ae6b57a181612a SHA512 0d06856bacb6c3cb987299c650baffcb2647a4b9a53394a7ce5c75301b527574d41cb0dfe9bf2e997e04588786d5aa7232437472a2e5fec422e8aa56aba0ea14

diff --git a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
index 55df1972f1..0b0917d219 100644
--- a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
+++ b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
@@ -36,7 +36,7 @@ else
 		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
 		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz
 			-> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
-		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
+		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${YAMLCPP_COMMIT}.tar.gz
 		https://github.com/xioTechnologies/Fusion/archive/${FUSION_COMMIT}.tar.gz -> ${PN}-fusion-${FUSION_COMMIT}.tar.gz
 		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
 			-> ${PN}-VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-06-04 21:31 Erica Nebula
  0 siblings, 0 replies; 21+ messages in thread
From: Erica Nebula @ 2025-06-04 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c69f90f40352798b9087e954c3b8448f2294c3be
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Wed Jun  4 03:43:38 2025 +0000
Commit:     Erica Nebula <EricaNebula <AT> proton <DOT> me>
CommitDate: Wed Jun  4 21:25:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c69f90f4

games-emulation/rpcs3: Remove unused dependency on dev-libs/xxhash

xxhash was removed from the project recently in this commit:
https://github.com/RPCS3/rpcs3/commit/52edef0867a7145b107cf9eee99f9f495416c2fa

A warning is displayd during configuration that the USE_SYSTEM_XXHASH
CMAKE option is unused. I am just removing dev-libs/xxhash from the
ebuild so we aren't fetching any unnecessary deps.

Signed-off-by: Erica Nebula <EricaNebula <AT> Proton.me>

 games-emulation/rpcs3/rpcs3-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index f91c54de26..223fdac703 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -49,7 +49,6 @@ DEPEND="
 	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
@@ -147,7 +146,6 @@ src_configure() {
 		-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)


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-06-04 21:31 Erica Nebula
  0 siblings, 0 replies; 21+ messages in thread
From: Erica Nebula @ 2025-06-04 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     678d19a3b702de3980205a68b529491e9e3a35aa
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Wed Jun  4 03:32:30 2025 +0000
Commit:     Erica Nebula <EricaNebula <AT> proton <DOT> me>
CommitDate: Wed Jun  4 21:25:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=678d19a3

games-emulation/rpcs3: Update hidapi unbundling regex

One of the hidapi unbundling steps in the ebuild is to replace
"hidapi.h" with <hidapi/hidapi.h>, but that include line was recently
changed from "hidapi.h" to <hidapi.h> so the regex does nothing because
it specifically looks for and replaces the quotes. This leads to a
compile error claiming hidapi.h could not be found.

The change was made in this commit:
https://github.com/RPCS3/rpcs3/commit/38289f3bc1d711aa8b9d801668f8c9b8059d35df

I am just updating the regex to look for < and > instead.

Signed-off-by: Erica Nebula <EricaNebula <AT> Proton.me>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index f3d4960c79..f91c54de26 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -109,7 +109,7 @@ src_prepare() {
 	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\.h/{s:<:<hidapi/:;s/>/>/}' rpcs3/Input/hid_pad_handler.h || die
 	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


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-06-04 21:31 Erica Nebula
  0 siblings, 0 replies; 21+ messages in thread
From: Erica Nebula @ 2025-06-04 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     8a2f2aba763c50d25ea0b6e037812c95d02ca8b7
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Wed Jun  4 01:45:49 2025 +0000
Commit:     Erica Nebula <EricaNebula <AT> proton <DOT> me>
CommitDate: Wed Jun  4 21:25:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8a2f2aba

games-emulation/rpcs3: Add submodule for VulkanMemoryAllocator

VulkanMemoryAllocator used to be directly included in the rpcs3
repository but was recently converted to a submodule. See
https://github.com/RPCS3/rpcs3/pull/17202 and discussion in
https://github.com/RPCS3/rpcs3/pull/16923 which prompted the conversion.

This commit just accommodates that change.

Note: it only applies to the -9999 path here. Will introduce a
new versioned ebuild in a separate commit, including updates to this
file.

Signed-off-by: Erica Nebula <EricaNebula <AT> Proton.me>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 3b0817ab44..f3d4960c79 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -20,7 +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'
+	'3rdparty/fusion/fusion' '3rdparty/GPUOpen/VulkanMemoryAllocator'
 	)
 	# Delete sources when ensuring yaml-cpp compiled with fexceptions
 	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-06-04 21:31 Erica Nebula
  0 siblings, 0 replies; 21+ messages in thread
From: Erica Nebula @ 2025-06-04 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     b5e728b6a37896565f6d68e44d7c280482d656d5
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Wed Jun  4 05:33:10 2025 +0000
Commit:     Erica Nebula <EricaNebula <AT> proton <DOT> me>
CommitDate: Wed Jun  4 21:25:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b5e728b6

games-emulation/rpcs3: add 0.0.37

This commit adds a new ebuild for the most recent versioned RPCS3 "Release".

Changes:
1. Add commit IDs, SRC_URIs, and src_prepare steps for submodules not
   covered in or applicable to previous (0.0.34) ebuild
2. Update existing commit IDs
3. Fix incorrect src_prepare mv path for yaml-cpp
4. Fix an existing "excessive line length" warning from pkgcheck

All commit IDs match what you get if you manually clone the RPCS3 repo
and its submodules at this release tag.

Signed-off-by: Erica Nebula <EricaNebula <AT> Proton.me>

 games-emulation/rpcs3/Manifest                     | 11 ++++++
 .../{rpcs3-9999.ebuild => rpcs3-0.0.37.ebuild}     | 40 ++++++++++++++++++----
 games-emulation/rpcs3/rpcs3-9999.ebuild            | 40 ++++++++++++++++++----
 3 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/games-emulation/rpcs3/Manifest b/games-emulation/rpcs3/Manifest
index 447fc554f0..e9e7174acf 100644
--- a/games-emulation/rpcs3/Manifest
+++ b/games-emulation/rpcs3/Manifest
@@ -1,8 +1,19 @@
 DIST rpcs3-0.0.34.tar.gz 7834256 BLAKE2B 62bfc4751e4f77bc20899222520a5b902b7bd263f6a0265e35189c85a8e4ce068dbe38c8b4cd7c61634b69f81c7aa2f7c2d9f894134149e4a9211841ab822102 SHA512 4cbe7d62fe86e51355d63a09ce64ec768ad236aebf4375dd410549339a5f244fb2cc30c89821b0e6f001bb31646432abd06a2b9947b8d589d5c5b73de24e6e9d
+DIST rpcs3-0.0.37.tar.gz 5858089 BLAKE2B 613463695e41366161d59b8a43a55bbfff995ce3f9a3ec026f5030f51a8e7992badfa9e022fa0be5edc3973ec2a3c408969ce10e1c5fecd7616b5fe6bef12cc7 SHA512 cf890a00fc9da3269d8539d9db30372965ec1bb5a18e42017819249a8d37e4d2b95e76dc8450aad6fb0450fcbf9cbec01c2743c51c66763c745c5f318a89b6f7
+DIST rpcs3-VulkanMemoryAllocator-6ec8481c8a13db586d7b3ba58f4eb9bbf017edf0.tar.gz 962721 BLAKE2B c369f33f6057880df21b0ed01310385ea373546c61aa25157f3ff3ea139cae400a10361fcd1d395d048fa7648e42269b7257db2ada7f74e8654ee6b53bb46144 SHA512 4514ea5b604939fb28185cd2c76e43927e9d604bafa3e8ad4c2d17ed60bd925e658be8c06a6ea470636c9ce25781a96a3c3b707056d9093c62842d13f9baed99
 DIST rpcs3-asmjit-416f7356967c1f66784dc1580fe157f9406d8bff.tar.gz 1152383 BLAKE2B 17b054083ce178255f19026d175986225f6f803a21e0cef4ce9a557ac50057578d3ae76d3b179fe25d0febd5e05d5d5feb28f9761045a8e41497b92a966196ec SHA512 2be4de27b2ed2212cf7b6ef9d40afac5c00f7a71df4e60208ea57258c01e56413cee439f84490d605f44a835522d1c1a55de898feccdd4429e907a9f82edd7cb
+DIST rpcs3-fusion-066d4a63b2c714b20b0a8073a01fda7c5c6763f6.tar.gz 447897 BLAKE2B ec1330941df3fff6538fbfc0e9609fb022ffe2507c3622242dc69a4c4758714f89452dcc0e0902cbe8fbfd3f76185b042adf7e386abdb2a202403b3d8786d6a2 SHA512 3e0d42936ad4175b7a0a50106786973301530ff6a8eeb4b3e393001b83b07b00e5a4d6cf48783e5a765f326bc05c099e20d1211480a56c3a24f1b518deb4c5eb
 DIST rpcs3-glslang-36d08c0d940cf307a23928299ef52c7970d8cee6.tar.gz 3769785 BLAKE2B 923bfada8484a3bb91dd92a242d7096017b77fd399a90052af121658221069215e277d51fb4b9b95821b9272e44618f91883c2dc49bfb671c52a941d54aec182 SHA512 184baa0bc22d5e79bf8424692b5c8bb51676ca20819551cf406a4fd898dd1ad5ca7296e26ce7b99878e627dcafc4cd435933dd939c91753c5050022052e1dbe5
+DIST rpcs3-glslang-fc9889c889561c5882e83819dcaffef5ed45529b.tar.gz 4030379 BLAKE2B 9dd4295d81ffaac556f31ff415f37dd7da2050135b35ba464760312969302dd09e01a5676a26f05eb9c8fb219d8e21350778c7c7ad9262545edc479588ffacf9 SHA512 11344bd7551e8577fe3c3b20a8baaec871f1e5e1a48abb572d82783e72a02cfd0db383f2f2e20a16605758c9c854445c548ad6318fa5b70b235950f131b32b36
 DIST rpcs3-miniupnp-7f189988a0decca0ab7da89000051ab91751f70d.tar.gz 462956 BLAKE2B da35be2f89c4aa19e4d956f2929184653c9dcafdd6f7fa8b463e23bb6b449bb4ad17ea526ea11eb1dae460ff26c4c45e219de6e93afaeb9fe9042e91ac7a64eb SHA512 7bc34491912099b26873f7942077156e267cf3860082299c6ebf42ca0d7cb8a0d8330b874fd37f00907b865bb08321e4d6d5d1b5bba581140d9dd0f07f9f1599
+DIST rpcs3-miniupnp-d66872e34d9ff83a07f8b71371b13419b2089953.tar.gz 540745 BLAKE2B 87e02644befbd3f6f67e6de70755a98b5ecf81295b1e1c7bcdb974f6c736dcc2b554ec5eba0cc08174dad82b617b2168a5dcbad1761f43992d5aae01e219aaca SHA512 4844d8c49a3bd45ffcde82f6c871673a6f689cad872d6d03b5751409ed6278cf5cfcc78bddb1d1028ce5b720d1f2b08158c0f0037a3deed5919f5f1364a824c6
+DIST rpcs3-openal-dc7d7054a5b4f3bec1dc23a42fd616a0847af948.tar.gz 1253314 BLAKE2B 3a94c7c7d493aea59336181dcf6b22feab47609823c1ba7461a1ffa5fda0c966f92de462ec79f7f90cadc9235001de5a697b251d24533eb201f0fad08d7e8d1a SHA512 208fc64a4ad872780a1fbe953eab0854e28a38664d74cb255111420917e312be53755ae7dd39fd2c0bb1135649ce619d427a15e9da5a76d489ec1c305b4193bc
 DIST rpcs3-rtmidi-1e5b49925aa60065db52de44c366d446a902547b.tar.gz 515635 BLAKE2B 4a4809bd2c1f03b0ecda9a2583c84fb7f0a040f362bcd96f2639b062b8a5dbdb4da214f1f14d56664e59f0c964413db8f6d1722ece59c9a36629fb50d2b56c92 SHA512 c5f221cecbcee5085a75264b9c5f4eb4f8096d8f7425908678a3429f97fd4177d4f1781c5ef9f46093353878eabffc76b2f9af049ea4ba6dee05f1c7999f1b9f
 DIST rpcs3-soundtouch-394e1f58b23dc80599214d2e9b6a5e0dfd0bbe07.tar.gz 606942 BLAKE2B 208041ba68fc7b26d3fd800e1a26c79d8f011142fff1f6ea519d71972762299816eb10b3204a8bd4fe872bb19fe5639e5782db4e40333cb2073c7fb32153e6e7 SHA512 ef4a3300b6e80e4f540c3d1444b2604e6cb9bb72bd9648059706e1ad1aba015fdf9babecd9986910a2069ba44947e72e965ccc793f98598b6d6c140181585dfe
+DIST rpcs3-soundtouch-3982730833b6daefe77dcfb32b5c282851640c17.tar.gz 607787 BLAKE2B 58358d00186830ad0d9a23a551949d9437cc6a949b835c623730f06371f166bcf43433b96c3b80572d4ab907775258051bbea73f9cd7e2d9a0c36fa5ec4bf525 SHA512 aa42aac667ed701df29fec5b75a1878e6c7404d8e66a9238d930a14f994fca37f350108c7ba4cbce899b0155976b454031a6425b28809a0ffe15d1a1709ade1f
+DIST rpcs3-stb-013ac3beddff3dbffafd5177e7972067cd2b5083.tar.gz 1510118 BLAKE2B 6ea841222758a00bb704dbe2c269a44af3fabeeaa761682e89042fe42f5d4d92eebb5e7c31772873b624e9120295fb75178740f9d98da9fa53c32eb4b5e5cdf3 SHA512 571f22d2a31f836fe19b8606b38135f962486608a7c5bd46ff551d98cef85647556e1f9f59c92bf0ecbc2938cb63cf41c84c08c48188f8cf14d7141d1fc35a66
 DIST rpcs3-wolfssl-00e42151ca061463ba6a95adb2290f678cbca472.tar.gz 23602428 BLAKE2B 3e8dfe67c9401a32ae9cdea9f03ef929e6378e55af4edb5b26c4e8bd91e21ff91d5cae73bf858b4dfcc292ca0ac4ba667baf373e9f5d093e26ea6287dd677bee SHA512 79023c31489fa8ce3772e8042c47360be8ad29e29b7e7ae2dd397907e11acd64536d5446f52e9957194d054f959069521ffdc90faa820d09ba406a4ad8ae1440
+DIST rpcs3-wolfssl-b077c81eb635392e694ccedbab8b644297ec0285.tar.gz 24936390 BLAKE2B 717d36c5fe3e64089bf550844caaa61cdd532d6b37216427d7bcbd9af12df0cf7bd474d8e79c217d28646f69b7d1a388eb50ea1006760b06d09b74ff140d734e SHA512 14e198ca5f90ba38f61bc6237f9e5d63e0a9631bf8360d02cc34759d8415b8b0a9bae30e122e08a2aa29027e787bb81359c8d26f853fe1c3410356d92f1b95d5
+DIST rpcs3-yaml-cpp-3982730833b6daefe77dcfb32b5c282851640c17-.tar.gz 1019142 BLAKE2B 8c7b4e1c788a07c1092be813555b1774a713693dd995183671d60b1896f96e105631447cb8c69bbcb13c380388b632d38a2c59be19903bc259ae6b57a181612a SHA512 0d06856bacb6c3cb987299c650baffcb2647a4b9a53394a7ce5c75301b527574d41cb0dfe9bf2e997e04588786d5aa7232437472a2e5fec422e8aa56aba0ea14
 DIST rpcs3-yaml-cpp-456c68f452da09d8ca84b375faa2b1397713eaba.tar.gz 1019142 BLAKE2B 8c7b4e1c788a07c1092be813555b1774a713693dd995183671d60b1896f96e105631447cb8c69bbcb13c380388b632d38a2c59be19903bc259ae6b57a181612a SHA512 0d06856bacb6c3cb987299c650baffcb2647a4b9a53394a7ce5c75301b527574d41cb0dfe9bf2e997e04588786d5aa7232437472a2e5fec422e8aa56aba0ea14
+DIST rpcs3-zstd-f8745da6ff1ad1e7bab384bd1f9d742439278e99.tar.gz 2453329 BLAKE2B 827f825cca32016e104391d1fbae1267526366023fe099c867aca74f91c4221e64c425c3364bcf9af3dab9ad7c016632d97d0ae555ed7fad891fd7eb22930aa8 SHA512 3a3e8c5324bc66ca5cdaf83d26df16cdb7b67453277c2764df40171b6787d65aa0eedc9e61256acc95867904b81d4ed570b16edf1e540a9776dd86f70b8b0f37

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
similarity index 75%
copy from games-emulation/rpcs3/rpcs3-9999.ebuild
copy to games-emulation/rpcs3/rpcs3-0.0.37.ebuild
index 223fdac703..bf9bf20e32 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
@@ -6,12 +6,17 @@ EAPI=8
 inherit cmake flag-o-matic xdg
 
 ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
-GLSLANG_COMMIT="36d08c0d940cf307a23928299ef52c7970d8cee6"
-MINIUPNP_COMMIT="f22a96b4697699d32fdc2d17c5d0ad7880a99c24"
+GLSLANG_COMMIT="fc9889c889561c5882e83819dcaffef5ed45529b"
+MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953"
 RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
-WOLFSSL_COMMIT="8970ff4c34034dbb3594943d11f8c9d4c5512bd5"
-SOUNDTOUCH_COMMIT="ced3ce8d5ecc5aef8a5156fea206a37b33774bf3"
+WOLFSSL_COMMIT="b077c81eb635392e694ccedbab8b644297ec0285"
+SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17"
+ZSTD_COMMIT="f8745da6ff1ad1e7bab384bd1f9d742439278e99"
+STB_COMMIT="013ac3beddff3dbffafd5177e7972067cd2b5083"
 YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
+OPENAL_COMMIT="dc7d7054a5b4f3bec1dc23a42fd616a0847af948"
+FUSION_COMMIT="066d4a63b2c714b20b0a8073a01fda7c5c6763f6"
+VULKANMEMORYALLOCATOR_COMMIT="6ec8481c8a13db586d7b3ba58f4eb9bbf017edf0"
 
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
@@ -33,8 +38,15 @@ else
 		https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
 		https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
 		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
-		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz
+			-> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+		https://github.com/facebook/zstd/archive/${ZSTD_COMMIT}.tar.gz -> ${PN}-zstd-${ZSTD_COMMIT}.tar.gz
+		https://github.com/nothings/stb/archive/${STB_COMMIT}.tar.gz -> ${PN}-stb-${STB_COMMIT}.tar.gz
 		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
+		https://github.com/kcat/openal-soft/archive/${OPENAL_COMMIT}.tar.gz -> ${PN}-openal-${OPENAL_COMMIT}.tar.gz
+		https://github.com/xioTechnologies/Fusion/archive/${FUSION_COMMIT}.tar.gz -> ${PN}-fusion-${FUSION_COMMIT}.tar.gz
+		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+			-> ${PN}-VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -94,8 +106,24 @@ src_prepare() {
 		rmdir "${S}/3rdparty/SoundTouch/soundtouch" || die
 		mv "${WORKDIR}/soundtouch-${SOUNDTOUCH_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
 
+		rmdir "${S}/3rdparty/zstd/zstd" || die
+		mv "${WORKDIR}/zstd-${ZSTD_COMMIT}" "${S}/3rdparty/zstd/zstd" || die
+
+		rmdir "${S}/3rdparty/stblib/stb" || die
+		mv "${WORKDIR}/stb-${STB_COMMIT}" "${S}/3rdparty/stblib/stb" || die
+
 		rmdir "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
-		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
+		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
+
+		rmdir "${S}/3rdparty/fusion/fusion" || die
+		mv "${WORKDIR}/Fusion-${FUSION_COMMIT}" "${S}/3rdparty/fusion/fusion" || die
+
+		rmdir "${S}/3rdparty/OpenAL/openal-soft" || die
+		mv "${WORKDIR}/openal-soft-${OPENAL_COMMIT}" "${S}/3rdparty/OpenAL/openal-soft" || die
+
+		rmdir "${S}/3rdparty/GPUOpen/VulkanMemoryAllocator" || die
+		mv "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" \
+			"${S}/3rdparty/GPUOpen/VulkanMemoryAllocator" || die
 
 		#Define RPCS3 Version
 		{ echo "#define RPCS3_GIT_VERSION \"${PV}\""

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 223fdac703..bf9bf20e32 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -6,12 +6,17 @@ EAPI=8
 inherit cmake flag-o-matic xdg
 
 ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
-GLSLANG_COMMIT="36d08c0d940cf307a23928299ef52c7970d8cee6"
-MINIUPNP_COMMIT="f22a96b4697699d32fdc2d17c5d0ad7880a99c24"
+GLSLANG_COMMIT="fc9889c889561c5882e83819dcaffef5ed45529b"
+MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953"
 RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
-WOLFSSL_COMMIT="8970ff4c34034dbb3594943d11f8c9d4c5512bd5"
-SOUNDTOUCH_COMMIT="ced3ce8d5ecc5aef8a5156fea206a37b33774bf3"
+WOLFSSL_COMMIT="b077c81eb635392e694ccedbab8b644297ec0285"
+SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17"
+ZSTD_COMMIT="f8745da6ff1ad1e7bab384bd1f9d742439278e99"
+STB_COMMIT="013ac3beddff3dbffafd5177e7972067cd2b5083"
 YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
+OPENAL_COMMIT="dc7d7054a5b4f3bec1dc23a42fd616a0847af948"
+FUSION_COMMIT="066d4a63b2c714b20b0a8073a01fda7c5c6763f6"
+VULKANMEMORYALLOCATOR_COMMIT="6ec8481c8a13db586d7b3ba58f4eb9bbf017edf0"
 
 DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
@@ -33,8 +38,15 @@ else
 		https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
 		https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
 		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
-		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz
+			-> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+		https://github.com/facebook/zstd/archive/${ZSTD_COMMIT}.tar.gz -> ${PN}-zstd-${ZSTD_COMMIT}.tar.gz
+		https://github.com/nothings/stb/archive/${STB_COMMIT}.tar.gz -> ${PN}-stb-${STB_COMMIT}.tar.gz
 		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
+		https://github.com/kcat/openal-soft/archive/${OPENAL_COMMIT}.tar.gz -> ${PN}-openal-${OPENAL_COMMIT}.tar.gz
+		https://github.com/xioTechnologies/Fusion/archive/${FUSION_COMMIT}.tar.gz -> ${PN}-fusion-${FUSION_COMMIT}.tar.gz
+		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+			-> ${PN}-VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -94,8 +106,24 @@ src_prepare() {
 		rmdir "${S}/3rdparty/SoundTouch/soundtouch" || die
 		mv "${WORKDIR}/soundtouch-${SOUNDTOUCH_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
 
+		rmdir "${S}/3rdparty/zstd/zstd" || die
+		mv "${WORKDIR}/zstd-${ZSTD_COMMIT}" "${S}/3rdparty/zstd/zstd" || die
+
+		rmdir "${S}/3rdparty/stblib/stb" || die
+		mv "${WORKDIR}/stb-${STB_COMMIT}" "${S}/3rdparty/stblib/stb" || die
+
 		rmdir "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
-		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
+		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
+
+		rmdir "${S}/3rdparty/fusion/fusion" || die
+		mv "${WORKDIR}/Fusion-${FUSION_COMMIT}" "${S}/3rdparty/fusion/fusion" || die
+
+		rmdir "${S}/3rdparty/OpenAL/openal-soft" || die
+		mv "${WORKDIR}/openal-soft-${OPENAL_COMMIT}" "${S}/3rdparty/OpenAL/openal-soft" || die
+
+		rmdir "${S}/3rdparty/GPUOpen/VulkanMemoryAllocator" || die
+		mv "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" \
+			"${S}/3rdparty/GPUOpen/VulkanMemoryAllocator" || die
 
 		#Define RPCS3 Version
 		{ echo "#define RPCS3_GIT_VERSION \"${PV}\""


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-02-14 22:45 Samuel Bauer
  0 siblings, 0 replies; 21+ messages in thread
From: Samuel Bauer @ 2025-02-14 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     6e5606263406642cfb25a1a1243503bd6531d8cd
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Feb 14 22:45:13 2025 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Feb 14 22:45:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e560626

Revert "games-emulation/rpcs3: fails, unmaintained"

This reverts commit 9f20b7c54fdad7d054423777949aed66acc4dcc0.

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

 games-emulation/rpcs3/metadata.xml      |  15 +++
 games-emulation/rpcs3/rpcs3-9999.ebuild | 174 ++++++++++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
new file mode 100644
index 000000000..65cadeec8
--- /dev/null
+++ b/games-emulation/rpcs3/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<name>mazes-80</name>
+	<email>samuel.bauer@yahoo.fr</email>
+</maintainer>
+<use>
+	<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
new file mode 100644
index 000000000..3b0817ab4
--- /dev/null
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -0,0 +1,174 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
+GLSLANG_COMMIT="36d08c0d940cf307a23928299ef52c7970d8cee6"
+MINIUPNP_COMMIT="f22a96b4697699d32fdc2d17c5d0ad7880a99c24"
+RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
+WOLFSSL_COMMIT="8970ff4c34034dbb3594943d11f8c9d4c5512bd5"
+SOUNDTOUCH_COMMIT="ced3ce8d5ecc5aef8a5156fea206a37b33774bf3"
+YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
+
+DESCRIPTION="PS3 emulator/debugger"
+HOMEPAGE="https://rpcs3.net/"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
+	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' )
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/RPCS3/rpcs3/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz -> ${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz
+		https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${PN}-glslang-${GLSLANG_COMMIT}.tar.gz
+		https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
+		https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
+		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
+		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
+		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="discord faudio +llvm opencv vulkan wayland"
+
+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/alsa-lib
+	media-libs/cubeb
+	media-libs/glew
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/openal
+	media-video/ffmpeg:=
+	net-misc/curl
+	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 )
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="usr/share/rpcs3/test/.*"
+QA_WX_LOAD="usr/share/rpcs3/test/*"
+
+src_prepare() {
+	if [[ ${PV} != "9999" ]]; then
+		rmdir "${S}/3rdparty/asmjit/asmjit" || die
+		mv "${WORKDIR}/asmjit-${ASMJIT_COMMIT}" "${S}/3rdparty/asmjit/asmjit" || die
+
+		rmdir "${S}/3rdparty/glslang/glslang" || die
+		mv "${WORKDIR}/glslang-${GLSLANG_COMMIT}" "${S}/3rdparty/glslang/glslang" || die
+
+		rmdir "${S}/3rdparty/miniupnp/miniupnp" || die
+		mv "${WORKDIR}/miniupnp-${MINIUPNP_COMMIT}" "${S}/3rdparty/miniupnp/miniupnp" || die
+
+		rmdir "${S}/3rdparty/rtmidi/rtmidi" || die
+		mv "${WORKDIR}/rtmidi-${RTMIDI_COMMIT}" "${S}/3rdparty/rtmidi/rtmidi" || die
+
+		rmdir "${S}/3rdparty/wolfssl/wolfssl" || die
+		mv "${WORKDIR}/wolfssl-${WOLFSSL_COMMIT}" "${S}/3rdparty/wolfssl/wolfssl" || die
+
+		rmdir "${S}/3rdparty/SoundTouch/soundtouch" || die
+		mv "${WORKDIR}/soundtouch-${SOUNDTOUCH_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
+
+		rmdir "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
+		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
+
+		#Define RPCS3 Version
+		{ echo "#define RPCS3_GIT_VERSION \"${PV}\""
+		echo '#define RPCS3_GIT_BRANCH "master"'
+		echo '#define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"'
+		echo '#define RPCS3_GIT_VERSION_NO_UPDATE 1'; } > rpcs3/git-version.h
+	fi
+
+	# 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 || 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
+
+	# Unbundle cubeb
+	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
+	sed -i -e '$afind_package(cubeb)\n' CMakeLists.txt || die
+	sed -i -e 's/3rdparty::cubeb/cubeb/' rpcs3/Emu/CMakeLists.txt || die
+
+	# Unbundle yaml-cpp: system yaml-cpp should be compiled with -fexceptions
+	# sed -i -e '/yaml-cpp/d' 3rdparty/CMakeLists.txt || die
+	# sed -i -e '$afind_package(yaml-cpp)\n' CMakeLists.txt || die
+	# 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
+}
+
+src_configure() {
+	filter-lto
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
+		-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_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) )
+
+	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
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneccessary files to save some space
+	rm -rf "${ED}/usr/share/rpcs3/"{git,test} || die
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2025-02-14  6:28 Samuel Bauer
  0 siblings, 0 replies; 21+ messages in thread
From: Samuel Bauer @ 2025-02-14  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     9f20b7c54fdad7d054423777949aed66acc4dcc0
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Feb 14 06:28:36 2025 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Feb 14 06:28:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f20b7c5

games-emulation/rpcs3: fails, unmaintained

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

 games-emulation/rpcs3/metadata.xml      |  15 ---
 games-emulation/rpcs3/rpcs3-9999.ebuild | 174 --------------------------------
 2 files changed, 189 deletions(-)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
deleted file mode 100644
index 65cadeec8..000000000
--- a/games-emulation/rpcs3/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<name>mazes-80</name>
-	<email>samuel.bauer@yahoo.fr</email>
-</maintainer>
-<use>
-	<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
deleted file mode 100644
index 3b0817ab4..000000000
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-ASMJIT_COMMIT="416f7356967c1f66784dc1580fe157f9406d8bff"
-GLSLANG_COMMIT="36d08c0d940cf307a23928299ef52c7970d8cee6"
-MINIUPNP_COMMIT="f22a96b4697699d32fdc2d17c5d0ad7880a99c24"
-RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
-WOLFSSL_COMMIT="8970ff4c34034dbb3594943d11f8c9d4c5512bd5"
-SOUNDTOUCH_COMMIT="ced3ce8d5ecc5aef8a5156fea206a37b33774bf3"
-YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
-
-DESCRIPTION="PS3 emulator/debugger"
-HOMEPAGE="https://rpcs3.net/"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-	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' )
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/RPCS3/rpcs3/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz -> ${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz
-		https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${PN}-glslang-${GLSLANG_COMMIT}.tar.gz
-		https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz
-		https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz
-		https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz
-		https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz
-		https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="discord faudio +llvm opencv vulkan wayland"
-
-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/alsa-lib
-	media-libs/cubeb
-	media-libs/glew
-	media-libs/libglvnd
-	media-libs/libpng:=
-	media-libs/openal
-	media-video/ffmpeg:=
-	net-misc/curl
-	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 )
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="usr/share/rpcs3/test/.*"
-QA_WX_LOAD="usr/share/rpcs3/test/*"
-
-src_prepare() {
-	if [[ ${PV} != "9999" ]]; then
-		rmdir "${S}/3rdparty/asmjit/asmjit" || die
-		mv "${WORKDIR}/asmjit-${ASMJIT_COMMIT}" "${S}/3rdparty/asmjit/asmjit" || die
-
-		rmdir "${S}/3rdparty/glslang/glslang" || die
-		mv "${WORKDIR}/glslang-${GLSLANG_COMMIT}" "${S}/3rdparty/glslang/glslang" || die
-
-		rmdir "${S}/3rdparty/miniupnp/miniupnp" || die
-		mv "${WORKDIR}/miniupnp-${MINIUPNP_COMMIT}" "${S}/3rdparty/miniupnp/miniupnp" || die
-
-		rmdir "${S}/3rdparty/rtmidi/rtmidi" || die
-		mv "${WORKDIR}/rtmidi-${RTMIDI_COMMIT}" "${S}/3rdparty/rtmidi/rtmidi" || die
-
-		rmdir "${S}/3rdparty/wolfssl/wolfssl" || die
-		mv "${WORKDIR}/wolfssl-${WOLFSSL_COMMIT}" "${S}/3rdparty/wolfssl/wolfssl" || die
-
-		rmdir "${S}/3rdparty/SoundTouch/soundtouch" || die
-		mv "${WORKDIR}/soundtouch-${SOUNDTOUCH_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
-
-		rmdir "${S}/3rdparty/yaml-cpp/yaml-cpp" || die
-		mv "${WORKDIR}/yaml-cpp-${YAMLCPP_COMMIT}" "${S}/3rdparty/SoundTouch/soundtouch" || die
-
-		#Define RPCS3 Version
-		{ echo "#define RPCS3_GIT_VERSION \"${PV}\""
-		echo '#define RPCS3_GIT_BRANCH "master"'
-		echo '#define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"'
-		echo '#define RPCS3_GIT_VERSION_NO_UPDATE 1'; } > rpcs3/git-version.h
-	fi
-
-	# 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 || 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
-
-	# Unbundle cubeb
-	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
-	sed -i -e '$afind_package(cubeb)\n' CMakeLists.txt || die
-	sed -i -e 's/3rdparty::cubeb/cubeb/' rpcs3/Emu/CMakeLists.txt || die
-
-	# Unbundle yaml-cpp: system yaml-cpp should be compiled with -fexceptions
-	# sed -i -e '/yaml-cpp/d' 3rdparty/CMakeLists.txt || die
-	# sed -i -e '$afind_package(yaml-cpp)\n' CMakeLists.txt || die
-	# 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
-}
-
-src_configure() {
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF # to remove after unbundling
-		-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_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) )
-
-	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
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove unneccessary files to save some space
-	rm -rf "${ED}/usr/share/rpcs3/"{git,test} || die
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-12-16 15:32 Takuya Wakazono
  0 siblings, 0 replies; 21+ messages in thread
From: Takuya Wakazono @ 2024-12-16 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     348a0f435e29a8766c4672a442f3e4b1659671a6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon Dec 16 15:31:48 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
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
 


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-06-25 21:10 Aiden Wingard
  0 siblings, 0 replies; 21+ messages in thread
From: Aiden Wingard @ 2024-06-25 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     867bc32066b3f7c6ebe684f11bf89a31958c210d
Author:     kernaltrap8 <kernaltrap <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 21:09:59 2024 +0000
Commit:     Aiden Wingard <kernaltrap <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>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-06-13 12:12 Kostadin Shishmanov
  0 siblings, 0 replies; 21+ messages in thread
From: Kostadin Shishmanov @ 2024-06-13 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3891a6901aeedf84830e0c1d4363933a56fd8e33
Author:     Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
AuthorDate: Thu Jun 13 11:55:40 2024 +0000
Commit:     Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
CommitDate: Thu Jun 13 12:12:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3891a690

games-emulation/rpcs3: fix build, remove some files

Add new git submodules that are needed:
(zstd, stblib and openal-soft)

Remove some files that shouldn't be needed:
(/usr/share/rpcs3/{git,test})

Closes: https://bugs.gentoo.org/934194
Signed-off-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com>

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 27d67610b..8e9ac66c7 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -17,7 +17,10 @@ DESCRIPTION="PS3 emulator/debugger"
 HOMEPAGE="https://rpcs3.net/"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"
-	EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl' '3rdparty/SoundTouch/soundtouch' )
+	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'
+	)
 	# Delete sources when ensuring yaml-cpp compiled with fexceptions
 	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 	inherit git-r3
@@ -153,3 +156,10 @@ src_configure() {
 		-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
 }
+
+src_install() {
+	cmake_src_install
+
+	# remove unneccessary files to save some space
+	rm -rf "${ED}/usr/share/rpcs3/"{git,test} || die
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-03-09  6:19 Takuya Wakazono
  0 siblings, 0 replies; 21+ messages in thread
From: Takuya Wakazono @ 2024-03-09  6:19 UTC (permalink / raw
  To: gentoo-commits

commit:     05ef3818352045903afbb5aea95bcd2cca58434e
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Mar  9 06:15:49 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 06:15:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05ef3818

games-emulation/rpcs3: remove useless USE flags

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

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index d2202eaaf4..7162b888ce 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa discord faudio +llvm pulseaudio vulkan wayland"
+IUSE="discord faudio +llvm vulkan wayland"
 
 DEPEND="
 	app-arch/p7zip
@@ -37,9 +37,7 @@ DEPEND="
 	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?] )
 	wayland? ( dev-libs/wayland )
 "


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-03-09  6:04 Takuya Wakazono
  0 siblings, 0 replies; 21+ messages in thread
From: Takuya Wakazono @ 2024-03-09  6:04 UTC (permalink / raw
  To: gentoo-commits

commit:     3eac696ec8007e6ee3d30a53349f898c069e2cf3
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Mar  9 05:18:42 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 06:02:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3eac696e

games-emulation/rpcs3: unbundle glslang

It needs a specific version of vulkan sdks.

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

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index 9d29476c8c..d2202eaaf4 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -8,7 +8,7 @@ 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' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl'
+EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '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' )
@@ -40,10 +40,7 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	faudio? ( app-emulation/faudio )
 	pulseaudio? ( media-libs/libpulse )
-	vulkan? (
-		~dev-util/glslang-1.3.268
-		~media-libs/vulkan-loader-1.3.268
-	)
+	vulkan? ( media-libs/vulkan-loader[wayland?] )
 	wayland? ( dev-libs/wayland )
 "
 RDEPEND="${DEPEND}"
@@ -75,14 +72,6 @@ src_prepare() {
 	# sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \
 	#	rpcs3/rpcs3qt/CMakeLists.txt || die
 
-	# Unbundle glslang SPIRV
-	sed -i -e '/add_subdirectory(glslang/d' \
-		-e '/add_subdirectory(SPIRV/d' \
-		-e '/if(VULKAN_FOUND)/afind_library(SPIRV libSPIRV.so)\nfind_library(SPIRV-Tools-opt libSPIRV-Tools-opt.so)\n' \
-		-e '/target_link_libraries.*SPIRV/{s/SPIRV-Tools-opt/${&}/;s/SPIRV /${SPIRV} /}' \
-		3rdparty/CMakeLists.txt || die
-	sed -i -e '/#include "SPIRV/{s:":<glslang/:;s/"/>/}' rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp || die
-
 	cmake_src_prepare
 }
 
@@ -105,7 +94,10 @@ src_configure() {
 		-DUSE_VULKAN=$(usex vulkan)
 		-DWITH_LLVM=$(usex llvm)
 	)
+	# 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
 
 	sed -i -e 's/FFMPEG_LIB_AVFORMAT-NOTFOUND/avformat/' -e 's/FFMPEG_LIB_AVCODEC-NOTFOUND/avcodec/' \


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-01-20  3:53 Takuya Wakazono
  0 siblings, 0 replies; 21+ messages in thread
From: Takuya Wakazono @ 2024-01-20  3:53 UTC (permalink / raw
  To: gentoo-commits

commit:     42f3c0c3837e731da27884887591c9d5de03c7c6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 20 03:43:24 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <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}"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2024-01-11  9:34 Takuya Wakazono
  0 siblings, 0 replies; 21+ messages in thread
From: Takuya Wakazono @ 2024-01-11  9:34 UTC (permalink / raw
  To: gentoo-commits

commit:     2ac8755a01f7ee322fecfe9870f5934c54c9902e
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 11 09:23:09 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <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


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2022-10-28 16:39 Gregory Williams
  0 siblings, 0 replies; 21+ messages in thread
From: Gregory Williams @ 2022-10-28 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2916f3c39c3cdeaf04dcb988b9e7b4d9c282f568
Author:     Gregory Williams <gregwills85 <AT> gmail <DOT> com>
AuthorDate: Fri Oct 28 16:36:48 2022 +0000
Commit:     Gregory Williams <gregwills85 <AT> gmail <DOT> com>
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"


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2022-06-07 13:09 Samuel Bauer
  0 siblings, 0 replies; 21+ messages in thread
From: Samuel Bauer @ 2022-06-07 13:09 UTC (permalink / raw
  To: gentoo-commits

commit:     e337953cb279a235cfe601c735eab9f5f5cee217
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Jun  7 13:04:02 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Jun  7 13:08:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e337953c

games-emulation/rpcs3: fixes: filter compile flags, support for ffmpeg

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

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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index d9f599d7a..9d98a7d11 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	append-cppflags -DNDEBUG -Wno-error=stringop-truncation
 
 	# Disable cache
-	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/_FLAGS/d' \
+	sed -i -e '/find_program(CCACHE_FOUND/d' -e '/set(.*_FLAGS/d' \
 		CMakeLists.txt || die
 
 	# Unbundle hidapi
@@ -101,5 +101,6 @@ src_configure() {
 	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
 	CMAKE_BUILD_TYPE=RELEASE 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/' "${BUILD_DIR}"/build.ninja || die
+		-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
 }


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2022-02-18 10:14 Samuel Bauer
  0 siblings, 0 replies; 21+ messages in thread
From: Samuel Bauer @ 2022-02-18 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     73627f6d8729986ac58c69667e20904aca25cddb
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Feb 18 10:13:36 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
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' )
 


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/
@ 2022-01-23  9:27 Samuel Bauer
  0 siblings, 0 replies; 21+ messages in thread
From: Samuel Bauer @ 2022-01-23  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     68ed3810865c04a44a869d5daca151b394f6fb39
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun Jan 23 09:26:50 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun Jan 23 09:26:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=68ed3810

games-emulation/rpcs3: new ebuild

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

 games-emulation/rpcs3/metadata.xml      |  14 +++++
 games-emulation/rpcs3/rpcs3-9999.ebuild | 104 ++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml
new file mode 100644
index 000000000..dbfd1804e
--- /dev/null
+++ b/games-emulation/rpcs3/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<name>mazes-80</name>
+	<email>mazes-80@github.com</email>
+</maintainer>
+<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="vulkan">Build vulkan renderer</flag>
+</use>
+</pkgmetadata>

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
new file mode 100644
index 000000000..9e9a829bd
--- /dev/null
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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' )
+# Delete sources when ensuring yaml-cpp compiled with fexceptions
+EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	faudio? ( app-emulation/faudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	app-arch/p7zip
+	dev-libs/libevdev
+	dev-libs/pugixml
+	media-libs/cubeb
+	media-libs/libpng
+	media-libs/openal
+	sys-libs/zlib"
+#	dev-cpp/yaml-cpp
+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
+}
+
+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 '/_FLAGS/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 '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}
+
+	# Unbundle cubeb
+	sed -i -e '/cubeb/d' 3rdparty/CMakeLists.txt || die
+	sed -i -e '$afind_package(cubeb)\n' CMakeLists.txt || die
+	sed -i -e 's/3rdparty::cubeb/cubeb/' rpcs3/Emu/CMakeLists.txt || die
+
+	# Unbundle yaml-cpp: system yaml-cpp should be compiled with -fexceptions
+	# sed -i -e '/yaml-cpp/d' 3rdparty/CMakeLists.txt || die
+	# sed -i -e '$afind_package(yaml-cpp)\n' CMakeLists.txt || die
+	# sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \
+	#	rpcs3/rpcs3qt/CMakeLists.txt || die
+
+	# Unbundle glslang SPIRV
+	sed -i -e '/add_subdirectory(glslang/d' \
+		-e '/add_subdirectory(SPIRV/d' \
+		-e '/if(VULKAN_FOUND)/afind_library(SPIRV libSPIRV.so)\nfind_library(SPIRV-Tools-opt libSPIRV-Tools-opt.so)\n' \
+		-e '/target_link_libraries.*SPIRV/{s/SPIRV-Tools-opt/${&}/;s/SPIRV /${SPIRV} /}' \
+		3rdparty/CMakeLists.txt || die
+	sed -i -e '/#include "SPIRV/{s:":<glslang/:;s/"/>/}' rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	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_LIBPNG=ON
+		-DUSE_SYSTEM_LIBUSB=ON
+		-DUSE_SYSTEM_PUGIXML=ON
+		-DUSE_SYSTEM_XXHASH=ON
+		-DUSE_SYSTEM_ZLIB=ON
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWITH_LLVM=$(usex llvm)
+	)
+	use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) )
+	CMAKE_BUILD_TYPE=RELEASE 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/' "${BUILD_DIR}"/build.ninja || die
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2025-08-27 16:22 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-13 22:12 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/rpcs3/ Pieter
  -- strict thread matches above, loose matches on Subject: below --
2025-08-27 16:22 Takuya Wakazono
2025-08-23  5:46 Erica Nebula
2025-07-07  1:25 Erica Nebula
2025-06-04 21:31 Erica Nebula
2025-06-04 21:31 Erica Nebula
2025-06-04 21:31 Erica Nebula
2025-06-04 21:31 Erica Nebula
2025-02-14 22:45 Samuel Bauer
2025-02-14  6:28 Samuel Bauer
2024-12-16 15:32 Takuya Wakazono
2024-06-25 21:10 Aiden Wingard
2024-06-13 12:12 Kostadin Shishmanov
2024-03-09  6:19 Takuya Wakazono
2024-03-09  6:04 Takuya Wakazono
2024-01-20  3:53 Takuya Wakazono
2024-01-11  9:34 Takuya Wakazono
2022-10-28 16:39 Gregory Williams
2022-06-07 13:09 Samuel Bauer
2022-02-18 10:14 Samuel Bauer
2022-01-23  9:27 Samuel Bauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox