diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index fad7a9f0f719..ecb9964dd0c5 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,23 +1,23 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.3.280 +DISTVERSION= 1.3.281 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' {} + .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 63d45f4915f6..a32780719254 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709903791 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.280_GH0.tar.gz) = 717b49c52dbd37c78cf2f7f0fc715292c42e74841219e6cca918cd293ad5dce4 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.280_GH0.tar.gz) = 2264744 +TIMESTAMP = 1711105562 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.281_GH0.tar.gz) = e5784d7a2a19e86d61dfa4463246a6ca77b56087edc57323f290e9e9bc71f84e +SIZE (KhronosGroup-Vulkan-Headers-v1.3.281_GH0.tar.gz) = 2264436 diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 7ded289aedd9..1faba0c742c7 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,52 +1,53 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.3.280 +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: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 5b09f1c85fb7..bc72dfe88d42 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,63 +1,68 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v DISTVERSION= 1.3.280 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 USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools GH_TUPLE= zeux:volk:1.3.270-37-g01986ac:volk/volk CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" +.if ${DISTVERSION:E} < 281 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.280: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 d72b5ca5412e..57860cdaf1a7 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1709919554 SHA256 (KhronosGroup-Vulkan-Tools-v1.3.280_GH0.tar.gz) = 97cbe660c066eb5b00a2f33b501f7cd0baaf8996b997fcba185ce298c8835fed SIZE (KhronosGroup-Vulkan-Tools-v1.3.280_GH0.tar.gz) = 758744 SHA256 (zeux-volk-1.3.270-37-g01986ac_GH0.tar.gz) = 2991117b1fdff99b7f93137f4235f7f58cf0fc9f28abfbc6693b2da5f7289675 SIZE (zeux-volk-1.3.270-37-g01986ac_GH0.tar.gz) = 62445 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.280_GH0.tar.gz) = 717b49c52dbd37c78cf2f7f0fc715292c42e74841219e6cca918cd293ad5dce4 +SIZE (KhronosGroup-Vulkan-Headers-v1.3.280_GH0.tar.gz) = 2264744