diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index c3740a0f65e4..9beabfd01007 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,30 +1,30 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.270 +DISTVERSION= 1.3.271 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.4 EOL around 2023-12-31 @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 49fe9ba273aa..bde953a23f3b 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699618935 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.270_GH0.tar.gz) = 908e4e3881df8003744279ebdb0acd195c35d3792b2855e5488871956f90a7ee -SIZE (KhronosGroup-Vulkan-Headers-v1.3.270_GH0.tar.gz) = 2161873 +TIMESTAMP = 1701064472 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.271_GH0.tar.gz) = 694223d738729b6d660129efbc876522921e54965f292cf69ec2f15565c6b3dc +SIZE (KhronosGroup-Vulkan-Headers-v1.3.271_GH0.tar.gz) = 2162105 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index b613faa17c9a..9d7d8d7d8350 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,52 +1,57 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.270 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 +.if ${DISTVERSION:E} < 271 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.270: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 7d22528694f6..836b636f4193 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1699640834 SHA256 (KhronosGroup-Vulkan-Loader-v1.3.270_GH0.tar.gz) = 464293bd8be1545365518327168c676aadab7a88fa516054cd59fb3f6f83a1d5 SIZE (KhronosGroup-Vulkan-Loader-v1.3.270_GH0.tar.gz) = 1695913 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.270_GH0.tar.gz) = 908e4e3881df8003744279ebdb0acd195c35d3792b2855e5488871956f90a7ee +SIZE (KhronosGroup-Vulkan-Headers-v1.3.270_GH0.tar.gz) = 2161873 diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 9d38555fee9e..178a531d5766 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,41 +1,46 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.3.270 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:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-323-ge867c06:headers/SPIRV-Headers \ KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONPREFIX}${DISTVERSION}:utils/Vulkan-Utility-Libraries CMAKE_OFF= BUILD_TESTS +.if ${DISTVERSION:E} < 271 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.270: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 042bc9ff5c1f..0d6b48aacaf7 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,7 +1,9 @@ TIMESTAMP = 1699646290 SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.270_GH0.tar.gz) = 710bb9fc66daebe57cbab8f9fc4fe15e31068c9f9982b92a4c8e91184514a8bd SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.270_GH0.tar.gz) = 5072424 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-323-ge867c06_GH0.tar.gz) = 41b666b0d2bb87a6edbb9c629c5f3297a7a07bc1b07738fdb3f893ba90803a1c SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-323-ge867c06_GH0.tar.gz) = 465996 SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.3.270_GH0.tar.gz) = c402174add9146e3238104dbf18e50385129ff2ef252ebae49b3c5f61ccc0286 SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.3.270_GH0.tar.gz) = 165939 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.270_GH0.tar.gz) = 908e4e3881df8003744279ebdb0acd195c35d3792b2855e5488871956f90a7ee +SIZE (KhronosGroup-Vulkan-Headers-v1.3.270_GH0.tar.gz) = 2161873