diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile index 179d85655128..98358e299d0f 100644 --- a/graphics/vulkan-extension-layer/Makefile +++ b/graphics/vulkan-extension-layer/Makefile @@ -1,19 +1,25 @@ PORTNAME= vulkan-extension-layer DISTVERSIONPREFIX= v DISTVERSION= 1.3.204 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Layer providing Vulkan features when native support is unavailable 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} < 205 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.204:vkheaders/Vulkan-Headers +CMAKE_ARGS+= -DVULKAN_HEADERS_INSTALL_DIR:PATH="${WRKSRC_vkheaders}" +CFLAGS+= -I${WRKSRC_vkheaders}/include -isystem${LOCALBASE}/include +.endif + .include diff --git a/graphics/vulkan-extension-layer/distinfo b/graphics/vulkan-extension-layer/distinfo index b64f4c690a10..be2009a911e1 100644 --- a/graphics/vulkan-extension-layer/distinfo +++ b/graphics/vulkan-extension-layer/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1643141554 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.204_GH0.tar.gz) = 2d6aad9a019928d99d869e6195df7cf0bfd35030eb1aa7cfee4ec6ef7c048d02 SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.204_GH0.tar.gz) = 465004 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.204_GH0.tar.gz) = 2cde2c90975a8f36d00cf8eb6308cb00323aafbc0b7374f4b346f1140f760b3d +SIZE (KhronosGroup-Vulkan-Headers-v1.3.204_GH0.tar.gz) = 1422859 diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index 6158d3991fe9..90b1ca886502 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,20 +1,23 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.204 +DISTVERSION= 1.3.205 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b32da5329b50.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Headers/pull/260 + 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 25b46936cbb3..34efdd8f190b 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1643110401 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.204_GH0.tar.gz) = 2cde2c90975a8f36d00cf8eb6308cb00323aafbc0b7374f4b346f1140f760b3d -SIZE (KhronosGroup-Vulkan-Headers-v1.3.204_GH0.tar.gz) = 1422859 +TIMESTAMP = 1643975849 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.205_GH0.tar.gz) = f6e901ef1619e7ad526212f07e516343d36ce50f61c7e0c672272551991fa7fa +SIZE (KhronosGroup-Vulkan-Headers-v1.3.205_GH0.tar.gz) = 1423891 +SHA256 (b32da5329b50.patch) = 2f16b174d8d633f6e8da10cdb0995d95ca6f65e63f56952c5f2253631647cf60 +SIZE (b32da5329b50.patch) = 6712 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 1156de7e8bca..30dc9dcf3953 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,51 +1,52 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.204 +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://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-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index f94aabf7a680..0e54c782b350 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.204 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} < 205 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.204: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 86bec8fb6dc0..1fdfeb1af2fa 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,9 @@ TIMESTAMP = 1643412585 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.204_GH0.tar.gz) = 5ff70d7d7bdd50154fd0e41c72d9e7e4fc9c001fb2d82ffe0009804f2070d0bf SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.204_GH0.tar.gz) = 3657540 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.204_GH0.tar.gz) = 2cde2c90975a8f36d00cf8eb6308cb00323aafbc0b7374f4b346f1140f760b3d +SIZE (KhronosGroup-Vulkan-Headers-v1.3.204_GH0.tar.gz) = 1422859