From ae8d387998510d8630857eb9a45f2d88eed59d96 Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Tue, 2 Jun 2020 11:50:19 +0200 Subject: [PATCH] Use vulkan-headers 1.2.142 from Warp DB Signed-off-by: Stephan Lachnit --- meson.build | 4 ++-- subprojects/vulkan-headers.wrap | 10 ++++++++++ subprojects/vulkanheaders.wrap | 10 ---------- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 subprojects/vulkan-headers.wrap delete mode 100644 subprojects/vulkanheaders.wrap diff --git a/meson.build b/meson.build index aaacc2af..c38b73cc 100644 --- a/meson.build +++ b/meson.build @@ -180,9 +180,9 @@ if dep_vulkan.found() endif vk_api_xml = files(datadir / 'vulkan/registry/vk.xml') else - vkh_sp = subproject('vulkanheaders') + vkh_sp = subproject('vulkan-headers') vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') - dep_vulkan = vkh_sp.get_variable('vulkanheaders_dep') + dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') endif vk_enum_to_str = custom_target( diff --git a/subprojects/vulkan-headers.wrap b/subprojects/vulkan-headers.wrap new file mode 100644 index 00000000..eca519fa --- /dev/null +++ b/subprojects/vulkan-headers.wrap @@ -0,0 +1,10 @@ +[wrap-file] +directory = Vulkan-Headers-1.2.142 + +source_url = https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.142.tar.gz +source_filename = v1.2.142.tar.gz +source_hash = 6770503b0e06bd45e8cb1dba1e40ad37097d1100c2de7cd45c07de3b2d383a3e + +patch_url = https://wrapdb.mesonbuild.com/v1/projects/vulkan-headers/1.2.142/1/get_zip +patch_filename = vulkan-headers-1.2.142-1-wrap.zip +patch_hash = ca4ebafdf6eff48261ac87ec674bf82bf2cb7e2aedf45ef1cf5ea6326e27c123 diff --git a/subprojects/vulkanheaders.wrap b/subprojects/vulkanheaders.wrap deleted file mode 100644 index c9a1cdee..00000000 --- a/subprojects/vulkanheaders.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory = Vulkan-Headers-1.2.139 - -source_url = https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.139.tar.gz -source_filename = vulkanheaders-1.2.139.tar.gz -source_hash = 1d12b73e6459b8c26a21a084a8a65b2edcdb79e6d892da96735d932424403456 - -patch_url = https://github.com/stephanlachnit/vulkanheaders-wrap/releases/download/v1.2.139/v1.2.139.zip -patch_filename = vulkanheaders-1.2.139-wrap.zip -patch_hash = 4fcdc3971d952515f21e59e185e35525b4db656de75f9fc61f6699056185808c