diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index cb6f1a9b9a53..942c191cb2f0 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,28 +1,28 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.297 +DISTVERSION= 1.3.298 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 # XXX Add clang-scan-deps to WITH_CLANG_EXTRAS in src.conf(5) .if exists(/usr/bin/clang) && !exists(/usr/bin/clang-scan-deps) CMAKE_OFF+= VULKAN_HEADERS_ENABLE_MODULE .endif post-extract: # genvk.py requires docgenerator.py from Vulkan-Docs, so drop useless shebang @${FIND} ${WRKSRC}/registry -name \*.py -exec ${REINPLACE_CMD} -i '' '/^#!/d' {} + .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index ab63b820ec87..5a95ca13047a 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728051010 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.297_GH0.tar.gz) = 1d679e2edc43cb7ad818b81dea960e374f1d6dd082325eb9b4c6113e76263c02 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.297_GH0.tar.gz) = 2359701 +TIMESTAMP = 1728636098 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.298_GH0.tar.gz) = 11681fa59966b3749776f9931972eb4748883b43a0604a9db781fbdf0983bdad +SIZE (KhronosGroup-Vulkan-Headers-v1.3.298_GH0.tar.gz) = 2364355 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 19e0554cacdb..403b65d6d3c5 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,53 +1,58 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.297 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:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} +.if ${DISTVERSION:E} < 298 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:${DISTVERSIONFULL}:vkheaders/Vulkan-Headers +CFLAGS+= -isystem${WRKSRC_vkheaders}/include -isystem${LOCALBASE}/include +.endif + 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-loader/distinfo b/graphics/vulkan-loader/distinfo index 102d6ea66678..e4f7d563bd4e 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1728323221 SHA256 (KhronosGroup-Vulkan-Loader-v1.3.297_GH0.tar.gz) = 7d140e7ece2835a0374eda727925ffcd8fc5c9a183dc00b87d635e230e6faca4 SIZE (KhronosGroup-Vulkan-Loader-v1.3.297_GH0.tar.gz) = 1722689 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.297_GH0.tar.gz) = 1d679e2edc43cb7ad818b81dea960e374f1d6dd082325eb9b4c6113e76263c02 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.297_GH0.tar.gz) = 2359701 diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 51a47efd05c0..615d672dee92 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,40 +1,46 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.297 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 \ vulkan-utility-libraries>0:graphics/vulkan-utility-libraries USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-372-g2a9b6f9:headers/SPIRV-Headers CMAKE_OFF= BUILD_TESTS +.if ${DISTVERSION:E} < 298 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:${DISTVERSIONFULL}:vkheaders/Vulkan-Headers \ + KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONFULL}:vkutils/Vulkan-Utility-Libraries +CFLAGS+= -I${WRKSRC_vkheaders}/include -I${WRKSRC_vkutils}/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 1ef3affcc910..84efef5d6138 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,5 +1,9 @@ TIMESTAMP = 1728334400 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.297_GH0.tar.gz) = 11220ccc139f5517b3a3aa2e2ef0d680da314940c9bb98c7f3857a871bdb2205 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.297_GH0.tar.gz) = 5519744 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-372-g2a9b6f9_GH0.tar.gz) = 273e5613654c0ee1546f6171ef755ccd3cfa909155a71021ac486f32162ba18a SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-372-g2a9b6f9_GH0.tar.gz) = 523898 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.297_GH0.tar.gz) = 1d679e2edc43cb7ad818b81dea960e374f1d6dd082325eb9b4c6113e76263c02 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.297_GH0.tar.gz) = 2359701 +SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.3.297_GH0.tar.gz) = 0589a56c4f1bc9d08eafe2b9b0e5df895f55ba1000e00b5bc445d700b964c0f3 +SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.3.297_GH0.tar.gz) = 556686