diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 899bcdf9e075..475a9554e6e1 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,49 +1,48 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.2.203 -PORTREVISION= 1 +DISTVERSION= 1.3.204 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API 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 @${REINPLACE_CMD} -e '/find_.*Git/d' \ -e '/BRANCH/s/--unknown--/main/' \ -e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \ ${WRKSRC}/CMakeLists.txt # https://bugs.llvm.org/show_bug.cgi?id=47348 @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 21fe9b1c72eb..6c93e2dba2c0 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640018802 -SHA256 (KhronosGroup-Vulkan-Loader-v1.2.203_GH0.tar.gz) = a431c627f36f90ce8d1aa752e7a37838db569760a54bb97edaee35dae4743118 -SIZE (KhronosGroup-Vulkan-Loader-v1.2.203_GH0.tar.gz) = 1473313 +TIMESTAMP = 1643136853 +SHA256 (KhronosGroup-Vulkan-Loader-v1.3.204_GH0.tar.gz) = 256cfe468499c0bc67cd367b748c65bcccac1d08e0040a4f46154e86be1a8f77 +SIZE (KhronosGroup-Vulkan-Loader-v1.3.204_GH0.tar.gz) = 1513397 diff --git a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt index a5b7d269fa6f..32b666ad4047 100644 --- a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt +++ b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt @@ -1,39 +1,39 @@ -- 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. CMake Error at loader/CMakeLists.txt:332 (target_compile_definitions): Cannot specify compile definitions for target "asm_offset" which is not built by this project. ---- loader/CMakeLists.txt.orig 2021-12-20 16:46:42 UTC +--- loader/CMakeLists.txt.orig 2022-01-25 16:59:13 UTC +++ loader/CMakeLists.txt -@@ -229,7 +229,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux +@@ -232,7 +232,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux if(ASSEMBLER_WORKS) set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas_aarch64.S) endif() -- elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86") +- 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) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS HAVE_CET_H) -@@ -330,7 +330,9 @@ else() +@@ -333,7 +333,9 @@ 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) + if(ASSEMBLER_WORKS) + target_compile_definitions(asm_offset PRIVATE __BSD_VISIBLE=1) + endif() endif() if(APPLE) find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation) diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 6994fa567f78..dcef09a4b926 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.203 +lib/libvulkan.so.1.3.204 libdata/pkgconfig/vulkan.pc