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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 705B815802C for ; Mon, 16 Dec 2024 23:55:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6910CE0769; Mon, 16 Dec 2024 23:55:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 03B4CE07D0 for ; Mon, 16 Dec 2024 23:55:30 +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 1C77D33C1EB for ; Mon, 16 Dec 2024 23:55:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87FA41F9A for ; Mon, 16 Dec 2024 23:55:26 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1734363108.348a0f435e29a8766c4672a442f3e4b1659671a6.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-emulation/rpcs3/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/rpcs3/metadata.xml games-emulation/rpcs3/rpcs3-9999.ebuild X-VCS-Directories: games-emulation/rpcs3/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 348a0f435e29a8766c4672a442f3e4b1659671a6 X-VCS-Branch: master Date: Mon, 16 Dec 2024 23:55:26 +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: f3d8ff06-1724-43c4-9c32-7b4012beab26 X-Archives-Hash: be88511eef945c21ccd16832e1dab6e1 commit: 348a0f435e29a8766c4672a442f3e4b1659671a6 Author: Takuya Wakazono gmail com> AuthorDate: Mon Dec 16 15:31:48 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Mon Dec 16 15:31:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=348a0f43 games-emulation/rpcs3: update live - add fusion submodule - add opencv USE flag - fix build with GCC 15 Closes: https://bugs.gentoo.org/946346 Signed-off-by: Takuya Wakazono gmail.com> games-emulation/rpcs3/metadata.xml | 1 + games-emulation/rpcs3/rpcs3-9999.ebuild | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/games-emulation/rpcs3/metadata.xml b/games-emulation/rpcs3/metadata.xml index 64cbd48f9..65cadeec8 100644 --- a/games-emulation/rpcs3/metadata.xml +++ b/games-emulation/rpcs3/metadata.xml @@ -9,6 +9,7 @@ Enables Discord Rich Presence Add faudio sound backend support Use llvm backend for PPU cache generation + Enable PS Move support Build vulkan renderer diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild index b7d0273b2..3b0817ab4 100644 --- a/games-emulation/rpcs3/rpcs3-9999.ebuild +++ b/games-emulation/rpcs3/rpcs3-9999.ebuild @@ -20,6 +20,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl' '3rdparty/SoundTouch/soundtouch' '3rdparty/zstd/zstd' '3rdparty/stblib/stb' '3rdparty/OpenAL/openal-soft' + '3rdparty/fusion/fusion' ) # Delete sources when ensuring yaml-cpp compiled with fexceptions EGIT_SUBMODULES+=( '3rdparty/yaml-cpp' ) @@ -40,7 +41,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="discord faudio +llvm vulkan wayland" +IUSE="discord faudio +llvm opencv vulkan wayland" DEPEND=" app-arch/p7zip @@ -52,6 +53,7 @@ DEPEND=" dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qtmultimedia:6 dev-qt/qtsvg:6 + media-libs/alsa-lib media-libs/cubeb media-libs/glew media-libs/libglvnd @@ -62,7 +64,9 @@ DEPEND=" llvm-core/llvm:= sys-libs/zlib virtual/libusb:1 + x11-libs/libX11 faudio? ( app-emulation/faudio ) + opencv? ( media-libs/opencv ) vulkan? ( media-libs/vulkan-loader[wayland?] ) wayland? ( dev-libs/wayland ) " @@ -124,6 +128,10 @@ src_prepare() { # sed -i -e 's/3rdparty::yaml-cpp/yaml-cpp/' rpcs3/Emu/CMakeLists.txt \ # rpcs3/rpcs3qt/CMakeLists.txt || die + # Fix build with GCC 15 + # https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd + sed -i '//a#include ' 3rdparty/glslang/glslang/SPIRV/SpvBuilder.h || die + cmake_src_prepare } @@ -143,12 +151,13 @@ src_configure() { -DUSE_SYSTEM_ZLIB=ON -DUSE_DISCORD_RPC=$(usex discord) -DUSE_FAUDIO=$(usex faudio) + -DUSE_SYSTEM_OPENCV=$(usex opencv) -DUSE_VULKAN=$(usex vulkan) -DWITH_LLVM=$(usex llvm) + $(cmake_use_find_package wayland Wayland) ) # These options are defined conditionally to suppress QA notice use faudio && mycmakeargs+=( -DUSE_SYSTEM_FAUDIO=$(usex faudio) ) - use vulkan && mycmakeargs+=( $(cmake_use_find_package wayland Wayland) ) cmake_src_configure