From 28b11d866e33d24b3f255cb8fe512ccf06498f44 Mon Sep 17 00:00:00 2001 From: yajatkaul Date: Fri, 24 Apr 2026 21:32:53 +0530 Subject: [PATCH 1/7] added vk-bootstrap lib to packages --- releases.json | 8 +++++++ .../packagefiles/vk-bootstrap/meson.build | 22 +++++++++++++++++++ subprojects/vk-bootstrap.wrap | 9 ++++++++ 3 files changed, 39 insertions(+) create mode 100644 subprojects/packagefiles/vk-bootstrap/meson.build create mode 100644 subprojects/vk-bootstrap.wrap diff --git a/releases.json b/releases.json index 27670f15b8..98f5ba92e8 100644 --- a/releases.json +++ b/releases.json @@ -4809,6 +4809,14 @@ "2.3.0-1" ] }, + "vk-bootstrap": { + "dependency_names": [ + "vk-bootstrap" + ], + "versions": [ + "1.4.349-1" + ] + }, "vo-aacenc": { "dependency_names": [ "vo-aacenc" diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build new file mode 100644 index 0000000000..f2bba6bb2f --- /dev/null +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -0,0 +1,22 @@ +project( + 'vk-bootstrap', + 'cpp', + version: '8.2.4', + license: 'MIT', + meson_version: '>=0.56.0', +) + +vk_bootstrap_inc = include_directories('src') + +vk_bootstrap_lib = static_library( + 'vk-bootstrap', + ['src/VkBootstrap.cpp'], + include_directories: vk_bootstrap_inc +) + +vk_bootstrap_dep = declare_dependency( + include_directories: vk_bootstrap_inc, + link_with: vk_bootstrap_lib +) + +meson.override_dependency('vk-bootstrap', vk_bootstrap_dep) \ No newline at end of file diff --git a/subprojects/vk-bootstrap.wrap b/subprojects/vk-bootstrap.wrap new file mode 100644 index 0000000000..b6862268c8 --- /dev/null +++ b/subprojects/vk-bootstrap.wrap @@ -0,0 +1,9 @@ +[wrap-file] +directory = vk-bootstrap-1.4.349 +source_url = https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v1.4.349.tar.gz +source_filename = vk-bootstrap-1.4.349.tar.gz +source_hash = 0db474bcd9417bbcc40f66bb3b65d3179d48373ff979b604172ca5b670eb5b04 +patch_directory = vk-bootstrap + +[provide] +dependency_names = vk-bootstrap \ No newline at end of file From e0be503ed11327047a6ef8d71e062aa23ff57be0 Mon Sep 17 00:00:00 2001 From: yajatkaul Date: Fri, 24 Apr 2026 21:42:51 +0530 Subject: [PATCH 2/7] fixed formatting --- releases.json | 2 +- .../packagefiles/vk-bootstrap/meson.build | 22 +++++++++---------- subprojects/vk-bootstrap.wrap | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/releases.json b/releases.json index 98f5ba92e8..e34381180a 100644 --- a/releases.json +++ b/releases.json @@ -4812,7 +4812,7 @@ "vk-bootstrap": { "dependency_names": [ "vk-bootstrap" - ], + ], "versions": [ "1.4.349-1" ] diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build index f2bba6bb2f..06514915c4 100644 --- a/subprojects/packagefiles/vk-bootstrap/meson.build +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -1,22 +1,22 @@ project( - 'vk-bootstrap', - 'cpp', - version: '8.2.4', - license: 'MIT', - meson_version: '>=0.56.0', + 'vk-bootstrap', + 'cpp', + version: '8.2.4', + license: 'MIT', + meson_version: '>=0.56.0', ) vk_bootstrap_inc = include_directories('src') vk_bootstrap_lib = static_library( - 'vk-bootstrap', - ['src/VkBootstrap.cpp'], - include_directories: vk_bootstrap_inc + 'vk-bootstrap', + ['src/VkBootstrap.cpp'], + include_directories: vk_bootstrap_inc, ) vk_bootstrap_dep = declare_dependency( - include_directories: vk_bootstrap_inc, - link_with: vk_bootstrap_lib + include_directories: vk_bootstrap_inc, + link_with: vk_bootstrap_lib, ) -meson.override_dependency('vk-bootstrap', vk_bootstrap_dep) \ No newline at end of file +meson.override_dependency('vk-bootstrap', vk_bootstrap_dep) diff --git a/subprojects/vk-bootstrap.wrap b/subprojects/vk-bootstrap.wrap index b6862268c8..f2575341eb 100644 --- a/subprojects/vk-bootstrap.wrap +++ b/subprojects/vk-bootstrap.wrap @@ -6,4 +6,4 @@ source_hash = 0db474bcd9417bbcc40f66bb3b65d3179d48373ff979b604172ca5b670eb5b04 patch_directory = vk-bootstrap [provide] -dependency_names = vk-bootstrap \ No newline at end of file +dependency_names = vk-bootstrap From e0b0fe1e16f7fe6f478920aa4a76c62b125a7852 Mon Sep 17 00:00:00 2001 From: yajatkaul Date: Fri, 24 Apr 2026 22:11:20 +0530 Subject: [PATCH 3/7] added vulkan dep --- subprojects/packagefiles/vk-bootstrap/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build index 06514915c4..ade1592a00 100644 --- a/subprojects/packagefiles/vk-bootstrap/meson.build +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -8,15 +8,23 @@ project( vk_bootstrap_inc = include_directories('src') +vulkan_dep = dependency( + 'vulkan', + required: true, + fallback: ['VulkanHeaders'], +) + vk_bootstrap_lib = static_library( 'vk-bootstrap', ['src/VkBootstrap.cpp'], include_directories: vk_bootstrap_inc, + dependencies: [vulkan_dep], ) vk_bootstrap_dep = declare_dependency( include_directories: vk_bootstrap_inc, link_with: vk_bootstrap_lib, + dependencies: [vulkan_dep], ) meson.override_dependency('vk-bootstrap', vk_bootstrap_dep) From a114d1c9724051603b8cdf9e12926cc9f48ccf8e Mon Sep 17 00:00:00 2001 From: yajatkaul Date: Fri, 24 Apr 2026 22:19:23 +0530 Subject: [PATCH 4/7] fixed fallback --- subprojects/packagefiles/vk-bootstrap/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build index ade1592a00..9d5d7f9b3a 100644 --- a/subprojects/packagefiles/vk-bootstrap/meson.build +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -11,7 +11,7 @@ vk_bootstrap_inc = include_directories('src') vulkan_dep = dependency( 'vulkan', required: true, - fallback: ['VulkanHeaders'], + fallback: ['vulkan-headers', 'vulkan_headers_dep'], ) vk_bootstrap_lib = static_library( From 4a7a440cfdd4a4e4b5f4dd8d721175a8cd6b9e60 Mon Sep 17 00:00:00 2001 From: yajatkaul Date: Fri, 24 Apr 2026 22:24:07 +0530 Subject: [PATCH 5/7] fixed version number ;-; --- subprojects/packagefiles/vk-bootstrap/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build index 9d5d7f9b3a..b7fab0dc8c 100644 --- a/subprojects/packagefiles/vk-bootstrap/meson.build +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -1,7 +1,7 @@ project( 'vk-bootstrap', 'cpp', - version: '8.2.4', + version: '1.4.349', license: 'MIT', meson_version: '>=0.56.0', ) From 2819ebd334c0c46365d2a64495d3a8a3124a022a Mon Sep 17 00:00:00 2001 From: yajatkaul Date: Fri, 24 Apr 2026 22:32:33 +0530 Subject: [PATCH 6/7] c++17 option --- subprojects/packagefiles/vk-bootstrap/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build index b7fab0dc8c..e4e5a3e63c 100644 --- a/subprojects/packagefiles/vk-bootstrap/meson.build +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -4,6 +4,7 @@ project( version: '1.4.349', license: 'MIT', meson_version: '>=0.56.0', + default_options: ['cpp_std=c++17'], ) vk_bootstrap_inc = include_directories('src') From fe40b93690851e73d87692315ad8d9a5ff05d920 Mon Sep 17 00:00:00 2001 From: YajatKaul Date: Fri, 24 Apr 2026 22:46:29 +0530 Subject: [PATCH 7/7] Update meson version requirement to 0.63.0 --- subprojects/packagefiles/vk-bootstrap/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/vk-bootstrap/meson.build b/subprojects/packagefiles/vk-bootstrap/meson.build index e4e5a3e63c..4e9cdad895 100644 --- a/subprojects/packagefiles/vk-bootstrap/meson.build +++ b/subprojects/packagefiles/vk-bootstrap/meson.build @@ -3,7 +3,7 @@ project( 'cpp', version: '1.4.349', license: 'MIT', - meson_version: '>=0.56.0', + meson_version: '>=0.63.0', default_options: ['cpp_std=c++17'], )