diff --git a/sys-libs/vulkan/patches/vulkan-1.4.304.patchset b/sys-libs/vulkan/patches/vulkan-1.4.305.patchset similarity index 73% rename from sys-libs/vulkan/patches/vulkan-1.4.304.patchset rename to sys-libs/vulkan/patches/vulkan-1.4.305.patchset index c85bd2bf3..8c3027d73 100644 --- a/sys-libs/vulkan/patches/vulkan-1.4.304.patchset +++ b/sys-libs/vulkan/patches/vulkan-1.4.305.patchset @@ -1,11 +1,11 @@ -From ee6ab38f765ca0eff1070152e5b0b9710e10b284 Mon Sep 17 00:00:00 2001 +From d399012bae8d342536cedd6fff3a5f972f2f07ee Mon Sep 17 00:00:00 2001 From: X512 Date: Sun, 9 Jan 2022 06:34:23 +0900 Subject: basic fixes for haiku diff --git a/loader/loader.c b/loader/loader.c -index c35ecf2..988c81f 100644 +index 9deff68..b70e3fc 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -88,6 +88,17 @@ struct activated_layer_info { @@ -43,17 +43,17 @@ index 4f9133e..39e70bd 100644 2.45.2 -From c8cb3066686c6b496d000252f20b4ad1bbaf4c19 Mon Sep 17 00:00:00 2001 +From 1c2aac7af4d2b22d55e980de253941f431f1c448 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Fri, 6 Sep 2024 05:26:34 +0000 Subject: Improve port for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index c570367..1b8173f 100644 +index c9e000f..0db72d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -108,13 +108,14 @@ elseif(APPLE) +@@ -108,7 +108,7 @@ elseif(APPLE) if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") target_compile_definitions(platform_wsi INTERFACE VK_USE_PLATFORM_MACOS_MVK) endif() @@ -61,16 +61,17 @@ index c570367..1b8173f 100644 +elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|DragonFly|GNU|Haiku") option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) - option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON) - option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF) + option(BUILD_WSI_XLIB_XRANDR_SUPPORT "Build X11 Xrandr WSI support" ON) +@@ -155,6 +155,7 @@ endif() - find_package(PkgConfig REQUIRED QUIET) # Use PkgConfig to find Linux system libraries -+ include_directories("/sources-2/Vulkan-Headers-1.4.304/include") + add_library(loader_common_options INTERFACE) + target_link_libraries(loader_common_options INTERFACE platform_wsi) ++include_directories("/sources-2/Vulkan-Headers-1.4.305/include") - if(BUILD_WSI_XCB_SUPPORT) - pkg_check_modules(XCB REQUIRED QUIET IMPORTED_TARGET xcb) + # Enable beta Vulkan extensions + target_compile_definitions(loader_common_options INTERFACE VK_ENABLE_BETA_EXTENSIONS) diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index 23908ae..f6b8440 100644 +index 9a3b9c1..9104239 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -26,7 +26,7 @@ @@ -78,7 +79,7 @@ index 23908ae..f6b8440 100644 #pragma once -#if defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__)|| defined(__HAIKU__) #include #include #endif @@ -91,6 +92,15 @@ index 23908ae..f6b8440 100644 #define COMMON_UNIX_PLATFORMS 1 #else #define COMMON_UNIX_PLATFORMS 0 +@@ -353,7 +353,7 @@ static inline char *loader_platform_executable_path(char *buffer, size_t size) { + + return buffer; + } +-#elif defined(__Fuchsia__) || defined(__OpenBSD__) ++#elif defined(__Fuchsia__) || defined(__OpenBSD__) || defined(__HAIKU__) + static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; } + #elif defined(__QNX__) + -- 2.45.2 diff --git a/sys-libs/vulkan/vulkan-1.4.304.recipe b/sys-libs/vulkan/vulkan-1.4.305.recipe similarity index 94% rename from sys-libs/vulkan/vulkan-1.4.304.recipe rename to sys-libs/vulkan/vulkan-1.4.305.recipe index cd212fb33..73ab9528c 100644 --- a/sys-libs/vulkan/vulkan-1.4.304.recipe +++ b/sys-libs/vulkan/vulkan-1.4.305.recipe @@ -14,11 +14,11 @@ LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$portVersion.tar.gz" SOURCE_FILENAME="Vulkan-Loader-$portVersion.tar.gz" -CHECKSUM_SHA256="368d8281604a3f4dee038bfcc55c44e305031ec67f6e3fdd50cdeb83586c99f9" +CHECKSUM_SHA256="1f2992538ee6a9d7ff3e00fdc8dc0c3a03a6235ebb2a1b7ee2179a13bc1c5c06" SOURCE_DIR="Vulkan-Loader-$portVersion" SOURCE_URI_2="https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$portVersion.tar.gz" SOURCE_FILENAME_2="Vulkan-Headers-$portVersion.tar.gz" -CHECKSUM_SHA256_2="5e1a06b3f27e7581b55d1dea176fd97ee0a2f299406db2f437c1d2f297ceba5b" +CHECKSUM_SHA256_2="7581c5ed0337ffeef0707651561f722700081bc69c62c582c470cd77c2be0920" SOURCE_DIR_2="Vulkan-Headers-$portVersion" PATCHES="vulkan-$portVersion.patchset"