From 47c4d0e3d66d148cf671e0a272915783ffb2dbfb Mon Sep 17 00:00:00 2001 From: ascpixi <44982772+ascpixi@users.noreply.github.com> Date: Sat, 9 Mar 2024 22:58:14 +0000 Subject: [PATCH] Revert "Update submodules" --- CMakeLists.txt | 14 +++++++------- externals/SDL | 2 +- externals/Vulkan-Headers | 2 +- externals/Vulkan-Utility-Libraries | 2 +- externals/VulkanMemoryAllocator | 2 +- externals/cubeb | 2 +- externals/dynarmic | 2 +- externals/ffmpeg/ffmpeg | 2 +- externals/opus | 2 +- externals/sirit | 2 +- externals/xbyak | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4d15639e..8c35b2229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,13 +292,13 @@ 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.80.0 REQUIRED context) +find_package(Boost 1.79.0 REQUIRED context) find_package(enet 1.3 MODULE) find_package(fmt 9 REQUIRED) find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle) find_package(lz4 REQUIRED) -find_package(nlohmann_json 3.11 REQUIRED) -find_package(Opus 1.4 MODULE) +find_package(nlohmann_json 3.8 REQUIRED) +find_package(Opus 1.3 MODULE) find_package(RenderDoc MODULE) find_package(SimpleIni MODULE) find_package(stb MODULE) @@ -307,7 +307,7 @@ find_package(ZLIB 1.2 REQUIRED) find_package(zstd 1.5 REQUIRED) if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) - find_package(VulkanHeaders 1.3.279 REQUIRED) + find_package(VulkanHeaders 1.3.274 REQUIRED) endif() if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES) @@ -315,11 +315,11 @@ if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES) endif() if (ENABLE_LIBUSB) - find_package(libusb 1.0.27 MODULE) + find_package(libusb 1.0.24 MODULE) endif() if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) - find_package(xbyak 7 CONFIG) + find_package(xbyak 6 CONFIG) endif() if (ARCHITECTURE_arm64) @@ -327,7 +327,7 @@ if (ARCHITECTURE_arm64) endif() if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) - find_package(dynarmic 6.7.0 CONFIG) + find_package(dynarmic 6.4.0 CONFIG) endif() if (ENABLE_CUBEB) diff --git a/externals/SDL b/externals/SDL index 790cd395f..cc016b004 160000 --- a/externals/SDL +++ b/externals/SDL @@ -1 +1 @@ -Subproject commit 790cd395f54f458303fb3b4a4f8ed4fd62719e55 +Subproject commit cc016b0046d563287f0aa9f09b958b5e70d43696 diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers index f030d9dd8..80207f9da 160000 --- a/externals/Vulkan-Headers +++ b/externals/Vulkan-Headers @@ -1 +1 @@ -Subproject commit f030d9dd8ca297b84b10330cee87f72acc3b0aab +Subproject commit 80207f9da86423ce33aff8328a792fd715f3c08f diff --git a/externals/Vulkan-Utility-Libraries b/externals/Vulkan-Utility-Libraries index ddf2f1a3b..524f8910d 160000 --- a/externals/Vulkan-Utility-Libraries +++ b/externals/Vulkan-Utility-Libraries @@ -1 +1 @@ -Subproject commit ddf2f1a3b0631f759b82ec4a1f17a418d73f684d +Subproject commit 524f8910d0e4a5f2ec5961996b23e5b74b95cb1d diff --git a/externals/VulkanMemoryAllocator b/externals/VulkanMemoryAllocator index 19b940e86..2f382df21 160000 --- a/externals/VulkanMemoryAllocator +++ b/externals/VulkanMemoryAllocator @@ -1 +1 @@ -Subproject commit 19b940e864bd3a5afb3c79e3c6788869d01a19eb +Subproject commit 2f382df218d7e8516dee3b3caccb819a62b571a2 diff --git a/externals/cubeb b/externals/cubeb index 5491fc8b2..48689ae7a 160000 --- a/externals/cubeb +++ b/externals/cubeb @@ -1 +1 @@ -Subproject commit 5491fc8b2708f80d007a39b86e6b21af90335884 +Subproject commit 48689ae7a73caeb747953f9ed664dc71d2f918d8 diff --git a/externals/dynarmic b/externals/dynarmic index 9d4582339..ba8192d89 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 9d4582339990d4eae53f1dc7160686920fc2075c +Subproject commit ba8192d89078af51ae6f97c9352e3683612cdff1 diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg index e6d933404..9c1294ead 160000 --- a/externals/ffmpeg/ffmpeg +++ b/externals/ffmpeg/ffmpeg @@ -1 +1 @@ -Subproject commit e6d933404ff1085b6c4ec031f736b1bee6e46b57 +Subproject commit 9c1294eaddb88cb0e044c675ccae059a85fc9c6c diff --git a/externals/opus b/externals/opus index c64ad657a..101a71e03 160000 --- a/externals/opus +++ b/externals/opus @@ -1 +1 @@ -Subproject commit c64ad657abf4d9f641a3d00cf83b987c55b00d02 +Subproject commit 101a71e03bbf860aaafb7090a0e440675cb27660 diff --git a/externals/sirit b/externals/sirit index 4ab79a8c0..ab7546399 160000 --- a/externals/sirit +++ b/externals/sirit @@ -1 +1 @@ -Subproject commit 4ab79a8c023aa63caaa93848b09b9fe8b183b1a9 +Subproject commit ab75463999f4f3291976b079d42d52ee91eebf3f diff --git a/externals/xbyak b/externals/xbyak index fc183427e..a1ac3750f 160000 --- a/externals/xbyak +++ b/externals/xbyak @@ -1 +1 @@ -Subproject commit fc183427e852a70fb98add1ba640020a53034bb0 +Subproject commit a1ac3750f9a639b5a6c6d6c7da4259b8d6790989