gentoo auto-resync : 15:04:2024 - 12:04:02

6 files changed, 21 insertions, 74 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9e2ff9dd4f55..87a8872b0bf6 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index da9580b6af59..de019f38f813 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,7 +1,5 @@
 DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b SHA512 8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
 DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494 SHA512 96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797
-DIST dosbox-staging-0.81.1.tar.gz 7013870 BLAKE2B 60416ba06a4e003f50ccc56a4623450e604db7bb6d3d19f9127558c155c645f96b604556550b1ecb3de029b8f16ee485ba06b2dd4bd31373577b477989c40fb5 SHA512 61d3aec8234c90b01671d346b705c2b920370cc42bafd5aeb4d0810622e347249fa66e0cb9fba574645cef473331a9f2d33fdb87f41e8e053ef6034618544ba6
 EBUILD dosbox-staging-0.80.1.ebuild 1811 BLAKE2B a7ef588529ed71a39e7df1b91d2206ac6768f9f574d7e34d94026e43c69b8bfb7b46862bdb5d37233267adbf8435bb81d37414de57cc666213ded1b540d9bc31 SHA512 a7bd8057cddb0493abba883aa327f95d602c2f3503f18e6ac32a30f9761069455fbaac244a47f0454a422e03cdf6adfff68dc8e92c812b31aa3c7a90f4da5cbc
 EBUILD dosbox-staging-0.81.0.ebuild 1859 BLAKE2B 483aff5b7f552d445326b9b6e2f05488f1fe75ab89ce09d2aeeea6eacda7ed607ac53e0f02d2e95a1670028892035dd0458a08f4912adc9acbc7cb4fddadf060 SHA512 129512b540a315f06b8e3c7f225efab86b2567ecbfb1797e143afe484520d802832324297f40869be18eeff44ff3d056e4b2a4bd5cdc76ca4a7a9156a7cd1cfa
-EBUILD dosbox-staging-0.81.1.ebuild 1859 BLAKE2B 483aff5b7f552d445326b9b6e2f05488f1fe75ab89ce09d2aeeea6eacda7ed607ac53e0f02d2e95a1670028892035dd0458a08f4912adc9acbc7cb4fddadf060 SHA512 129512b540a315f06b8e3c7f225efab86b2567ecbfb1797e143afe484520d802832324297f40869be18eeff44ff3d056e4b2a4bd5cdc76ca4a7a9156a7cd1cfa
 MISC metadata.xml 907 BLAKE2B d4d1f88337a4cb5154de5bc532b82b0853d76629819dc29f43899e6c498108f5deb46ba9acbfbd0fd290790dd8bdbef2f0aae7079f5c3876004bde6f1d2f14eb SHA512 eb52e2b50ebb74b40cdd28af4ba8d3026ddcceba910729a275a92c5951ced7130b728e39338f22721b5873883e455283ee7747d3f0dcd49608e43931467c3528
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
deleted file mode 100644
index 8dc276da8126..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	fluidsynth? (
-		media-sound/fluid-soundfont
-		media-sound/fluidsynth
-	)
-	mt-32? ( media-libs/munt-mt32emu )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	slirp? ( net-libs/libslirp )
-	media-libs/iir1
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	media-libs/opusfile
-	media-libs/speexdsp
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS README THANKS )
-
-src_prepare() {
-	default
-
-	# We do not have default.sf2, use actual name from fluid-soundfont
-	sed -e "s/default.sf2/FluidR3_GM.sf2/" \
-		-i src/midi/midi_fluidsynth.cpp || die
-
-	# Disable license and docs install (handled by ebuild)
-	sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/926078
-	# https://github.com/dosbox-staging/dosbox-staging/issues/3519
-	filter-lto
-
-	# xinput2 comes with libsdl2[X]
-	local emesonargs=(
-		-Duse_xinput2=true
-		$(meson_use alsa use_alsa)
-		$(meson_use debug)
-		-Ddynamic_core=$(usex dynrec dynrec dyn-x86)
-		$(meson_use fluidsynth use_fluidsynth)
-		$(meson_use mt-32 use_mt32emu)
-		$(meson_use network use_sdl2_net)
-		$(meson_use opengl use_opengl)
-		$(meson_use slirp use_slirp)
-		$(meson_feature test unit_tests)
-	)
-	meson_src_configure
-}
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 727e9be2b1b7..0ca6132e8ce9 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,10 +1,11 @@
 AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83
 AUX pcsx2-1.7.5232-cubeb-automagic.patch 774 BLAKE2B a932e49643df613710c27c8f0881c6e2b9c2d90964ff7f88b48b3ec5ad281bbd152fbede638accc054ea5935401ef240ed0bf8107fe1c10997242ea546b93699 SHA512 5985f08a2acce8ccbe946a7c5bd85b2388ad7166b0243a7e698c96990a3856660c1f353bc74a9ced0e5ff08f10e27922e05eb77fabff1e797166b7d6a4c445a7
+AUX pcsx2-1.7.5700-vanilla-shaderc.patch 751 BLAKE2B d7dde7c368c2231b2876d1e42ae1306f413bcc795a15514e3cbe15bedccc667a60d9ac09b8559ee48513fb144732937bc69e5d722523fb6a3353adebd7ae8464 SHA512 975d490772a7552f748afbc37fddb7acbd3b33e58799b0b4527b24b6d7335436739e8c544a1eee4c73240029a5bd691e318e953c1d9a33e0630061d69a038837
 DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B 2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d SHA512 261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0
 DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
 DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
 EBUILD pcsx2-1.7.5474.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
 EBUILD pcsx2-1.7.5560.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
 EBUILD pcsx2-1.7.5624.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
-EBUILD pcsx2-9999.ebuild 4408 BLAKE2B 2842a5eaa8c0f614dd20139a630cae879d6fce0335e38ab11088bf18e9b388d1174a50f5108dca9cd03fd4162a6f4580b7f52760b3d5e387200ad92fe8d6e60a SHA512 ad52dc00468ce866dc7b4e7ea6b4787a16d8a6bc337d978d3a8ff0c329eed23de5bab3461ca4beb5bfc629698b96cedaa9c5bdf54d89a6d951a95cd9a81e3f27
+EBUILD pcsx2-9999.ebuild 4460 BLAKE2B 11423586880808e8eff1b34b2b2eabf7100dff87951997e617223f78b45a422ad947b99f7eededa23aeb323849ae06f1b8f2444e6b23a0c49110e63c28e42b0f SHA512 c85ae02a5f6739b670d33c59b1ffefd4b5c2011306297a47b46bfd7a29d5f2288334e278ad9acc735defea32bdc544a5d067791a61ec1bf4cc89c9b164e80cd6
 MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
new file mode 100644
index 000000000000..aa447b30b6fc
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch
@@ -0,0 +1,18 @@
+This does not exist in normal shaderc and was modified[1] by PCSX2
+for use in their CI/appimage making it impossible to use system's
+(despite they do not bundle it). So not much choices but to remove
+usage.
+
+Partial (for simplification) revert of [2], hopefully temporary.
+
+[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646
+[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260
+--- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
++++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp
+@@ -113,6 +113,4 @@
+ 	{
+ 		options.SetGenerateDebugInfo();
+-		if (GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info)
+-			options.SetEmitNonSemanticDebugInfo();
+ 
+ 		options.SetOptimizationLevel(shaderc_optimization_level_zero);
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 2ca40ad4ee99..b1a0cb87549d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch
 )
 
 src_prepare() {