From 4e706deda71829ac7964ede0ee60675194bed0dc Mon Sep 17 00:00:00 2001 From: Andrea Pappacoda Date: Sat, 11 Feb 2023 12:29:15 +0100 Subject: [PATCH] d/control: build with vulkan >= 1.3.238 --- debian/control | 2 +- debian/patches/revert-vulkan-1.3.238.patch | 43 ---------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 debian/patches/revert-vulkan-1.3.238.patch diff --git a/debian/control b/debian/control index f6b0ac7..e9839e1 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends-Arch: catch2 (>= 2.13.7) , libswscale-dev, libusb-1.0-0-dev, libva-dev, - libvulkan-dev (>= 1.3.213), + libvulkan-dev (>= 1.3.238), libxbyak-dev [any-amd64], libzstd-dev (>= 1.5), llvm-dev, diff --git a/debian/patches/revert-vulkan-1.3.238.patch b/debian/patches/revert-vulkan-1.3.238.patch deleted file mode 100644 index f7f9a1d..0000000 --- a/debian/patches/revert-vulkan-1.3.238.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Revert Vulkan-Headers 1.3.238 requirement - They're not fully released yet as they are not part of the Vulkan SDK, - and are thus not packaged by Debian. - . - This reverts upstream commits 9f199c8b0b37cfb84084f4ee543e3829ab085b1a - and b60a93a9363da143c070887a5ddf741eb8dda544 -Author: Andrea Pappacoda -Bug-Debian: https://bugs.debian.org/1026768 -Forwarded: not-needed -Last-Update: 2023-01-07 - ---- yuzu-0-1299+ds.orig/CMakeLists.txt -+++ yuzu-0-1299+ds/CMakeLists.txt -@@ -213,7 +213,7 @@ find_package(ZLIB 1.2 REQUIRED) - find_package(zstd 1.5 REQUIRED) - - if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) -- find_package(Vulkan 1.3.238 REQUIRED) -+ find_package(Vulkan 1.3.213 REQUIRED) - endif() - - if (ENABLE_LIBUSB) ---- yuzu-0-1299+ds.orig/src/video_core/vulkan_common/vulkan_wrapper.cpp -+++ yuzu-0-1299+ds/src/video_core/vulkan_common/vulkan_wrapper.cpp -@@ -331,18 +331,6 @@ const char* ToString(VkResult result) no - return "VK_ERROR_VALIDATION_FAILED_EXT"; - case VkResult::VK_ERROR_INVALID_SHADER_NV: - return "VK_ERROR_INVALID_SHADER_NV"; -- case VkResult::VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: -- return "VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR"; -- case VkResult::VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: -- return "VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR"; -- case VkResult::VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR: -- return "VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR"; -- case VkResult::VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR: -- return "VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR"; -- case VkResult::VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR: -- return "VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR"; -- case VkResult::VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR: -- return "VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR"; - case VkResult::VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT: - return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT"; - case VkResult::VK_ERROR_FRAGMENTATION_EXT: diff --git a/debian/patches/series b/debian/patches/series index 8d5c04a..ffafdc2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,5 @@ cmake-mbedtls.patch #cmake-microprofile.patch # Debian-specific patches debian-git-revision.patch -revert-vulkan-1.3.238.patch revert-catch2-v3.patch include-utility-header.patch