gentoo auto-resync : 15:01:2024 - 23:10:08

6 files changed, 54 insertions, 12 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index f6270c91fe0a..fb4558872b17 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 367617db408e..245acd6189ab 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,10 +1,11 @@
+AUX ppsspp-1.15.4-backport-ce83fec.patch 722 BLAKE2B ef59ce8259977584c2f6c22c1cca3f32566a13369a7c5b815d9917688b327d1fbd9e0b4cebe3a287fe1d5fe52dc6b31500554bd3a223050c838045dc847fc9bc SHA512 a2ce80d8f73ea297833448c8f58c1d7807edd21e4b33634a18ff1b742b2451caa58ec4dbd204f9f2af4ccb485f51114fdbf7442dd3b943b864f447d51e972111
 AUX ppsspp-1.16-MIPSTables-fix-includes.patch 196 BLAKE2B 6043f05aab6e5b620017a41c5da49a153a70e45057712c034504c9c8e89583439608e23ba1ae4c508e2ab2f12cab99c5478979ad555089aad390abbd36fe67ca SHA512 fa9d66a5f3411452218d776373a54d426ab971d05cb4ccf2a7e36644e6ec4444162cb4d85c5a04a1f956cab6714b2e43027eae451af3e380fb2ac22ac9164159
 AUX ppsspp-CMakeLists-flags.patch 913 BLAKE2B 7bd5df94b51dad35325586f7ad23284436ba670a8c2218a4a6bfb28fb5a055240aeb0543fe331310a0d86d3661cbdf418689a592139ff832802ba1fabbd10fc3 SHA512 5b2ee899b2fbed7229d4abc027e2a010327be4d334e343f977319c475feaf2d180bd74d3640022d0175b11e8256035c828dd4cf03c8a5b9240c989b2d7f72fb7
 AUX ppsspp-disable-ccache-autodetection.patch 753 BLAKE2B aa580bb2c657830bb079618e83903c4a0e28aa13acd612592f58feae2b0ef98535ea6f7e3c76aa9e74004aa80367aea372aec443bb2b789d5f3e7359872ea34f SHA512 cbf1f6e9f200cfa3b51bb84e09206a85aaea38511c0036a24d5e12547c659019fe88fbf221d2f7ddbdb9f0129f8b0fabb24baa594c658ab5ab584a0a723bc1c4
 DIST ppsspp-1.15.4.tar.xz 51947468 BLAKE2B c6a5e621b02556b791ec41389f17dede63811c87ff628b8f1304ac950071b365ecc9be05f4042e4e3b81e77f5a14b6931577f08b0174fec821350a1d7eca4d6a SHA512 9d2c140b0d633e5ca6191aaf276b7e4f6d029f29d1313a45fb78ee3879fec09f57d816604c51474ab6fe9cde713787d5769e87466d3c3015fe6a9b195ff198d2
 DIST ppsspp-1.16.4.tar.xz 51110488 BLAKE2B 061090bfd646b0839de7aed8e4b249ac86353c8742cd293c8df5ffc0d93a67f960ff4836bc13b534ba34871719cea2dc485b7d14deaa17aa5ff3dd6f8663687e SHA512 6364bb821a456409c9ee20eb589d761aef02d7756063bd5faa035b856ca551db0675a65767a9ad09dc8eba5fda6ede8ea3eb384b6770570bd4925e11b8c05ac5
 DIST ppsspp-1.16.tar.xz 50656132 BLAKE2B 5149bd859134a76a191e0f144bdcefc4c521276ebb1390fe5e24eeeb1227b77bab0458a760f29aed5ba169d566f12d5226f2b50a19e44172f1ad98c4eb8f400f SHA512 d65a8c9fb5d7ff45a99f5852d1071029bc51c1e8bdb45b3e78d961a46587553db4465bbd97b301db54a94b60772359929524047f08de3067cd3336f5f7717826
-EBUILD ppsspp-1.15.4.ebuild 1399 BLAKE2B e23586f8504465887cf3ecb26991f1fe70ea2d3e871178f564b94bae62d746c54c79ee8e38e3eb4b518875ff68f7c51a74d8b6180098957ba9e4748f410bd927 SHA512 ec6834e59326a5def648b999dd488898639b6f379ae205e7ffa6d6a5dd40b0928b52a98781b4ae59057c858be5ca37ee84ef33e49069ae53664ad85d9b2cc074
-EBUILD ppsspp-1.16.4.ebuild 1521 BLAKE2B 049a66139fd9b62108cd2379d1b50d55065a407206373a45d4c452d1ec7ee754609a62e6685f748086f4d3b8729d7ad841429e05c6f8d062039ac7f183fef52e SHA512 93fb1aa9318ea1c2a74267ecb8690860ee1583c6c2584816d4639f04fe77ab3654df9cc0a02794d1086f43da244a67e9482608706dd32538229d1aabb0d54889
-EBUILD ppsspp-1.16.ebuild 1577 BLAKE2B 3a5d855859149a8893a7969ac7712ff9604aa70bf80e374d316760cd91a14991ad97027b0c9e8a6057faeab14a4d96a78c9020473655b9d288fed253248f4b8a SHA512 44d572badd060517ce0501889032f81004de7ed303f11cba92a14314c0d40e8353e3c5e8cd33329ff715ad50da2b25159e12362089250d7d2c06d0e25fba35ee
+EBUILD ppsspp-1.15.4.ebuild 1545 BLAKE2B 8e946a4d6ba410dc58f71fb79cd30b58644521ee1287bf0cf27c0fe96f44093445ba7c42d3d6449bcfd2c870ef58f458d3a83a14c7005a6112cd980a5a787898 SHA512 58d6df0028e5c966279339b48a27bba9207c7fe3b9495355118f3684d70a71d7522e2c5c80311035a828f7bcfc5d490b4224e80888dfd0db8beba41a1f5a43a1
+EBUILD ppsspp-1.16.4.ebuild 1667 BLAKE2B abb3abbd347487d5db0bd01c2ff162f1643910ec7081f165fdc894ccf4588c67739838cc485b9166ff6a4d5728d97f69dfb1eea673a74adc873868f730a98045 SHA512 c817913317ac122905f344f999417c7847e63292f47a1b16819322cc4726e23373e650a77f35f2ff068f86324e356c6fefff155f432507f89468ad40aa913387
+EBUILD ppsspp-1.16.ebuild 1723 BLAKE2B 40f2524c2b92d0c9dd508d5b9959abe83779ca6639c2d6900ff6b0c9bdfa1649e7bbe0d56ed37701d350a496a770498708854f6ac98dae3c0bbd3d42f804cc19 SHA512 50c8bfc5d4a6b30301a1db318cd225cc0c874e070ab01c3171568eafdfa686dbf8a1fcec65381c844f4b381dec81ffb56bd4c4acc3eea8b695eb0f19e9dbca32
 MISC metadata.xml 526 BLAKE2B 19d0378d36d2b1d81ce404a95d98488b54f4368c72a7397b6d7c9a444edec9c19d146295cfc247a75aca1e1b5d1643161a627b80ea76aa8d43189a5eb14380c2 SHA512 7a8c8a7c05acdc110422d7c38552c8106d1886a672e6bda1212ce9cba737ae5e89e6624010d5bc3149b8da7c061b10295a721c74e7377587ec52ec7be2237855
diff --git a/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch b/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch
new file mode 100644
index 000000000000..1eaf179142d3
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/915888
+https://github.com/hrydgard/ppsspp/commit/ce83fec20651222131ef9b88ba2dfb0554b66608
+
+From ce83fec20651222131ef9b88ba2dfb0554b66608 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
+Date: Sun, 29 Oct 2023 23:39:25 -0600
+Subject: [PATCH] Linux buildfix attempt
+
+---
+ unittest/TestThreadManager.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/unittest/TestThreadManager.cpp b/unittest/TestThreadManager.cpp
+index f6a11f2fa363..10a8b581b768 100644
+--- a/unittest/TestThreadManager.cpp
++++ b/unittest/TestThreadManager.cpp
+@@ -1,5 +1,6 @@
+ #include <thread>
+ #include <vector>
++#include <cstdio>
+ 
+ #include "Common/Log.h"
+ #include "Common/TimeUtil.h"
diff --git a/games-emulation/ppsspp/ppsspp-1.15.4.ebuild b/games-emulation/ppsspp/ppsspp-1.15.4.ebuild
index 653f672374ea..17b358731669 100644
--- a/games-emulation/ppsspp/ppsspp-1.15.4.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,8 +15,8 @@ SRC_URI="https://github.com/hrydgard/${PN}/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="discord qt5"
-RESTRICT="test"
+IUSE="discord qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/snappy:=
@@ -43,6 +43,7 @@ BDEPEND="${PYTHON_DEPS}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-CMakeLists-flags.patch
 	"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+	"${FILESDIR}"/${PN}-1.15.4-backport-ce83fec.patch
 )
 
 pkg_setup() {
@@ -60,6 +61,11 @@ src_configure() {
 		-DUSE_SYSTEM_ZSTD=ON
 		-DUSE_DISCORD=$(usex discord)
 		-DUSING_QT_UI=$(usex qt5)
+		-DUNITTEST=$(usex test)
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	cmake_src_test -E glslang-testsuite
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.16.4.ebuild b/games-emulation/ppsspp/ppsspp-1.16.4.ebuild
index 6093ddbdd308..db6295a82e7b 100644
--- a/games-emulation/ppsspp/ppsspp-1.16.4.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,8 +21,8 @@ fi
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
 SLOT="0"
-IUSE="discord qt5"
-RESTRICT="test"
+IUSE="discord qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/snappy:=
@@ -53,6 +53,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-CMakeLists-flags.patch
 	"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+	"${FILESDIR}"/${PN}-1.15.4-backport-ce83fec.patch
 )
 
 pkg_setup() {
@@ -70,6 +71,11 @@ src_configure() {
 		-DUSE_SYSTEM_ZSTD=ON
 		-DUSE_DISCORD=$(usex discord)
 		-DUSING_QT_UI=$(usex qt5)
+		-DUNITTEST=$(usex test)
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	cmake_src_test -E glslang-testsuite
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.16.ebuild b/games-emulation/ppsspp/ppsspp-1.16.ebuild
index a8cbd4c208f8..9b2426f88e9c 100644
--- a/games-emulation/ppsspp/ppsspp-1.16.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,8 +21,8 @@ fi
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
 SLOT="0"
-IUSE="discord qt5"
-RESTRICT="test"
+IUSE="discord qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/snappy:=
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.16-MIPSTables-fix-includes.patch
 	"${FILESDIR}"/${PN}-CMakeLists-flags.patch
 	"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+	"${FILESDIR}"/${PN}-1.15.4-backport-ce83fec.patch
 )
 
 pkg_setup() {
@@ -71,6 +72,11 @@ src_configure() {
 		-DUSE_SYSTEM_ZSTD=ON
 		-DUSE_DISCORD=$(usex discord)
 		-DUSING_QT_UI=$(usex qt5)
+		-DUNITTEST=$(usex test)
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	cmake_src_test -E glslang-testsuite
+}