[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Samuel Bauer" <samuel.bauer@yahoo.fr>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/
Date: Thu,  2 Feb 2023 15:14:10 +0000 (UTC)	[thread overview]
Message-ID: <1675350825.d029a76c4c1534e19b7f4b6ceb4d55823328a61b.samuel.bauer@gentoo> (raw)

commit:     d029a76c4c1534e19b7f4b6ceb4d55823328a61b
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Feb  2 15:13:45 2023 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Feb  2 15:13:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d029a76c

games-emulation/yuzu-9999: allow to use current system vulkan headers

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 3e128ae0b..4d7d1e510 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -21,7 +21,7 @@ IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine
 RDEPEND="
 	<net-libs/mbedtls-3.1[cmac]
 	>=app-arch/zstd-1.5
-	>=dev-libs/libfmt-8:=
+	>=dev-libs/libfmt-9:=
 	>=dev-libs/openssl-1.1:=
 	>=media-video/ffmpeg-4.3:=
 	>=net-libs/enet-1.3
@@ -45,7 +45,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-cpp/cpp-httplib
 	dev-cpp/cpp-jwt
-	system-vulkan? ( >=dev-util/vulkan-headers-1.3.238 )
+	system-vulkan? ( >=dev-util/vulkan-headers-1.3.236 )
+	test? ( <dev-cpp/catch-3:0 )
 "
 BDEPEND="
 	>=dev-cpp/nlohmann_json-3.8.0
@@ -85,9 +86,6 @@ src_prepare() {
 	# temporary fix
 	sed -i -e '/Werror/d' src/CMakeLists.txt || die
 
-	# headers is not a valid boost component
-	sed -i -e '/find_package(Boost/{s/headers //;s/CONFIG //}' CMakeLists.txt || die
-
 	# Allow skip submodule downloading
 	rm .gitmodules || die
 
@@ -96,9 +94,6 @@ src_prepare() {
 	sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' src/yuzu_cmd/CMakeLists.txt || die
 	sed -i -e 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die
 
-	if use system-vulkan; then # 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 || die
-	fi
 
 	# Unbundle mbedtls
 	sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die
@@ -134,8 +129,15 @@ src_prepare() {
 	# LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9
 	sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die
 
-	# libfmt >= 9
-	sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die
+	sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die # libfmt >= 9
+
+	# Temporary use lastest gentoo vulkan
+	sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
+	sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
+		-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
+		-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
+		src/video_core/vulkan_common/vulkan_wrapper.cpp
+
 	cmake_src_prepare
 }
 
@@ -145,13 +147,15 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=OFF # dynarmic
 		-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list)
 		-DENABLE_CUBEB=$(usex cubeb)
+		-DENABLE_LIBUSB=ON
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_QT_TRANSLATION=$(usex qt5)
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
-		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON
+		-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=yes
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
 		-DYUZU_TESTS=$(usex test)
+		-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=$(use system-vulkan no yes)
 		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
 	)

next             reply	other threads:[~2023-02-02 15:14 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-02 15:14 Samuel Bauer [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-08  6:05 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/ Takuya Wakazono
2024-01-03 19:55 Moritz Brunner
2024-01-03 19:55 Moritz Brunner
2023-09-28  6:16 Samuel Bauer
2023-09-01 19:13 Samuel Bauer
2023-07-13  6:46 Samuel Bauer
2023-07-04 20:36 Samuel Bauer
2023-07-03 16:19 Samuel Bauer
2023-07-03 15:53 Samuel Bauer
2023-06-26 19:13 Henri Gasc
2023-06-15 13:03 YiFei Zhu
2023-02-14 11:32 Samuel Bauer
2023-02-14 11:11 Samuel Bauer
2023-02-13 11:28 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2023-02-13 11:19 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2023-02-13  0:10 Samuel Bauer
2023-02-05 18:26 Samuel Bauer
2023-02-05 18:15 Samuel Bauer
2023-02-02 20:02 Artemis Everfree
2022-12-21 10:03 Samuel Bauer
2022-12-21 10:03 Samuel Bauer
2022-12-21  4:23 Samuel Bauer
2022-12-19 22:42 Samuel Bauer
2022-11-13  1:06 Samuel Bauer
2022-10-12 12:03 Samuel Bauer
2022-09-09 13:49 Samuel Bauer
2022-09-08 10:24 Andrew Ammerlaan
2022-08-08 11:04 Samuel Bauer
2022-08-04 10:05 Samuel Bauer
2022-08-04 10:05 Samuel Bauer
2022-07-26 22:26 Samuel Bauer
2022-07-26  2:20 Samuel Bauer
2022-07-24 23:12 Samuel Bauer
2022-06-07 13:09 Samuel Bauer
2022-01-21  3:31 Samuel Bauer
2022-01-16  4:03 Samuel Bauer
2022-01-08  0:25 Samuel Bauer
2021-11-07 13:56 Anna Vyalkova
2021-10-06  8:14 Samuel Bauer
2021-08-20 22:21 Samuel Bauer
2021-08-04  0:36 Samuel Bauer
2021-08-04  0:30 Samuel Bauer
2021-07-13  1:52 Samuel Bauer
2021-06-26  1:16 Samuel Bauer
2021-06-05  0:57 Samuel Bauer
2021-05-30 19:21 Samuel Bauer
2021-05-30 19:06 Samuel Bauer
2021-05-30 18:55 Samuel Bauer
2021-05-25 18:24 Samuel Bauer
2021-05-16 13:50 Samuel Bauer
2021-05-03 16:41 Samuel Bauer
2021-04-30  1:10 Samuel Bauer
2021-04-29 14:19 Samuel Bauer
2021-04-29 12:53 Samuel Bauer
2021-04-28 23:34 Samuel Bauer
2021-04-28 23:11 Samuel Bauer
2021-04-28 20:09 Andrew Ammerlaan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3e128ae0 dfblob:4d7d1e51 )
 OR (
bs:"[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1675350825.d029a76c4c1534e19b7f4b6ceb4d55823328a61b.samuel.bauer@gentoo \
    --to=samuel.bauer@yahoo.fr \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox