Dylan Aïssi pushed to branch master at X Strike Force / vulkan / gfxreconstruct
Commits: 77753049 by Dylan Aïssi at 2026-03-09T17:18:49+01:00 Add libspirv-reflect-dev in Build-Depends Signed-off-by: Dylan Aïssi <[email protected]> - - - - - aee40fc6 by Dylan Aïssi at 2026-03-09T18:26:39+01:00 Import Use_system_SPIRV-Reflect.patch from Ubuntu and fix it Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 1ea10379 by Dylan Aïssi at 2026-03-09T18:26:48+01:00 Fix Use_system_OpenXR.patch Signed-off-by: Dylan Aïssi <[email protected]> - - - - - d315b6dd by Dylan Aïssi at 2026-03-09T18:26:48+01:00 Add spirv-headers in Build-Depends Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 4 changed files: - debian/control - debian/patches/Use_system_OpenXR.patch - + debian/patches/Use_system_SPIRV-Reflect.patch - debian/patches/series Changes: ===================================== debian/control ===================================== @@ -7,12 +7,14 @@ Build-Depends: debhelper-compat (= 13), cmake, liblz4-dev, libopenxr-dev, + libspirv-reflect-dev, libvulkan-dev (>= 1.3.283), libwayland-dev, libx11-xcb-dev, libxcb-keysyms1-dev, libxrandr-dev, libzstd-dev, + spirv-headers, zlib1g-dev Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/xorg-team/vulkan/gfxreconstruct ===================================== debian/patches/Use_system_OpenXR.patch ===================================== @@ -18,12 +18,13 @@ Forwarded: not-needed ) --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -407,8 +407,6 @@ +@@ -407,8 +407,7 @@ add_library(OpenXR INTERFACE) if (OPENXR_SUPPORT_ENABLED) option(DYNAMIC_LOADER "" OFF) - add_subdirectory(${PROJECT_SOURCE_DIR}/external/OpenXR-SDK) - target_include_directories(OpenXR INTERFACE ${PROJECT_SOURCE_DIR}/external/OpenXR-SDK/include) ++ find_package(OpenXR CONFIG REQUIRED) target_compile_definitions(OpenXR INTERFACE XR_NO_PROTOTYPES ENABLE_OPENXR_SUPPORT=1) endif() ===================================== debian/patches/Use_system_SPIRV-Reflect.patch ===================================== @@ -0,0 +1,36 @@ +Description: Use system spirv-reflect +Author: Mitchell Augustin <[email protected]> +--- + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -418,12 +418,26 @@ + ) + target_include_directories(vulkan_memory_allocator SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/external/VulkanMemoryAllocator/include) + +-# SPIRV-Reflect included as submodule -> libspirv-reflect-static.a ++# SPIRV-Reflect not included as submodule ++find_file(SPIRV_REFLECT_HEADER ++ spirv_reflect.h ++ HINTS /usr/include/spirv_reflect/ ++ NO_DEFAULT_PATH ++ NO_CMAKE_FIND_ROOT_PATH ++) ++ + set(SPIRV_REFLECT_EXAMPLES OFF) + set(SPIRV_REFLECT_EXECUTABLE OFF) +-set(SPIRV_REFLECT_STATIC_LIB ON) ++set(SPIRV_REFLECT_STATIC_LIB OFF) + set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +-add_subdirectory(external/SPIRV-Reflect EXCLUDE_FROM_ALL) ++ ++if (EXISTS ${SPIRV_REFLECT_HEADER}) ++ get_filename_component(SPIRV_REFLECT_INCLUDE_DIR ${SPIRV_REFLECT_HEADER} DIRECTORY) ++ include_directories(SYSTEM ${SPIRV_REFLECT_INCLUDE_DIR}) ++ add_compile_definitions(SPIRV_REFLECT_USE_SYSTEM_SPIRV_H) ++else() ++ message(FATAL_ERROR "Could not find system spirv_reflect.h. Ensure the necessary package is installed.") ++endif() + + if (${RUN_TESTS}) + add_library(catch2 INTERFACE) ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ Use_system_Vulkan.patch Use_system_OpenXR.patch +Use_system_SPIRV-Reflect.patch View it on GitLab: https://salsa.debian.org/xorg-team/vulkan/gfxreconstruct/-/compare/bdead716a72c7187126c76f690b8ca44d38b9188...d315b6dd252bcebc9723f63f3f2cd9e86970ddf4 -- View it on GitLab: https://salsa.debian.org/xorg-team/vulkan/gfxreconstruct/-/compare/bdead716a72c7187126c76f690b8ca44d38b9188...d315b6dd252bcebc9723f63f3f2cd9e86970ddf4 You're receiving this email because of your account on salsa.debian.org.
