diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index f66b5dd882dc..7e8331f9e56f 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,20 +1,20 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.205 +DISTVERSION= 1.3.206 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Headers for the Vulkan graphics API LICENSE= APACHE20 USES= cmake STRIP= # nothing to strip USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Headers NO_ARCH= yes .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 0586c0f6bb9d..a75dcf8502b3 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644018912 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.205_GH0.tar.gz) = d2b630bde17180313915a759bc3672e273488ac6e1df1c8e464ac16493b855d6 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.205_GH0.tar.gz) = 1423899 +TIMESTAMP = 1645178819 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.206_GH0.tar.gz) = 0cd46249eabb7cd8eab6ffc1b16d30a3a14e6e1e01d3d735b22dad33ee3efcf7 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.206_GH0.tar.gz) = 1435876 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 902b3ef6d473..ebd46d73bde6 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,51 +1,52 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.205 +PORTREVISION= 1 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 # 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-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 9406af8a37ac..e264005c9a95 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,45 +1,51 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.205 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API LICENSE= APACHE20 BUILD_DEPENDS= glslang>0:graphics/glslang \ spirv-tools>0:graphics/spirv-tools \ 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-ValidationLayers GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-137-gb42ba6d:headers/external/spirv-headers \ martinus:robin-hood-hashing:3.11.3:robin_hood/external/robin-hood-hashing CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \ -DROBIN_HOOD_HASHING_INSTALL_DIR:PATH="${WRKSRC_robin_hood}" \ -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" CFLAGS+= ${WITH_DEBUG:U-DNDEBUG} +.if ${DISTVERSION:E} < 206 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.205:vkheaders/Vulkan-Headers +CMAKE_ARGS+= -DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}" +CFLAGS+= -I${WRKSRC_vkheaders}/include -isystem${LOCALBASE}/include +.endif + OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-egl.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 .include diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 187daf9c7a7e..a2336a6d94b5 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,9 @@ TIMESTAMP = 1644348106 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.205_GH0.tar.gz) = cdfbe623956e1ea6683a7047e61bfb3aa6cacc88531e3cefbf3254db6f3d75a1 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.205_GH0.tar.gz) = 3668104 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 44985641ced3c7973adc829714ab650e3ae49a741aad1b287a1c1904841d8a67 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 417861 SHA256 (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4 SIZE (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = 170788 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.205_GH0.tar.gz) = d2b630bde17180313915a759bc3672e273488ac6e1df1c8e464ac16493b855d6 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.205_GH0.tar.gz) = 1423899