From 795ccc058daf163a7d4dd341516ce2c6b20a1714 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Sun, 7 Aug 2022 17:00:47 -0400 Subject: [PATCH 1/2] vcpkg: Update and update fmt to 9.0.0 --- externals/vcpkg | 2 +- vcpkg.json | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/externals/vcpkg b/externals/vcpkg index cef0b3ec76..9b22b40c6c 160000 --- a/externals/vcpkg +++ b/externals/vcpkg @@ -1 +1 @@ -Subproject commit cef0b3ec767df6e83806899fe9525f6cf8d7bc91 +Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 diff --git a/vcpkg.json b/vcpkg.json index b247f73861..c4413e22ad 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "yuzu", - "builtin-baseline": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91", + "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9", "version": "1.0", "dependencies": [ "boost-algorithm", @@ -37,6 +37,10 @@ { "name": "catch2", "version": "2.13.9" + }, + { + "name": "fmt", + "version": "9.0.0" } ] } From e2123b27e8a17a743cdf446c3e9eef0126e0d069 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Sun, 7 Aug 2022 17:01:11 -0400 Subject: [PATCH 2/2] yuzu: Fix fmt 9.0.0 issues --- src/yuzu/bootmanager.cpp | 4 ++-- src/yuzu/main.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index ef3bdfb1a8..c262d0a2bb 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -1089,8 +1089,8 @@ QStringList GRenderWindow::GetUnsupportedGLExtensions() const { } if (!unsupported_ext.empty()) { - LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", - glGetString(GL_RENDERER)); + const std::string gl_renderer{reinterpret_cast(glGetString(GL_RENDERER))}; + LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", gl_renderer); } for (const QString& ext : unsupported_ext) { LOG_ERROR(Frontend, "Unsupported GL extension: {}", ext.toStdString()); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index dc7b343d95..6532806428 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3338,7 +3338,8 @@ void GMainWindow::MigrateConfigFiles() { } const auto origin = config_dir_fs_path / filename; const auto destination = config_dir_fs_path / "custom" / filename; - LOG_INFO(Frontend, "Migrating config file from {} to {}", origin, destination); + LOG_INFO(Frontend, "Migrating config file from {} to {}", origin.string(), + destination.string()); if (!Common::FS::RenameFile(origin, destination)) { // Delete the old config file if one already exists in the new location. Common::FS::RemoveFile(origin);