diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile index 305fac2ee484..1073680d8ba1 100644 --- a/graphics/vulkan-extension-layer/Makefile +++ b/graphics/vulkan-extension-layer/Makefile @@ -1,21 +1,26 @@ PORTNAME= vulkan-extension-layer DISTVERSIONPREFIX= v DISTVERSION= 1.3.241 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Layer providing Vulkan features when native support is unavailable WWW= https://github.com/KhronosGroup/Vulkan-ExtensionLayer LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++11-lib USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ExtensionLayer CMAKE_OFF= BUILD_TESTS +.if ${DISTVERSION:E} < 243 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.242:vkheaders/Vulkan-Headers +CFLAGS+= -I${WRKSRC_vkheaders}/include +.endif + .include diff --git a/graphics/vulkan-extension-layer/distinfo b/graphics/vulkan-extension-layer/distinfo index db7332aa5e6d..0230e2d74368 100644 --- a/graphics/vulkan-extension-layer/distinfo +++ b/graphics/vulkan-extension-layer/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1677109246 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.241_GH0.tar.gz) = aeb0710179b4f1fd3e880b1f3baa26f0c9810ba42be2cfd8be9ec36396e8312f SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.241_GH0.tar.gz) = 522255 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.242_GH0.tar.gz) = 4ee7c8e588e3e90785636c7ac879ad7d0b8d363c26838f57d3e4a7b8a55c38f5 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.242_GH0.tar.gz) = 1831747 diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index 638bbf976d7b..4ae6de7da783 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,30 +1,30 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.242 +DISTVERSION= 1.3.243 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Headers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Headers LICENSE= APACHE20 USES= cmake USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Headers STRIP= # nothing to strip NO_ARCH= yes post-extract: # genvk.py requires docgenerator.py from Vulkan-Docs, so drop useless shebang @${FIND} ${WRKSRC}/registry -name \*.py -exec ${REINPLACE_CMD} -i '' '/^#!/d' {} + post-patch: # XXX Drop after FreeBSD 12.* EOL around 2024-06-30 @if [ -L /usr/include/sched.h ]; then \ ${REINPLACE_CMD} $$'/^namespace/i\\\n#undef major\\\n#undef minor\\\n\\\n' \ ${WRKSRC}/include/vulkan/vulkan_structs.hpp; \ fi .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 06232e0b2481..bf9e2b7d82ac 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677414354 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.242_GH0.tar.gz) = 4ee7c8e588e3e90785636c7ac879ad7d0b8d363c26838f57d3e4a7b8a55c38f5 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.242_GH0.tar.gz) = 1831747 +TIMESTAMP = 1678610121 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.243_GH0.tar.gz) = 76c57490740369a26d68dd26d308e2faa2e0fc5d255498aa48ee389534fc5a48 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.243_GH0.tar.gz) = 1841020 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 0fd72652e816..aa8cd63fe687 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,52 +1,53 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.242 +PORTREVISION= 1 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-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 7b75acea4d26..c965a8ea22bc 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,42 +1,47 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.242 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-ValidationLayers LICENSE= APACHE20 BUILD_DEPENDS= robin-hood-hashing>0:devel/robin-hood-hashing \ 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-214-gd13b522:headers/external/spirv-headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" +.if ${DISTVERSION:E} < 243 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.242:vkheaders/Vulkan-Headers +CFLAGS+= -I${WRKSRC_vkheaders}/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 783f18002fa5..e9f466417e69 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1677535720 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.242_GH0.tar.gz) = 414fae3a2114f828e4a0cb51c09b0ae98e4b54443a92a638466d3c0ad72921f8 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.242_GH0.tar.gz) = 4606302 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = f4f0663a7fc0c17beaecb824c58ece4169edec1b3bb6eb1f6857b7b56bad3194 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = 446635 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.242_GH0.tar.gz) = 4ee7c8e588e3e90785636c7ac879ad7d0b8d363c26838f57d3e4a7b8a55c38f5 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.242_GH0.tar.gz) = 1831747