diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile index c6ddc2ef3cdc..3a567c151463 100644 --- a/graphics/vulkan-extension-layer/Makefile +++ b/graphics/vulkan-extension-layer/Makefile @@ -1,20 +1,26 @@ PORTNAME= vulkan-extension-layer DISTVERSIONPREFIX= v DISTVERSION= 1.3.228 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 +.if ${DISTVERSION:E} < 229 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.228:vkheaders/Vulkan-Headers +CMAKE_ARGS+= -DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}" +CFLAGS+= -isystem${LOCALBASE}/include +.endif + .include diff --git a/graphics/vulkan-extension-layer/distinfo b/graphics/vulkan-extension-layer/distinfo index 8c489162f0dd..0d39d52c12e9 100644 --- a/graphics/vulkan-extension-layer/distinfo +++ b/graphics/vulkan-extension-layer/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1663711138 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.228_GH0.tar.gz) = e22645d535a0f8300c25921c7c458b6750232208c4f584a2c89130752aa5f2a5 SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.228_GH0.tar.gz) = 484111 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.228_GH0.tar.gz) = e5a4dcdfb9361ee8d1b9401ed337b65e7c34a54224b99a9cde303a650a9cb350 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.228_GH0.tar.gz) = 1588315 diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index fda7d6bcbf15..2129e7b1dd16 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,26 +1,26 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.228 +DISTVERSION= 1.3.229 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-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 30e1155ef594..b7eb97f32656 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663236167 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.228_GH0.tar.gz) = e5a4dcdfb9361ee8d1b9401ed337b65e7c34a54224b99a9cde303a650a9cb350 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.228_GH0.tar.gz) = 1588315 +TIMESTAMP = 1663842548 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.229_GH0.tar.gz) = fe620275ca1e29501dcb3f54c69cc011b6d9c3296408fac4e18dc491a1be754f +SIZE (KhronosGroup-Vulkan-Headers-v1.3.229_GH0.tar.gz) = 1588756 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index b994ee8f9b80..e167a7f206e3 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,52 +1,53 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v PORTVERSION= 1.3.228 +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 48c19e816acd..b18af27c618f 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,44 +1,50 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.228 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= 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-177-g87d5b78:headers/external/spirv-headers \ martinus:robin-hood-hashing:3.11.5:robin_hood/external/robin-hood-hashing CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DROBIN_HOOD_HASHING_INSTALL_DIR:PATH="${WRKSRC_robin_hood}" \ -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" CFLAGS+= ${WITH_DEBUG:U-DNDEBUG} +.if ${DISTVERSION:E} < 229 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.228:vkheaders/Vulkan-Headers +CMAKE_ARGS+= -DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}" +CFLAGS+= -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 abd987a46bbc..067ebbdffaca 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,9 @@ TIMESTAMP = 1663283474 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.228_GH0.tar.gz) = ac5193cea44bc4f0247f60c2af5f7636f73393d60b0304a9505e399887a952bf SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.228_GH0.tar.gz) = 4235137 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-177-g87d5b78_GH0.tar.gz) = 85c92d6131fd57c29c12b31f82c52421223a98aff14f0baa552993521268f70b SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-177-g87d5b78_GH0.tar.gz) = 439046 SHA256 (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0 SIZE (martinus-robin-hood-hashing-3.11.5_GH0.tar.gz) = 177134 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.228_GH0.tar.gz) = e5a4dcdfb9361ee8d1b9401ed337b65e7c34a54224b99a9cde303a650a9cb350 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.228_GH0.tar.gz) = 1588315