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

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

From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/files/, games-emulation/rpcs3/
Date: Mon, 07 Jul 2025 08:57:05 +0000 (UTC)	[thread overview]
Message-ID: <1751848820.a1e7e45ebdbc7060c959c9aedc424e7ca920f0a9.davidroman@gentoo> (raw)

commit:     a1e7e45ebdbc7060c959c9aedc424e7ca920f0a9
Author:     Erica Nebula <EricaNebula <AT> Proton <DOT> me>
AuthorDate: Mon Jul  7 00:03:39 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jul  7 00:40:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1e7e45e

games-emulation/rpcs3: Unbundle zstd, stb, and openal

These three patches were present on the 0.0.34 ebuild but needed minor changes
to be applied to 0.0.37. I've also applied them to the live ebuild this
time, as they were not before.

The patches for both ebuilds are currently identical but kept in
distinct versioned files for easier handling in case they diverge in the future.

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

 games-emulation/rpcs3/Manifest                     |  3 --
 .../rpcs3/files/rpcs3-0.0.37-system-openal.patch   | 41 ++++++++++++++++++++++
 .../rpcs3/files/rpcs3-0.0.37-system-stb.patch      | 22 ++++++++++++
 .../rpcs3/files/rpcs3-0.0.37-system-zstd.patch     | 21 +++++++++++
 .../rpcs3/files/rpcs3-9999-system-openal.patch     | 41 ++++++++++++++++++++++
 .../rpcs3/files/rpcs3-9999-system-stb.patch        | 22 ++++++++++++
 .../rpcs3/files/rpcs3-9999-system-zstd.patch       | 21 +++++++++++
 games-emulation/rpcs3/rpcs3-0.0.37.ebuild          | 26 +++++---------
 games-emulation/rpcs3/rpcs3-9999.ebuild            | 26 +++++---------
 9 files changed, 186 insertions(+), 37 deletions(-)

diff --git a/games-emulation/rpcs3/Manifest b/games-emulation/rpcs3/Manifest
index 5e5a043b05..e0ea2bc86e 100644
--- a/games-emulation/rpcs3/Manifest
+++ b/games-emulation/rpcs3/Manifest
@@ -4,10 +4,7 @@ DIST rpcs3-asmjit-416f7356967c1f66784dc1580fe157f9406d8bff.tar.gz 1152383 BLAKE2
 DIST rpcs3-fusion-066d4a63b2c714b20b0a8073a01fda7c5c6763f6.tar.gz 447897 BLAKE2B ec1330941df3fff6538fbfc0e9609fb022ffe2507c3622242dc69a4c4758714f89452dcc0e0902cbe8fbfd3f76185b042adf7e386abdb2a202403b3d8786d6a2 SHA512 3e0d42936ad4175b7a0a50106786973301530ff6a8eeb4b3e393001b83b07b00e5a4d6cf48783e5a765f326bc05c099e20d1211480a56c3a24f1b518deb4c5eb
 DIST rpcs3-glslang-fc9889c889561c5882e83819dcaffef5ed45529b.tar.gz 4030379 BLAKE2B 9dd4295d81ffaac556f31ff415f37dd7da2050135b35ba464760312969302dd09e01a5676a26f05eb9c8fb219d8e21350778c7c7ad9262545edc479588ffacf9 SHA512 11344bd7551e8577fe3c3b20a8baaec871f1e5e1a48abb572d82783e72a02cfd0db383f2f2e20a16605758c9c854445c548ad6318fa5b70b235950f131b32b36
 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-3982730833b6daefe77dcfb32b5c282851640c17.tar.gz 607787 BLAKE2B 58358d00186830ad0d9a23a551949d9437cc6a949b835c623730f06371f166bcf43433b96c3b80572d4ab907775258051bbea73f9cd7e2d9a0c36fa5ec4bf525 SHA512 aa42aac667ed701df29fec5b75a1878e6c7404d8e66a9238d930a14f994fca37f350108c7ba4cbce899b0155976b454031a6425b28809a0ffe15d1a1709ade1f
-DIST rpcs3-stb-013ac3beddff3dbffafd5177e7972067cd2b5083.tar.gz 1510118 BLAKE2B 6ea841222758a00bb704dbe2c269a44af3fabeeaa761682e89042fe42f5d4d92eebb5e7c31772873b624e9120295fb75178740f9d98da9fa53c32eb4b5e5cdf3 SHA512 571f22d2a31f836fe19b8606b38135f962486608a7c5bd46ff551d98cef85647556e1f9f59c92bf0ecbc2938cb63cf41c84c08c48188f8cf14d7141d1fc35a66
 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-zstd-f8745da6ff1ad1e7bab384bd1f9d742439278e99.tar.gz 2453329 BLAKE2B 827f825cca32016e104391d1fbae1267526366023fe099c867aca74f91c4221e64c425c3364bcf9af3dab9ad7c016632d97d0ae555ed7fad891fd7eb22930aa8 SHA512 3a3e8c5324bc66ca5cdaf83d26df16cdb7b67453277c2764df40171b6787d65aa0eedc9e61256acc95867904b81d4ed570b16edf1e540a9776dd86f70b8b0f37

diff --git a/games-emulation/rpcs3/files/rpcs3-0.0.37-system-openal.patch b/games-emulation/rpcs3/files/rpcs3-0.0.37-system-openal.patch
new file mode 100644
index 0000000000..765593e0c5
--- /dev/null
+++ b/games-emulation/rpcs3/files/rpcs3-0.0.37-system-openal.patch
@@ -0,0 +1,41 @@
+diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp
+index a5ece1be5..072c73d58 100644
+--- a/rpcs3/Emu/Cell/Modules/cellMic.cpp
++++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp
+@@ -11,7 +11,7 @@
+ #include <cmath>
+ 
+ #ifndef WITHOUT_OPENAL
+-#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h"
++#include <AL/alext.h>
+ #endif
+ 
+ LOG_CHANNEL(cellMic);
+diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h
+index e4b416fa6..7f00e2881 100644
+--- a/rpcs3/Emu/Cell/Modules/cellMic.h
++++ b/rpcs3/Emu/Cell/Modules/cellMic.h
+@@ -1,7 +1,7 @@
+ #pragma once
+ 
+ #include "Utilities/Thread.h"
+-#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
++#include <AL/alc.h>
+ #include "Utilities/mutex.h"
+ 
+ // Error Codes
+diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp
+index 9ea04defd..fc1343fc2 100644
+--- a/rpcs3/rpcs3qt/microphone_creator.cpp
++++ b/rpcs3/rpcs3qt/microphone_creator.cpp
+@@ -3,8 +3,8 @@
+ 
+ #include "Utilities/StrUtil.h"
+ 
+-#include "3rdparty/OpenAL/openal-soft/include/AL/al.h"
+-#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
++#include <AL/al.h>
++#include <AL/alc.h>
+ 
+ LOG_CHANNEL(cfg_log, "CFG");
+ 

diff --git a/games-emulation/rpcs3/files/rpcs3-0.0.37-system-stb.patch b/games-emulation/rpcs3/files/rpcs3-0.0.37-system-stb.patch
new file mode 100644
index 0000000000..43e39720c0
--- /dev/null
+++ b/games-emulation/rpcs3/files/rpcs3-0.0.37-system-stb.patch
@@ -0,0 +1,22 @@
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index 6c49a889b..c749044fb 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -125,7 +125,8 @@ else()
+ endif()
+ 
+ # stblib
+-add_subdirectory(stblib)
++pkg_check_modules(stb REQUIRED IMPORTED_TARGET GLOBAL stb)
++add_library(3rdparty::stblib ALIAS PkgConfig::stb)
+ 
+ # DiscordRPC
+ add_subdirectory(discord-rpc)
+@@ -373,7 +374,6 @@ add_library(3rdparty::yaml-cpp ALIAS yaml-cpp)
+ add_library(3rdparty::hidapi ALIAS 3rdparty_hidapi)
+ add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET})
+ add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
+-add_library(3rdparty::stblib ALIAS 3rdparty_stblib)
+ add_library(3rdparty::discordRPC ALIAS 3rdparty_discordRPC)
+ add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET})
+ add_library(3rdparty::libevdev ALIAS ${LIBEVDEV_TARGET})

diff --git a/games-emulation/rpcs3/files/rpcs3-0.0.37-system-zstd.patch b/games-emulation/rpcs3/files/rpcs3-0.0.37-system-zstd.patch
new file mode 100644
index 0000000000..0b8464e720
--- /dev/null
+++ b/games-emulation/rpcs3/files/rpcs3-0.0.37-system-zstd.patch
@@ -0,0 +1,21 @@
+Unbundle zstd.
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -20,7 +20,8 @@ add_library(3rdparty_dummy_lib INTERFACE)
+ add_subdirectory(zlib EXCLUDE_FROM_ALL)
+ 
+ # ZSTD
+-add_subdirectory(zstd EXCLUDE_FROM_ALL)
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET GLOBAL libzstd)
++add_library(3rdparty::zstd ALIAS PkgConfig::zstd)
+ 
+ # 7zip sdk
+ add_subdirectory(7zip EXCLUDE_FROM_ALL)
+@@ -350,7 +351,6 @@ else()
+ 	add_library(3rdparty::libusb ALIAS usb-1.0-static)
+ endif()
+ add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
+-add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
+ add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
+ add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
+ add_library(3rdparty::pugixml ALIAS pugixml)

diff --git a/games-emulation/rpcs3/files/rpcs3-9999-system-openal.patch b/games-emulation/rpcs3/files/rpcs3-9999-system-openal.patch
new file mode 100644
index 0000000000..765593e0c5
--- /dev/null
+++ b/games-emulation/rpcs3/files/rpcs3-9999-system-openal.patch
@@ -0,0 +1,41 @@
+diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp
+index a5ece1be5..072c73d58 100644
+--- a/rpcs3/Emu/Cell/Modules/cellMic.cpp
++++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp
+@@ -11,7 +11,7 @@
+ #include <cmath>
+ 
+ #ifndef WITHOUT_OPENAL
+-#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h"
++#include <AL/alext.h>
+ #endif
+ 
+ LOG_CHANNEL(cellMic);
+diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h
+index e4b416fa6..7f00e2881 100644
+--- a/rpcs3/Emu/Cell/Modules/cellMic.h
++++ b/rpcs3/Emu/Cell/Modules/cellMic.h
+@@ -1,7 +1,7 @@
+ #pragma once
+ 
+ #include "Utilities/Thread.h"
+-#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
++#include <AL/alc.h>
+ #include "Utilities/mutex.h"
+ 
+ // Error Codes
+diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp
+index 9ea04defd..fc1343fc2 100644
+--- a/rpcs3/rpcs3qt/microphone_creator.cpp
++++ b/rpcs3/rpcs3qt/microphone_creator.cpp
+@@ -3,8 +3,8 @@
+ 
+ #include "Utilities/StrUtil.h"
+ 
+-#include "3rdparty/OpenAL/openal-soft/include/AL/al.h"
+-#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
++#include <AL/al.h>
++#include <AL/alc.h>
+ 
+ LOG_CHANNEL(cfg_log, "CFG");
+ 

diff --git a/games-emulation/rpcs3/files/rpcs3-9999-system-stb.patch b/games-emulation/rpcs3/files/rpcs3-9999-system-stb.patch
new file mode 100644
index 0000000000..43e39720c0
--- /dev/null
+++ b/games-emulation/rpcs3/files/rpcs3-9999-system-stb.patch
@@ -0,0 +1,22 @@
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index 6c49a889b..c749044fb 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -125,7 +125,8 @@ else()
+ endif()
+ 
+ # stblib
+-add_subdirectory(stblib)
++pkg_check_modules(stb REQUIRED IMPORTED_TARGET GLOBAL stb)
++add_library(3rdparty::stblib ALIAS PkgConfig::stb)
+ 
+ # DiscordRPC
+ add_subdirectory(discord-rpc)
+@@ -373,7 +374,6 @@ add_library(3rdparty::yaml-cpp ALIAS yaml-cpp)
+ add_library(3rdparty::hidapi ALIAS 3rdparty_hidapi)
+ add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET})
+ add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
+-add_library(3rdparty::stblib ALIAS 3rdparty_stblib)
+ add_library(3rdparty::discordRPC ALIAS 3rdparty_discordRPC)
+ add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET})
+ add_library(3rdparty::libevdev ALIAS ${LIBEVDEV_TARGET})

diff --git a/games-emulation/rpcs3/files/rpcs3-9999-system-zstd.patch b/games-emulation/rpcs3/files/rpcs3-9999-system-zstd.patch
new file mode 100644
index 0000000000..0b8464e720
--- /dev/null
+++ b/games-emulation/rpcs3/files/rpcs3-9999-system-zstd.patch
@@ -0,0 +1,21 @@
+Unbundle zstd.
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -20,7 +20,8 @@ add_library(3rdparty_dummy_lib INTERFACE)
+ add_subdirectory(zlib EXCLUDE_FROM_ALL)
+ 
+ # ZSTD
+-add_subdirectory(zstd EXCLUDE_FROM_ALL)
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET GLOBAL libzstd)
++add_library(3rdparty::zstd ALIAS PkgConfig::zstd)
+ 
+ # 7zip sdk
+ add_subdirectory(7zip EXCLUDE_FROM_ALL)
+@@ -350,7 +351,6 @@ else()
+ 	add_library(3rdparty::libusb ALIAS usb-1.0-static)
+ endif()
+ add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
+-add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
+ add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
+ add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
+ add_library(3rdparty::pugixml ALIAS pugixml)

diff --git a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
index bf9bf20e32..55df1972f1 100644
--- a/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
+++ b/games-emulation/rpcs3/rpcs3-0.0.37.ebuild
@@ -11,10 +11,7 @@ MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953"
 RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
 WOLFSSL_COMMIT="b077c81eb635392e694ccedbab8b644297ec0285"
 SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17"
-ZSTD_COMMIT="f8745da6ff1ad1e7bab384bd1f9d742439278e99"
-STB_COMMIT="013ac3beddff3dbffafd5177e7972067cd2b5083"
 YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
-OPENAL_COMMIT="dc7d7054a5b4f3bec1dc23a42fd616a0847af948"
 FUSION_COMMIT="066d4a63b2c714b20b0a8073a01fda7c5c6763f6"
 VULKANMEMORYALLOCATOR_COMMIT="6ec8481c8a13db586d7b3ba58f4eb9bbf017edf0"
 
@@ -24,8 +21,7 @@ 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' '3rdparty/GPUOpen/VulkanMemoryAllocator'
+	'3rdparty/SoundTouch/soundtouch' '3rdparty/fusion/fusion' '3rdparty/GPUOpen/VulkanMemoryAllocator'
 	)
 	# Delete sources when ensuring yaml-cpp compiled with fexceptions
 	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
@@ -40,10 +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/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
@@ -57,10 +50,12 @@ IUSE="discord faudio +llvm opencv vulkan wayland"
 
 DEPEND="
 	app-arch/p7zip
+	app-arch/zstd
 	dev-libs/flatbuffers
 	dev-libs/hidapi
 	dev-libs/libevdev
 	dev-libs/pugixml
+	dev-libs/stb
 	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
 	dev-qt/qtmultimedia:6
 	dev-qt/qtsvg:6
@@ -86,6 +81,12 @@ RDEPEND="${DEPEND}"
 QA_PREBUILT="usr/share/rpcs3/test/.*"
 QA_WX_LOAD="usr/share/rpcs3/test/*"
 
+PATCHES=(
+	"${FILESDIR}/${P}-system-openal.patch"
+	"${FILESDIR}/${P}-system-stb.patch"
+	"${FILESDIR}/${P}-system-zstd.patch"
+)
+
 src_prepare() {
 	if [[ ${PV} != "9999" ]]; then
 		rmdir "${S}/3rdparty/asmjit/asmjit" || die
@@ -106,21 +107,12 @@ 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/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

diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild
index bf9bf20e32..55df1972f1 100644
--- a/games-emulation/rpcs3/rpcs3-9999.ebuild
+++ b/games-emulation/rpcs3/rpcs3-9999.ebuild
@@ -11,10 +11,7 @@ MINIUPNP_COMMIT="d66872e34d9ff83a07f8b71371b13419b2089953"
 RTMIDI_COMMIT="1e5b49925aa60065db52de44c366d446a902547b"
 WOLFSSL_COMMIT="b077c81eb635392e694ccedbab8b644297ec0285"
 SOUNDTOUCH_COMMIT="3982730833b6daefe77dcfb32b5c282851640c17"
-ZSTD_COMMIT="f8745da6ff1ad1e7bab384bd1f9d742439278e99"
-STB_COMMIT="013ac3beddff3dbffafd5177e7972067cd2b5083"
 YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba"
-OPENAL_COMMIT="dc7d7054a5b4f3bec1dc23a42fd616a0847af948"
 FUSION_COMMIT="066d4a63b2c714b20b0a8073a01fda7c5c6763f6"
 VULKANMEMORYALLOCATOR_COMMIT="6ec8481c8a13db586d7b3ba58f4eb9bbf017edf0"
 
@@ -24,8 +21,7 @@ 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' '3rdparty/GPUOpen/VulkanMemoryAllocator'
+	'3rdparty/SoundTouch/soundtouch' '3rdparty/fusion/fusion' '3rdparty/GPUOpen/VulkanMemoryAllocator'
 	)
 	# Delete sources when ensuring yaml-cpp compiled with fexceptions
 	EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' )
@@ -40,10 +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/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
@@ -57,10 +50,12 @@ IUSE="discord faudio +llvm opencv vulkan wayland"
 
 DEPEND="
 	app-arch/p7zip
+	app-arch/zstd
 	dev-libs/flatbuffers
 	dev-libs/hidapi
 	dev-libs/libevdev
 	dev-libs/pugixml
+	dev-libs/stb
 	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
 	dev-qt/qtmultimedia:6
 	dev-qt/qtsvg:6
@@ -86,6 +81,12 @@ RDEPEND="${DEPEND}"
 QA_PREBUILT="usr/share/rpcs3/test/.*"
 QA_WX_LOAD="usr/share/rpcs3/test/*"
 
+PATCHES=(
+	"${FILESDIR}/${P}-system-openal.patch"
+	"${FILESDIR}/${P}-system-stb.patch"
+	"${FILESDIR}/${P}-system-zstd.patch"
+)
+
 src_prepare() {
 	if [[ ${PV} != "9999" ]]; then
 		rmdir "${S}/3rdparty/asmjit/asmjit" || die
@@ -106,21 +107,12 @@ 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/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

next             reply	other threads:[~2025-07-07  8:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-07  8:57 David Roman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-07 21:24 [gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/files/, games-emulation/rpcs3/ David Roman
2025-08-27 14:02 David Roman
2025-10-02  8:47 David Roman

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5e5a043b0 dfblob:e0ea2bc86 dfblob:765593e0c dfblob:43e39720c
dfblob:0b8464e72 dfblob:765593e0c dfblob:43e39720c dfblob:0b8464e72
dfblob:bf9bf20e3 dfblob:55df1972f dfblob:bf9bf20e3 dfblob:55df1972f )
 OR (
bs:"[gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/files/, games-emulation/rpcs3/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1751848820.a1e7e45ebdbc7060c959c9aedc424e7ca920f0a9.davidroman@gentoo \
    --to=davidroman96@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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