diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile index e270070364c2..af360046889a 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.251 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} < 253 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.252: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 ab5b7aa509a0..591edd8210a0 100644 --- a/graphics/vulkan-extension-layer/distinfo +++ b/graphics/vulkan-extension-layer/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1685545684 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.251_GH0.tar.gz) = c4a53bd61ad09c295264d7f09a1581e1d56078acb7db17ea5b9879bc1b5087e4 SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.251_GH0.tar.gz) = 1158951 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 2262a7ba3e12583a5f5f7ebac0c01003cf106baf0ea75809e07958fa9334ea49 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 1984978 diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index f0f14dc0b60f..3d7ec1ab3ea5 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,30 +1,30 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.252 +DISTVERSION= 1.3.253 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 09f1e0277120..baec76a59eb3 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685712183 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 2262a7ba3e12583a5f5f7ebac0c01003cf106baf0ea75809e07958fa9334ea49 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 1984978 +TIMESTAMP = 1686369508 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.253_GH0.tar.gz) = e45a8c4289b84317252451055b0ac76b13169e10a9f619961fb6479bf6179054 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.253_GH0.tar.gz) = 2002416 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 688181124c0c..bfd0e5ee7b0a 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,53 +1,53 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.251 -PORTREVISION= 1 +PORTREVISION= 2 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-tools/Makefile b/graphics/vulkan-tools/Makefile index d4a5de65822c..14184e217848 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,63 +1,68 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v DISTVERSION= 1.3.251 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Tools and demos for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Tools LICENSE= APACHE20 BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" +.if ${DISTVERSION:E} < 253 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.252:vkheaders/Vulkan-Headers +CFLAGS+= -I${WRKSRC_vkheaders}/include +.endif + OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB OPTIONS_SLAVE= DISPLAY OPTIONS_SUB= yes WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols 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 XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT # https://github.com/KhronosGroup/Vulkan-Tools/issues/307 .for _wsi in display wayland xcb xlib do-configure-${_wsi:tu}-on: ${_wsi}-configure ${_wsi}-configure: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \ -DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \ -DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \ -B${CONFIGURE_WRKSRC}-${_wsi} do-build-${_wsi:tu}-on: ${_wsi}-build ${_wsi}-build: @${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi} do-install-${_wsi:tu}-on: ${_wsi}-install ${_wsi}-install: . for _file in vkcube vkcubepp ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \ ${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi} . endfor .endfor .include diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index 51d114782e04..87dd34e0e096 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1685559578 SHA256 (KhronosGroup-Vulkan-Tools-v1.3.251_GH0.tar.gz) = 03851334d9751464f96b2d3c49cac884b7be5178c04d162a445bb2ca93f56519 SIZE (KhronosGroup-Vulkan-Tools-v1.3.251_GH0.tar.gz) = 786842 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 2262a7ba3e12583a5f5f7ebac0c01003cf106baf0ea75809e07958fa9334ea49 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 1984978 diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 2f39b491b2be..d4d89329aab9 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.251 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-268-g268a061: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} < 253 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.252: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 d95db5a55450..457f82d6e81b 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1685552191 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.251_GH0.tar.gz) = 629608cd549df6ba8ae581667dd0506d9fb67aa1b8c8a210f590c8cb76e34fae SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.251_GH0.tar.gz) = 4832191 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-268-g268a061_GH0.tar.gz) = fef39455ff5ed696c9acdb51cbb89b6de12af54cc72c950819705e85b815f807 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-268-g268a061_GH0.tar.gz) = 452787 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 2262a7ba3e12583a5f5f7ebac0c01003cf106baf0ea75809e07958fa9334ea49 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.252_GH0.tar.gz) = 1984978