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 68B0B15800A for ; Tue, 25 Jul 2023 00:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DED6E08CD; Tue, 25 Jul 2023 00:10:42 +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 29E77E08CD for ; Tue, 25 Jul 2023 00:10:42 +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 736F7340F60 for ; Tue, 25 Jul 2023 00:10:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9080FDCF for ; Tue, 25 Jul 2023 00:10:37 +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: <1690243271.680e9eb4f6ba3553afb18c59c4a7922a8f9a07fd.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 680e9eb4f6ba3553afb18c59c4a7922a8f9a07fd X-VCS-Branch: master Date: Tue, 25 Jul 2023 00:10:37 +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: b831fbf4-e67e-4424-8f7b-9e1c4ac2662f X-Archives-Hash: 1a85cbb4ef664941050fcb949e0c508f commit: 680e9eb4f6ba3553afb18c59c4a7922a8f9a07fd Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jul 24 23:35:14 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jul 25 00:01:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680e9eb4 games-emulation/pcsx2: sync live Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-9999.ebuild | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 3af6a07551b2..7d24c2ae54cd 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -27,7 +27,8 @@ else -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz - )" + ) + " KEYWORDS="-* ~amd64" fi @@ -36,7 +37,8 @@ HOMEPAGE="https://pcsx2.net/" LICENSE=" GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ - ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain" + ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain +" SLOT="0" IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland" REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support @@ -67,22 +69,26 @@ COMMON_DEPEND=" pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) - wayland? ( dev-libs/wayland )" + wayland? ( dev-libs/wayland ) +" # patches is a optfeature but always pull given PCSX2 complaints if it # is missing and it is fairly small (installs a ~1.5MB patches.zip) RDEPEND=" ${COMMON_DEPEND} - games-emulation/pcsx2_patches" + games-emulation/pcsx2_patches +" DEPEND=" ${COMMON_DEPEND} x11-base/xorg-proto - test? ( dev-cpp/gtest )" + test? ( dev-cpp/gtest ) +" BDEPEND=" dev-qt/qttools:6[linguist] wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules - )" + ) +" FILECAPS=( -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 @@ -95,6 +101,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch "${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch "${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch + "${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch ) src_unpack() { @@ -118,7 +125,8 @@ src_unpack() { # also keep vulkan-headers to stay in sync $(usev vulkan ' 3rdparty/glslang/glslang - 3rdparty/vulkan-headers') + 3rdparty/vulkan-headers + ') ) git-r3_src_unpack @@ -158,7 +166,7 @@ src_prepare() { # TODO?: rapidjson and xbyak are packaged and could be unbundlable # w/ patch, and discord-rpc be optional w/ dependency on rapidjson cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd - lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis + lzma rapidjson rapidyaml rcheevos simpleini soundtouch xbyak zydis $(usev vulkan 'glslang vulkan-headers') ) find 3rdparty -mindepth 1 -maxdepth 1 -type d \