diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 10b91854981e..d0b5dda8b785 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,68 +1,63 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.3.237 +DISTVERSION= 1.3.238 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 LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" -.if ${DISTVERSION:E} < 238 -GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.237: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,xext,ice,sm 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 c3c3e71f8550..36a43c5d662a 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1670528116 -SHA256 (KhronosGroup-Vulkan-Tools-v1.3.237_GH0.tar.gz) = af35d59e601d20a83b9c2b555994cc8e9b5994b23d1b9702c2a1c354e223d593 -SIZE (KhronosGroup-Vulkan-Tools-v1.3.237_GH0.tar.gz) = 881690 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 3f0d9a01a7859efbf312f34140259fc90aa0ba04f635e98f8f36321de4bd509b -SIZE (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 1773832 +TIMESTAMP = 1672766620 +SHA256 (KhronosGroup-Vulkan-Tools-v1.3.238_GH0.tar.gz) = 5b6ebb0c81d6c11025253f5f7176aee7baad481b07866463e8091fd2ecdafa0a +SIZE (KhronosGroup-Vulkan-Tools-v1.3.238_GH0.tar.gz) = 773934 diff --git a/graphics/vulkan-tools/files/patch-cube_CMakeLists.txt b/graphics/vulkan-tools/files/patch-cube_CMakeLists.txt deleted file mode 100644 index a3450eaf00e0..000000000000 --- a/graphics/vulkan-tools/files/patch-cube_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- cube/CMakeLists.txt.orig 2019-06-10 22:07:04 UTC -+++ cube/CMakeLists.txt -@@ -50,10 +50,12 @@ if(UNIX AND NOT APPLE) # i.e. Linux - - if(BUILD_WSI_XCB_SUPPORT) - find_package(XCB REQUIRED) -+ include_directories(SYSTEM ${XCB_INCLUDE_DIR}) - endif() - - if(BUILD_WSI_XLIB_SUPPORT) - find_package(X11 REQUIRED) -+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH}) - endif() - - if(BUILD_WSI_WAYLAND_SUPPORT)