From 032e5b983c7d3065d2baa338c8e489a88463e95b Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:35:32 -0400 Subject: [PATCH 1/3] vcpkg: Update vcpkg to 2023.02.24 --- externals/vcpkg | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/vcpkg b/externals/vcpkg index 9b22b40c6c..a7b6122f6b 160000 --- a/externals/vcpkg +++ b/externals/vcpkg @@ -1 +1 @@ -Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 +Subproject commit a7b6122f6b6504d16d96117336a0562693579933 diff --git a/vcpkg.json b/vcpkg.json index fbadca0e69..9aadd367cc 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "yuzu", - "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9", + "builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933", "version": "1.0", "dependencies": [ "boost-algorithm", From 877e8991c783c7f439091141ca45e5c7786cab16 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:35:56 -0400 Subject: [PATCH 2/3] CMakeLists: Update boost to 1.81.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6932b6fab9..61c95444fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,7 +210,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # ======================================================================= # Enforce the search mode of non-required packages for better and shorter failure messages -find_package(Boost 1.73.0 REQUIRED context) +find_package(Boost 1.81.0 REQUIRED context) find_package(enet 1.3 MODULE) find_package(fmt 9 REQUIRED) find_package(inih 52 MODULE COMPONENTS INIReader) From abe2ad7aacd50b82dfdd1c1fdbe8258e1872d1aa Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 22:16:05 -0400 Subject: [PATCH 3/3] zstd: Use ZSTD_getFrameContentSize instead of ZSTD_getDecompressedSize --- src/common/zstd_compression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index b71a41b78c..cb6ec171b5 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -33,7 +33,7 @@ std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_siz std::vector DecompressDataZSTD(std::span compressed) { const std::size_t decompressed_size = - ZSTD_getDecompressedSize(compressed.data(), compressed.size()); + ZSTD_getFrameContentSize(compressed.data(), compressed.size()); std::vector decompressed(decompressed_size); const std::size_t uncompressed_result_size = ZSTD_decompress(