games-emulation/rpcs3: add include header patch

RPCS3/rpcs3#15075 Related: #259 Signed-off-by: Andrew Udvare <audvare@gmail.com>
Tatsh · Jan 24, 2024 · 3b8f559 · 3b8f559
1 parent 506526c
commit 3b8f559
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/games-emulation/rpcs3/Manifest b/games-emulation/rpcs3/Manifest
@@ -7,12 +7,13 @@ AUX rpcs3-0006-support-for-system-miniupnpc.patch 2005 BLAKE2B 79fb71057ff9cc64d
 AUX rpcs3-0007-remove-extra.patch 782 BLAKE2B 0ff7bcba39eb7cf715fd19f52c45670bb88bd3f50e69df9f515c65224bbf2748ca3e195a98a8f57cb7d4fa67fd5993ccf2733a901787f862a1c471b520dbd3d6 SHA512 4c99b0a494d411c238a6786806e1f8c6e615f2caeee4cdacbad0131fb74205a8e813aea9463caad7ad87045fb41a862ae0921e569da9f160f03c2151a087970c
 AUX rpcs3-0008-allow-system-rtmidi.patch 1114 BLAKE2B 7397ea8e74c1c099ed41d334bd87280fabd4148d5c77b2589cef7c920623041cde6f052782bb08c08371e01b3b80b0ae12d4bfda7143a7d077e08458d0819e0c SHA512 e85cc12c2807a353ed3d02e7151fdedd36789e0c03b0d035330dd0b78de1f65f4b76ab0f361c71102a3ee1e600889bbf7af3fcf237994a00464df311f345ae26
 AUX rpcs3-0009-add-missing-glslang-incl.patch 426 BLAKE2B 5ef4d2da82d988226cd58fbc30590766bb772432322f86607a1e51cada378a74abf967530ca92d29ea3d5f16e35faf8653a760e24bccec7b648ce80add22a727 SHA512 e2707356f6a8959e3c6147a3b702325dc09f67060b949a77dd588baa969fe1baf9166a22506fae0e47899c918745ef9b7d8eff45414891f4d3e301b1ba12e53f
+AUX rpcs3-0010-pr-15075.patch 1264 BLAKE2B e0028bd371ae94d8ccf86aedff76f33b5f6fa302ab2bad4b5ef2d6ff7ded2d405761ed3344bf8580020afeada586f964a858f7647af3f6a488e72516a7b3f6c2 SHA512 b47a892d6d3303045a9109c7f1580bcf51c82aced7013984fe15548edb2335c92775e4e1c4a2c1bdccc21a4808eb18bf087e06d7a1508e7887ca26189980d45c
 DIST glslang-36d08c0.tar.gz 3769785 BLAKE2B 923bfada8484a3bb91dd92a242d7096017b77fd399a90052af121658221069215e277d51fb4b9b95821b9272e44618f91883c2dc49bfb671c52a941d54aec182 SHA512 184baa0bc22d5e79bf8424692b5c8bb51676ca20819551cf406a4fd898dd1ad5ca7296e26ce7b99878e627dcafc4cd435933dd939c91753c5050022052e1dbe5
 DIST rpcs3-0.0.30.tar.gz 8999782 BLAKE2B ece84a0bf2939beb0d4d53987b04350bfefd091b2537ea3ac9b668fa14f81644234a9a0127ffd002414f61e6628e849e561cc9551efd5c56bd1919cd3f02f2d9 SHA512 4c4f434683e32a84de64036f8fd78b4a917dfeca5affd2a37a8360fc2f3484a3a6d3765e9a749c990f1e7f881da6cfbddfeacaf4cc8b363239942cd5635a8682
 DIST rpcs3-asmjit-416f735.tar.gz 1152383 BLAKE2B 17b054083ce178255f19026d175986225f6f803a21e0cef4ce9a557ac50057578d3ae76d3b179fe25d0febd5e05d5d5feb28f9761045a8e41497b92a966196ec SHA512 2be4de27b2ed2212cf7b6ef9d40afac5c00f7a71df4e60208ea57258c01e56413cee439f84490d605f44a835522d1c1a55de898feccdd4429e907a9f82edd7cb
 DIST rpcs3-ced3ce8.tar.gz 582517 BLAKE2B b85278615b9991b45839af2d883898cdded263cbe129e8647832c2eed8e6414c4c2c1e2cc11d41a6caf3821d15b793c65422dbcaebe25f5a0212cf395d4dce21 SHA512 89a69ddda553edcc683f416426a393205c66cdbe3afd5f6b2c679dfd962dfafe0984a7d277da1f1c962b9f243cf2eb8f93a543755c1ac83f203783c0bd8ac673
 DIST rpcs3-hidapi-8b43a97.tar.gz 349041 BLAKE2B f97011530cf94c31cac192c3a78151ebde1a25f77afdea634706648c108919ff33dff40eb127b18c1bd4f2e08dea565ccd6716be76813981ee2333242a136197 SHA512 643f2422f1718ae5633297468fd9257fbe9feb6ba47c85161d282df087413a501dd9c223762427df9455b886006c2bb8346cbe4bf3be63d9b9a04ef7207414af
 DIST rpcs3-ittapi-3.18.12.tar.gz 128417 BLAKE2B b2ca4f347d3ba0e4dbcdaf2f0f3bc53088d75d7dc08044d32e96808d95435ef10a476863a21973e34281a901d7410d1c0ef8723745db17f9460919c63e1f239f SHA512 fe819ed535c5477642e705fc10ca0eb63a91cca75ea008c388cbd15d1ec0f67e10f1ae291f76f33cad6707c7c77f36044d9e8a59b99eead9f645e2e689e707da
 DIST rpcs3-yaml-cpp-456c68f.tar.gz 1019142 BLAKE2B 8c7b4e1c788a07c1092be813555b1774a713693dd995183671d60b1896f96e105631447cb8c69bbcb13c380388b632d38a2c59be19903bc259ae6b57a181612a SHA512 0d06856bacb6c3cb987299c650baffcb2647a4b9a53394a7ce5c75301b527574d41cb0dfe9bf2e997e04588786d5aa7232437472a2e5fec422e8aa56aba0ea14
-EBUILD rpcs3-0.0.30-r2.ebuild 4733 BLAKE2B 02a35b43a33f8f94cf53f9c3a0a6b12351291f9f48c704e794b76e7f48f9dd8f5aba63c523493806bd842bc9d3da32502d87a84d9fa1a230d3ab3369efdc0050 SHA512 5cc4c921d992998cb3a3c5c1071c7a6b2f368907ad58fc0018d82e4f54239af762fcab6dfe07f078ba9ac5f11035a70f2e86f8e1f0cb7ec862f42c1bde81b2c9
+EBUILD rpcs3-0.0.30-r2.ebuild 4701 BLAKE2B bae720c2d8da1ba11e34095b678f25e60fa10014b0783578b21e1628d6fd64f0779e434e0c9a0b128298c0a7a0d8f19a0724ac32e53cb8526736981cfe933f2a SHA512 afdf5849321ac898eb984e3ab4f39f287564dd653dda1577fa9cfcb1995cdfd34276131cfe26a77ea2638c2c3a64d007c7c486a1781e2508ed31efc5e8d69cce
 MISC metadata.xml 609 BLAKE2B 57cc7af451b10f5184d67d98f45ca728de247dd480c6d2a10dda77da823b71ab88ae766f6ddfd565a51924703e3efd179fab0d87a3416623ebbff5b76ad079eb SHA512 4430cbe2e32908bd058329ff2faebf6e6cafc316d7c762229fa6f267ce3497af5d6f87da8fa83934fdadc60fb7f5ee68efe0a8e635ebd8471b34e8935464a708
diff --git a/games-emulation/rpcs3/files/rpcs3-0010-pr-15075.patch b/games-emulation/rpcs3/files/rpcs3-0010-pr-15075.patch
@@ -0,0 +1,40 @@
+From 93dfa3f69928dd96be64139b6d854ed7a6727b50 Mon Sep 17 00:00:00 2001
+From: pastalian <pastalian46@gmail.com>
+Date: Sun, 21 Jan 2024 17:41:16 +0900
+Subject: [PATCH] Add missing headers
+
+Some systems must explicitly include these headers.
+---
+ 3rdparty/pine/pine_server.h | 2 --
+ Utilities/JITASM.cpp        | 1 +
+ Utilities/Thread.cpp        | 1 +
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/3rdparty/pine/pine_server.h b/3rdparty/pine/pine_server.h
+index d3cb323cbded..44f2ab708784 100644
+--- a/3rdparty/pine/pine_server.h
++++ b/3rdparty/pine/pine_server.h
+@@ -27,10 +27,8 @@
+ #include <sys/un.h>
+ #include <arpa/inet.h>
+ #include <poll.h>
+-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ #include <unistd.h>
+ #endif
+-#endif
+
+ #ifdef _WIN32
+ constexpr SOCKET invalid_socket = INVALID_SOCKET;
+
+diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
+index a81117e2d0a8..8e536c054191 100644
+--- a/Utilities/Thread.cpp
++++ b/Utilities/Thread.cpp
+@@ -46,6 +46,7 @@ DYNAMIC_IMPORT_RENAME("Kernel32.dll", SetThreadDescriptionImport, "SetThreadDesc
+ #include <time.h>
+ #endif
+ #ifdef __linux__
++#include <sys/syscall.h>
+ #include <sys/timerfd.h>
+ #include <unistd.h>
+ #endif
diff --git a/games-emulation/rpcs3/rpcs3-0.0.30-r2.ebuild → games-emulation/rpcs3/rpcs3-0.0.30-r3.ebuild b/games-emulation/rpcs3/rpcs3-0.0.30-r2.ebuild → games-emulation/rpcs3/rpcs3-0.0.30-r3.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0007-remove-extra.patch"
 	"${FILESDIR}/${PN}-0008-allow-system-rtmidi.patch"
 	"${FILESDIR}/${PN}-0009-add-missing-glslang-incl.patch"
+	"${FILESDIR}/${PN}-0010-pr-15075.patch"
 )
 
 src_prepare() {
@@ -103,9 +104,7 @@ src_configure() {
 	mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
 		-DBUILD_TESTING=OFF
-		-DUSE_PRECOMPILED_HEADERS=OFF
 		-DUSE_DISCORD_RPC=OFF
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
 		"-DUSE_FAUDIO=$(usex faudio)"
 		"-DUSE_SYSTEM_FAUDIO=$(usex faudio)"
 		"-DUSE_LIBEVDEV=$(usex joystick)"