diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index f9fad65ef036..778294a453bc 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,53 +1,52 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -PORTVERSION= 1.3.226 -PORTREVISION= 1 +PORTVERSION= 1.3.227 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Loader LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11,xrandr XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT post-patch: # Extract (snapshot) version from the port # Respect PREFIX when XDG_CONFIG_DIRS and XDG_DATA_DIRS are unset @${REINPLACE_CMD} -e '/find_.*Git/d' \ -e '/BRANCH/s/--unknown--/main/' \ -e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \ -e '/FALLBACK/s,/etc,${PREFIX}&,' \ -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/CMakeLists.txt # https://github.com/llvm/llvm-project/issues/46692 @if [ "${CHOSEN_COMPILER_TYPE}-${ARCH}-${_OSRELEASE:C/.*-//}" = "clang-i386-CURRENT" ]; then \ ${ECHO} "disabled" >${WRKSRC}/loader/asm_test_x86.S; \ fi .include diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 89cfbde3365b..4c6f881c1791 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662049465 -SHA256 (KhronosGroup-Vulkan-Loader-v1.3.226_GH0.tar.gz) = 992d8c7c9f85ac9e8a261a448a50f0ae602ac17964c1b2550894fc128c037226 -SIZE (KhronosGroup-Vulkan-Loader-v1.3.226_GH0.tar.gz) = 1596096 +TIMESTAMP = 1662656601 +SHA256 (KhronosGroup-Vulkan-Loader-v1.3.227_GH0.tar.gz) = 840e8ca943f418d92d39886bab55c6b1f997eec98e8f447d012ff9782d8ee43e +SIZE (KhronosGroup-Vulkan-Loader-v1.3.227_GH0.tar.gz) = 1602057 diff --git a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt deleted file mode 100644 index 1d2bf1560b60..000000000000 --- a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ --- The ASM compiler identification is Clang --- Found assembler: /usr/bin/cc -CMake Warning at loader/CMakeLists.txt:252 (message): - Could not find working amd64 GAS assembler - - The build will fall back on building with C code - - Note that this may be unsafe, as the C code requires tail-call - optimizations to remove the stack frame for certain calls. If the compiler - does not do this, then unknown device extensions will suffer from a - corrupted stack. - ---- loader/CMakeLists.txt.orig 2022-03-15 19:06:40 UTC -+++ loader/CMakeLists.txt -@@ -186,7 +186,7 @@ else() # i.e.: Linux - if(ASSEMBLER_WORKS) - set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas_aarch64.S) - endif() -- elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i.86$") -+ elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86$|i.86") - check_include_file("cet.h" HAVE_CET_H) - if(HAVE_CET_H) - target_compile_definitions(loader_specific_options INTERFACE HAVE_CET_H) diff --git a/graphics/vulkan-loader/files/patch-loader_stack__allocation.h b/graphics/vulkan-loader/files/patch-loader_stack__allocation.h deleted file mode 100644 index bb28bb24278f..000000000000 --- a/graphics/vulkan-loader/files/patch-loader_stack__allocation.h +++ /dev/null @@ -1,19 +0,0 @@ -In file included from loader/asm_offset.c:26: -In file included from loader/loader.h:32: -In file included from loader/loader_common.h:32: -In file included from loader/vk_loader_platform.h:79: -loader/stack_allocation.h:34:10: fatal error: 'alloca.h' file not found -#include - ^~~~~~~~~~ - ---- loader/stack_allocation.h.orig 2022-06-30 18:28:09 UTC -+++ loader/stack_allocation.h -@@ -30,8 +30,6 @@ - - #if defined(_WIN32) - #include --#else --#include - #endif - - #if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 2dd3f6f9d9c1..1a1e46c1d580 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.3.226 +lib/libvulkan.so.1.3.227 libdata/pkgconfig/vulkan.pc