From 34c28cf7a3974daaa331a2d5248386b202eef442 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 21 Dec 2023 02:50:26 +0100 Subject: emulators/yuzu: unbreak build after ceff15f0052b CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Vulkan: Found unsuitable version "1.3.266", but required is at least "1.3.274" (found /usr/local/lib/libvulkan.so, found components: glslc glslangValidator) Reported by: pkg-fallout (direct commit to 2023Q4 as 1092b9183b10 is missing on the branch) --- emulators/yuzu/files/patch-vk256 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 emulators/yuzu/files/patch-vk256 diff --git a/emulators/yuzu/files/patch-vk256 b/emulators/yuzu/files/patch-vk256 new file mode 100644 index 000000000000..8e3ab633784c --- /dev/null +++ b/emulators/yuzu/files/patch-vk256 @@ -0,0 +1,26 @@ +Revert https://github.com/yuzu-emu/yuzu/pull/12414 until 2024Q1 branches + +--- CMakeLists.txt.orig 2023-12-20 17:46:50 UTC ++++ CMakeLists.txt +@@ -305,7 +305,7 @@ if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) + find_package(zstd 1.5 REQUIRED) + + if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) +- find_package(Vulkan 1.3.274 REQUIRED) ++ find_package(Vulkan 1.3.256 REQUIRED) + endif() + + if (ENABLE_LIBUSB) +--- src/video_core/vulkan_common/vulkan_wrapper.cpp.orig 2023-12-20 17:46:50 UTC ++++ src/video_core/vulkan_common/vulkan_wrapper.cpp +@@ -377,8 +377,10 @@ const char* ToString(VkResult result) noexcept { + return "VK_OPERATION_DEFERRED_KHR"; + case VkResult::VK_OPERATION_NOT_DEFERRED_KHR: + return "VK_OPERATION_NOT_DEFERRED_KHR"; ++#ifdef VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION + case VkResult::VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR: + return "VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR"; ++#endif + case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT: + return "VK_PIPELINE_COMPILE_REQUIRED_EXT"; + case VkResult::VK_RESULT_MAX_ENUM: -- cgit v1.2.3