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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7182D158094 for ; Tue, 20 Sep 2022 03:30:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 869E2E086D; Tue, 20 Sep 2022 03:30:34 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B74FE086D for ; Tue, 20 Sep 2022 03:30:34 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48371340997 for ; Tue, 20 Sep 2022 03:30:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DBA75B5 for ; Tue, 20 Sep 2022 03:30:31 +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: <1663644554.55c93c959734b5d180f2c35e9d3cefa5c81635e7.samuel.bauer@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/flycast/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/flycast/flycast-9999.ebuild X-VCS-Directories: games-emulation/flycast/ X-VCS-Committer: samuel.bauer X-VCS-Committer-Name: Samuel Bauer X-VCS-Revision: 55c93c959734b5d180f2c35e9d3cefa5c81635e7 X-VCS-Branch: dev Date: Tue, 20 Sep 2022 03:30:31 +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: aea50b0b-9438-444b-ae75-bc54347c2c4b X-Archives-Hash: 5126019723112ca82e5ded7dd8ec6e2d commit: 55c93c959734b5d180f2c35e9d3cefa5c81635e7 Author: Samuel Bauer yahoo fr> AuthorDate: Tue Sep 20 03:29:14 2022 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Tue Sep 20 03:29:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=55c93c95 games-emulation/flycast: changes to submodules and build system Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/flycast/flycast-9999.ebuild | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/games-emulation/flycast/flycast-9999.ebuild b/games-emulation/flycast/flycast-9999.ebuild index 8e597f576..eefcdbb67 100644 --- a/games-emulation/flycast/flycast-9999.ebuild +++ b/games-emulation/flycast/flycast-9999.ebuild @@ -10,7 +10,7 @@ inherit cmake git-r3 lua-single xdg DESCRIPTION="Sega Dreamcast, Naomi and Atomiswave emulator" HOMEPAGE="https://github.com/flyinghead/flycast" EGIT_REPO_URI="https://github.com/flyinghead/flycast" -EGIT_SUBMODULES=( 'core/deps/breakpad' ) +EGIT_SUBMODULES=( 'core/deps/breakpad' 'core/deps/volk' 'core/deps/VulkanMemoryAllocator' ) LICENSE="GPL-2" SLOT="0" @@ -81,6 +81,16 @@ src_prepare() { # Ensure static libs are not built sed -i -e '/BUILD_SHARED_LIBS/d' CMakeLists.txt + # Vulkan-header + sed -i -e '/add_subdirectory(core.*Vulkan-Headers)$/,/Vulkan::Headers/d' \ + -e '/core\/deps\/Vulkan-Headers\/include)/d' CMakeLists.txt + # local fix for < 1.3.224 + sed -i -e '/^1,$/d' core/rend/vulkan/compiler.cpp + sed -i -e '/swapchainExtent = /{s/= /&static_cast(/;s/;/);/}' core/rend/vulkan/vulkan_context.cpp + + # Do not use ccache + sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt + cmake_src_prepare }