diff options
| -rw-r--r-- | graphics/vulkan-loader/Makefile | 3 | ||||
| -rw-r--r-- | graphics/vulkan-loader/distinfo | 6 | ||||
| -rw-r--r-- | graphics/vulkan-loader/files/patch-loader_CMakeLists.txt | 26 | ||||
| -rw-r--r-- | graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h | 11 | ||||
| -rw-r--r-- | graphics/vulkan-loader/pkg-plist | 2 |
5 files changed, 31 insertions, 17 deletions
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index edcae4b49dbb..b12b29b71343 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,7 +1,6 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.2.197 -PORTREVISION= 2 +DISTVERSION= 1.2.198 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index c797350af85d..a49b088ebeae 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635956498 -SHA256 (KhronosGroup-Vulkan-Loader-v1.2.197_GH0.tar.gz) = fd1bf11dfa62ed118fc3537c849e6619e2c7b84598b60a2ad89f7af553eb29d6 -SIZE (KhronosGroup-Vulkan-Loader-v1.2.197_GH0.tar.gz) = 1436996 +TIMESTAMP = 1636486847 +SHA256 (KhronosGroup-Vulkan-Loader-v1.2.198_GH0.tar.gz) = b4a0ec6ce8921f50ab291f1c3a16802cfbe2c3dbd86820eb699bfb98890ad126 +SIZE (KhronosGroup-Vulkan-Loader-v1.2.198_GH0.tar.gz) = 1438330 diff --git a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt new file mode 100644 index 000000000000..e3aef3f23f1f --- /dev/null +++ b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt @@ -0,0 +1,26 @@ +asm_offset isn't defined on non-x86 architectures e.g., aarch64, powerpc64. + +CMake Error at loader/CMakeLists.txt:311 (target_compile_definitions): + Cannot specify compile definitions for target "asm_offset" which is not + built by this project. + +--- loader/CMakeLists.txt.orig 2021-11-09 19:40:47 UTC ++++ loader/CMakeLists.txt +@@ -230,6 +230,9 @@ else(UNIX AND NOT APPLE) # i.e.: Linux + add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND asm_offset GAS) + add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm) + target_compile_definitions(asm_offset PRIVATE _XOPEN_SOURCE=500) # hush compiler warnings for readlink ++ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ target_compile_definitions(asm_offset PRIVATE __BSD_VISIBLE=1) ++ endif() + else() + message(WARNING "Could not find working x86 GAS assembler\n${ASM_FAILURE_MSG}") + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain.c) +@@ -308,7 +311,6 @@ else() + target_compile_definitions(vulkan PRIVATE _GNU_SOURCE) + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + target_compile_definitions(vulkan PRIVATE __BSD_VISIBLE=1) +- target_compile_definitions(asm_offset PRIVATE __BSD_VISIBLE=1) + endif() + if(APPLE) + find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation) diff --git a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h deleted file mode 100644 index 9d07571f9242..000000000000 --- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- loader/vk_loader_platform.h.orig 2021-11-03 16:21:38 UTC -+++ loader/vk_loader_platform.h -@@ -156,7 +156,7 @@ static inline bool loader_platform_is_path_absolute(co - - static inline char *loader_platform_dirname(char *path) { return dirname(path); } - --#if defined(__linux__) || defined(__FreeBSD__) -+#if defined(__linux__) - - // find application path + name. Path cannot be longer than 1024, returns NULL if it is greater than that. - static inline char *loader_platform_executable_path(char *buffer, size_t size) { diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 4c19c88720dc..318dccdc9849 100644 --- a/graphics/vulkan-loader/pkg-plist +++ b/graphics/vulkan-loader/pkg-plist @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.2.197 +lib/libvulkan.so.1.2.198 libdata/pkgconfig/vulkan.pc |