diff --git c/graphics/vulkan-sdk/Makefile i/graphics/vulkan-sdk/Makefile index 1e8919045c5a..97ffa535eac7 100644 --- c/graphics/vulkan-sdk/Makefile +++ i/graphics/vulkan-sdk/Makefile @@ -2,15 +2,15 @@ PORTNAME= vulkan-sdk DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.0.57.0 +DISTVERSION= 1.0.65.1 CATEGORIES= graphics devel MAINTAINER= greg@unrelenting.technology -COMMENT= Vulkan SDK (Headers, ICD Loader, Validation Layers) +COMMENT= Vulkan SDK (headers, driver loader, validation layers) LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \ glslangValidator:devel/glslang @@ -23,12 +23,13 @@ GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-LoaderAndValidationLayers CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_WSI_MIR_SUPPORT:BOOL=OFF + -DBUILD_ICD:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DBUILD_WSI_MIR_SUPPORT:BOOL=OFF -OPTIONS_DEFINE= XLIB XCB WAYLAND DEMOS -OPTIONS_DEFAULT= XLIB XCB DEMOS -OPTIONS_SUB= yes +OPTIONS_DEFINE= XLIB XCB WAYLAND DEMOS +OPTIONS_DEFAULT= XLIB XCB WAYLAND DEMOS +OPTIONS_SUB= yes XLIB_DESC= Build Xlib WSI (Window System Integration) support XCB_DESC= Build XCB WSI (Window System Integration) support @@ -37,15 +38,15 @@ DEMOS_DESC= Build demos (including vulkaninfo) XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \ - libXrandr.so:x11/libXrandr -XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT + libXrandr.so:x11/libXrandr +XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XCB_LIB_DEPENDS= libX11-xcb.so:x11/libX11 \ - libxcb.so:x11/libxcb + libxcb.so:x11/libxcb WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ - libwayland-server.so:graphics/wayland \ - libwayland-cursor.so:graphics/wayland \ - libwayland-egl.so:graphics/mesa-libs + libwayland-server.so:graphics/wayland \ + libwayland-cursor.so:graphics/wayland \ + libwayland-egl.so:graphics/mesa-libs DEMOS_CMAKE_BOOL= BUILD_DEMOS .include diff --git c/graphics/vulkan-sdk/distinfo i/graphics/vulkan-sdk/distinfo index d84420f43d56..0b1ad1ef0699 100644 --- c/graphics/vulkan-sdk/distinfo +++ i/graphics/vulkan-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504980231 -SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0_GH0.tar.gz) = a425caf7cdd4328555de20174e40092aeff491cc511bfc65435fa66dc983461e -SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.57.0_GH0.tar.gz) = 3851540 +TIMESTAMP = 1514238120 +SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1_GH0.tar.gz) = aafb3ae34a653c737e49e48742a9dba6327a83f7f2620434a77184a0b87ffa22 +SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.65.1_GH0.tar.gz) = 3922245 diff --git c/graphics/vulkan-sdk/files/patch-icd_CMakeLists.txt i/graphics/vulkan-sdk/files/patch-icd_CMakeLists.txt new file mode 100644 index 000000000000..298fbf649b36 --- /dev/null +++ i/graphics/vulkan-sdk/files/patch-icd_CMakeLists.txt @@ -0,0 +1,11 @@ +--- icd/CMakeLists.txt.orig 2017-12-26 00:43:06.217312000 +0300 ++++ icd/CMakeLists.txt 2017-12-26 00:43:14.226028000 +0300 +@@ -4,7 +4,7 @@ + set(DisplayServer Win32) + elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") + add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR -DVK_USE_PLATFORM_ANDROID_KHX) +-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") ++elseif(UNIX AND NOT APPLE) + if (BUILD_WSI_XCB_SUPPORT) + add_definitions(-DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XCB_KHX) + endif() diff --git c/graphics/vulkan-sdk/pkg-plist i/graphics/vulkan-sdk/pkg-plist index ca6f4b40cd30..438a7e3decd9 100644 --- c/graphics/vulkan-sdk/pkg-plist +++ i/graphics/vulkan-sdk/pkg-plist @@ -8,6 +8,7 @@ etc/vulkan/explicit_layer.d/VkLayer_threading.json etc/vulkan/explicit_layer.d/VkLayer_unique_objects.json include/vulkan/vk_icd.h include/vulkan/vk_layer.h +include/vulkan/vk_layer_dispatch_table.h include/vulkan/vk_platform.h include/vulkan/vk_sdk_platform.h include/vulkan/vulkan.h @@ -20,5 +21,5 @@ lib/libVkLayer_unique_objects.so lib/libVkLayer_utils.so lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.0.57 +lib/libvulkan.so.1.0.65 libdata/pkgconfig/vulkan.pc