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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E3F5B1382C5 for ; Tue, 25 May 2021 18:24:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26247E05AC; Tue, 25 May 2021 18:24:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D1FDE05AC for ; Tue, 25 May 2021 18:24:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8D84335DC3 for ; Tue, 25 May 2021 18:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 342F0597 for ; Tue, 25 May 2021 18:24:17 +0000 (UTC) From: "Samuel Bauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Samuel Bauer" Message-ID: <1621966966.8e03ef5c5b5f2a883a339f754ee41dc7b2398d52.samuel.bauer@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/yuzu/yuzu-9999.ebuild X-VCS-Directories: games-emulation/yuzu/ X-VCS-Committer: samuel.bauer X-VCS-Committer-Name: Samuel Bauer X-VCS-Revision: 8e03ef5c5b5f2a883a339f754ee41dc7b2398d52 X-VCS-Branch: dev Date: Tue, 25 May 2021 18:24:17 +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: 8f385a18-31d7-48f5-a570-6150a5c70bb8 X-Archives-Hash: 4f7f5f0bcf3e127023683e79cb20fbde commit: 8e03ef5c5b5f2a883a339f754ee41dc7b2398d52 Author: Samuel Bauer yahoo fr> AuthorDate: Tue May 25 17:33:37 2021 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Tue May 25 18:22:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e03ef5c games-emulation/yuzu: sdl detection + cosmetic changes Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-9999.ebuild | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 7db25934a..0f50d353d 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -85,14 +85,17 @@ src_prepare() { # sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt # Unbundle vulkan headers - sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt - sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp + sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt || die + sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die # Unbundle discord rapidjson sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' externals/discord-rpc/CMakeLists.txt || die - # media-libs/libsdl2: use 2.0.14 in tree - sed -i 's/2.0.15/2.0.14/' CMakeLists.txt + # Force disable bundled sdl2, use 2.0.14 in tree + if use sdl; then + sed -i '/find_package(SDL2/{s/2.0.15/2.0.14/;s/ QUIET//}' CMakeLists.txt || die + sed -i '/PS5_RUMBLE/d' src/input_common/sdl/sdl_impl.cpp + fi cmake_src_prepare } @@ -100,14 +103,15 @@ src_prepare() { src_configure() { local -a mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DENABLE_CUBEB=$(usex cubeb ON OFF) + -DENABLE_CUBEB=$(usex cubeb) -DENABLE_QT=$(usex qt5) -DENABLE_QT_TRANSLATION=$(usex qt5) -DENABLE_SDL2=$(usex sdl) - -DENABLE_WEB_SERVICE=$(usex webservice ON OFF) - -DUSE_DISCORD_PRESENCE=$(usex discord ON OFF) - -DYUZU_ENABLE_BOXCAT=$(usex boxcat ON OFF) - -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine ON OFF) + -DENABLE_WEB_SERVICE=$(usex webservice) + -DUSE_DISCORD_PRESENCE=$(usex discord) + -DYUZU_ALLOW_SYSTEM_SDL2=$(usex sdl) + -DYUZU_ENABLE_BOXCAT=$(usex boxcat) + -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF ) cmake_src_configure