From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F11E158041 for ; Sat, 13 Apr 2024 17:29:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 741D12BC013; Sat, 13 Apr 2024 17:29:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D22A2BC013 for ; Sat, 13 Apr 2024 17:29:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1DC13433B9 for ; Sat, 13 Apr 2024 17:29:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38F76AB7 for ; Sat, 13 Apr 2024 17:29:56 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1713029380.fa7a60f4742c5599d49d055bcbece43e3e3a3deb.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/files/, games-emulation/pcsx2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/files/ games-emulation/pcsx2/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: fa7a60f4742c5599d49d055bcbece43e3e3a3deb X-VCS-Branch: master Date: Sat, 13 Apr 2024 17:29:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87c1ee77-66f8-4167-8aa1-3b9f2efa0796 X-Archives-Hash: 0301c3968307414983be07b17a868ced commit: fa7a60f4742c5599d49d055bcbece43e3e3a3deb Author: Ionen Wolkens gentoo org> AuthorDate: Sat Apr 13 17:26:33 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Apr 13 17:29:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7a60f4 games-emulation/pcsx2: update live Signed-off-by: Ionen Wolkens gentoo.org> .../pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch | 18 ++++++++++++++++++ games-emulation/pcsx2/pcsx2-9999.ebuild | 1 + 2 files changed, 19 insertions(+) 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() {