Attachment 205522 Details for Bug 238945 – vulkan-1_1_108.patch

[patch] vulkan-1_1_108.patch

vulkan-1_1_108.patch (text/plain), 19.71 KB, created by Val Packett on 2019-07-04 17:37:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2019-07-04 17:37:45 UTC

Size: 19.71 KB

patch

obsolete

>diff --git c/devel/glslang/Makefile i/devel/glslang/Makefile
>index 546219aa1e3b..4ec5cd73e6a3 100644
>--- c/devel/glslang/Makefile
>+++ i/devel/glslang/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	glslang
>-DISTVERSION=	7.10.2984
>+DISTVERSION=	7.11.3214
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>diff --git c/devel/glslang/distinfo i/devel/glslang/distinfo
>index bd04edd71618..e452c5974003 100644
>--- c/devel/glslang/distinfo
>+++ i/devel/glslang/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1546371497
>-SHA256 (KhronosGroup-glslang-7.10.2984_GH0.tar.gz) = d0afe88034577ecf06a825db1a5e8222d949a38d3b19c5ce002b90b66c403f67
>-SIZE (KhronosGroup-glslang-7.10.2984_GH0.tar.gz) = 2439082
>+TIMESTAMP = 1562246947
>+SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9
>+SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979
>diff --git c/devel/spirv-tools/Makefile i/devel/spirv-tools/Makefile
>index 4e2231433e2d..7af8a822543a 100644
>--- c/devel/spirv-tools/Makefile
>+++ i/devel/spirv-tools/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	spirv-tools
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2018.6
>+DISTVERSION=	2019.3
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -17,7 +17,7 @@ SHEBANG_FILES=	tools/lesspipe/spirv-lesspipe.sh
> USE_GITHUB=	yes
> GH_ACCOUNT=	KhronosGroup
> GH_PROJECT=	SPIRV-Tools
>-GH_TUPLE=	KhronosGroup:SPIRV-Headers:4618b86e9e4b0:headers/external/spirv-headers
>+GH_TUPLE=	KhronosGroup:SPIRV-Headers:c4f8f65792d4bf2657ca751904c511bbcf2ac77b:headers/external/spirv-headers
> 
> CMAKE_ON=	SPIRV_SKIP_TESTS
> CMAKE_OFF=	SPIRV_WERROR
>diff --git c/devel/spirv-tools/distinfo i/devel/spirv-tools/distinfo
>index 8fdeab23e0b5..29028e42d5ce 100644
>--- c/devel/spirv-tools/distinfo
>+++ i/devel/spirv-tools/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1546371368
>-SHA256 (KhronosGroup-SPIRV-Tools-v2018.6_GH0.tar.gz) = e7fccd5e1e134a4ce09a25475ca52c5a8a57085b07e0bbaa39aff20d36911d66
>-SIZE (KhronosGroup-SPIRV-Tools-v2018.6_GH0.tar.gz) = 1385520
>-SHA256 (KhronosGroup-SPIRV-Headers-4618b86e9e4b0_GH0.tar.gz) = c8b276d27380bcb0ab019688c7b061af89c402176429639f9b88743366f2f1ba
>-SIZE (KhronosGroup-SPIRV-Headers-4618b86e9e4b0_GH0.tar.gz) = 322977
>+TIMESTAMP = 1562246419
>+SHA256 (KhronosGroup-SPIRV-Tools-v2019.3_GH0.tar.gz) = 57c59584d83294ac914c1b21530f9441c29d30979a54e5f0a97b10715dc42c64
>+SIZE (KhronosGroup-SPIRV-Tools-v2019.3_GH0.tar.gz) = 1612835
>+SHA256 (KhronosGroup-SPIRV-Headers-c4f8f65792d4bf2657ca751904c511bbcf2ac77b_GH0.tar.gz) = aa89dbeeef92da345082020a7503dea2cadb6f443deb4eca3fcbe28043370154
>+SIZE (KhronosGroup-SPIRV-Headers-c4f8f65792d4bf2657ca751904c511bbcf2ac77b_GH0.tar.gz) = 359993
>diff --git c/devel/spirv-tools/pkg-plist i/devel/spirv-tools/pkg-plist
>index 8de4753ea38e..0a5a16d7c060 100644
>--- c/devel/spirv-tools/pkg-plist
>+++ i/devel/spirv-tools/pkg-plist
>@@ -4,14 +4,17 @@ bin/spirv-dis
> bin/spirv-lesspipe.sh
> bin/spirv-link
> bin/spirv-opt
>+bin/spirv-reduce
> bin/spirv-stats
> bin/spirv-val
>+include/spirv-tools/instrument.hpp
> include/spirv-tools/libspirv.h
> include/spirv-tools/libspirv.hpp
> include/spirv-tools/linker.hpp
> include/spirv-tools/optimizer.hpp
> lib/libSPIRV-Tools-link.a
> lib/libSPIRV-Tools-opt.a
>+lib/libSPIRV-Tools-reduce.a
> lib/libSPIRV-Tools-shared.so
> lib/libSPIRV-Tools.a
> libdata/pkgconfig/SPIRV-Tools-shared.pc
>diff --git c/devel/vulkan-headers/Makefile i/devel/vulkan-headers/Makefile
>index 6b423d99331c..cf801b145acf 100644
>--- c/devel/vulkan-headers/Makefile
>+++ i/devel/vulkan-headers/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	vulkan-headers
> DISTVERSIONPREFIX=sdk-
>-DISTVERSION=	1.1.82.0
>+DISTVERSION=	1.1.108.0
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>diff --git c/devel/vulkan-headers/distinfo i/devel/vulkan-headers/distinfo
>index bcd6a2a6c5c6..4da6b74c3d3c 100644
>--- c/devel/vulkan-headers/distinfo
>+++ i/devel/vulkan-headers/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1533661644
>-SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.1.82.0_GH0.tar.gz) = df73da07d547cfbe88a797802401ea8225e4844e13d4fde52a7cb6e00e5179e5
>-SIZE (KhronosGroup-Vulkan-Headers-sdk-1.1.82.0_GH0.tar.gz) = 472646
>+TIMESTAMP = 1562245991
>+SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.1.108.0_GH0.tar.gz) = 944e88911e47e5d34bc4360e3e5833a0d550e3e7483dfa27a5f4d38525a1b943
>+SIZE (KhronosGroup-Vulkan-Headers-sdk-1.1.108.0_GH0.tar.gz) = 580538
>diff --git c/devel/vulkan-headers/pkg-plist i/devel/vulkan-headers/pkg-plist
>index dbd4bff5162c..9634bbb4bb82 100644
>--- c/devel/vulkan-headers/pkg-plist
>+++ i/devel/vulkan-headers/pkg-plist
>@@ -6,9 +6,11 @@ include/vulkan/vulkan.h
> include/vulkan/vulkan.hpp
> include/vulkan/vulkan_android.h
> include/vulkan/vulkan_core.h
>+include/vulkan/vulkan_fuchsia.h
>+include/vulkan/vulkan_ggp.h
> include/vulkan/vulkan_ios.h
> include/vulkan/vulkan_macos.h
>-include/vulkan/vulkan_mir.h
>+include/vulkan/vulkan_metal.h
> include/vulkan/vulkan_vi.h
> include/vulkan/vulkan_wayland.h
> include/vulkan/vulkan_win32.h
>@@ -16,8 +18,10 @@ include/vulkan/vulkan_xcb.h
> include/vulkan/vulkan_xlib.h
> include/vulkan/vulkan_xlib_xrandr.h
> share/vulkan/registry/cgenerator.py
>+share/vulkan/registry/conventions.py
> share/vulkan/registry/generator.py
> share/vulkan/registry/genvk.py
> share/vulkan/registry/reg.py
> share/vulkan/registry/validusage.json
> share/vulkan/registry/vk.xml
>+share/vulkan/registry/vkconventions.py
>diff --git c/devel/vulkan-tools/Makefile i/devel/vulkan-tools/Makefile
>index 2e31de9a8269..8a0119c84dce 100644
>--- c/devel/vulkan-tools/Makefile
>+++ i/devel/vulkan-tools/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	vulkan-tools
> DISTVERSIONPREFIX=	sdk-
>-DISTVERSION=	1.1.82.0
>-PORTREVISION=	2
>+DISTVERSION=	1.1.108.0
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -13,19 +12,17 @@ LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
> 		glslangValidator:devel/glslang
>-LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
>-		libX11-xcb.so:x11/libX11 \
>-		libXrandr.so:x11/libXrandr \
>-		libxcb.so:x11/libxcb
>+LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
> 
> USES=		cmake compiler:c++11-lib pkgconfig python:3.4+,build
>+USE_XORG=	x11 xcb xrandr sm ice xext
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	KhronosGroup
> GH_PROJECT=	Vulkan-Tools
> 
> CMAKE_OFF=	BUILD_TESTS BUILD_ICD \
>-		BUILD_WSI_WAYLAND_SUPPORT BUILD_WSI_MIR_SUPPORT
>+		BUILD_WSI_WAYLAND_SUPPORT
> CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
> 
> .include <bsd.port.mk>
>diff --git c/devel/vulkan-tools/distinfo i/devel/vulkan-tools/distinfo
>index 9c568bd8f186..8f7c04c88952 100644
>--- c/devel/vulkan-tools/distinfo
>+++ i/devel/vulkan-tools/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1533667375
>-SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.1.82.0_GH0.tar.gz) = 22e5e5dfd47535e1664458ee59706abcaace96575d1a3d7fa9ae779a9e83b89c
>-SIZE (KhronosGroup-Vulkan-Tools-sdk-1.1.82.0_GH0.tar.gz) = 342057
>+TIMESTAMP = 1562259460
>+SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.1.108.0_GH0.tar.gz) = cd9325346d535fc6fd5b6ab0b3e52c8ef91cadc534d8db729700745f18ba5678
>+SIZE (KhronosGroup-Vulkan-Tools-sdk-1.1.108.0_GH0.tar.gz) = 615856
>diff --git c/devel/vulkan-tools/files/patch-cube_CMakeLists.txt i/devel/vulkan-tools/files/patch-cube_CMakeLists.txt
>index f8e77a950794..a7df30830df7 100644
>--- c/devel/vulkan-tools/files/patch-cube_CMakeLists.txt
>+++ i/devel/vulkan-tools/files/patch-cube_CMakeLists.txt
>@@ -1,14 +1,5 @@
> --- cube/CMakeLists.txt.orig	2018-08-07 18:44:03 UTC
> +++ cube/CMakeLists.txt
>-@@ -48,7 +48,7 @@ else()
>-     find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS "${PROJECT_SOURCE_DIR}/glslang/bin")
>- endif()
>- 
>--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>-+if(UNIX AND NOT APPLE)
>-     include(FindPkgConfig)
>-     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
>-     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
> @@ -58,10 +58,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>  
>      if(BUILD_WSI_XCB_SUPPORT)
>@@ -22,12 +13,3 @@
>      endif()
>  
>      if(BUILD_WSI_WAYLAND_SUPPORT)
>-@@ -87,7 +89,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>-     endif()
>- elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
>-     add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
>--elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>-+elseif(UNIX AND NOT APPLE)
>-     if(NOT CUBE_WSI_SELECTION)
>-         set(CUBE_WSI_SELECTION "XCB")
>-     endif()
>diff --git c/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt i/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt
>deleted file mode 100644
>index cbcb21243dc4..000000000000
>--- c/devel/vulkan-tools/files/patch-vulkaninfo_CMakeLists.txt
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- vulkaninfo/CMakeLists.txt.orig	2018-08-07 18:45:41 UTC
>-+++ vulkaninfo/CMakeLists.txt
>-@@ -28,7 +28,7 @@ else()
>-     add_executable(vulkaninfo vulkaninfo.c)
>- endif()
>- 
>--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>-+if(UNIX AND NOT APPLE)
>-     include(FindPkgConfig)
>-     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
>-     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
>-@@ -36,10 +36,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "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(VULKANINFO_WSI_SELECTION STREQUAL "XCB")
>diff --git c/devel/vulkan-tools/pkg-plist i/devel/vulkan-tools/pkg-plist
>index 737367b78660..1419af7e32d6 100644
>--- c/devel/vulkan-tools/pkg-plist
>+++ i/devel/vulkan-tools/pkg-plist
>@@ -1,3 +1,3 @@
>-bin/cube
>-bin/cubepp
>+bin/vkcube
>+bin/vkcubepp
> bin/vulkaninfo
>diff --git c/devel/vulkan-validation-layers/Makefile i/devel/vulkan-validation-layers/Makefile
>index f4bab4fcedd2..752f46734d25 100644
>--- c/devel/vulkan-validation-layers/Makefile
>+++ i/devel/vulkan-validation-layers/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	vulkan-validation-layers
> DISTVERSIONPREFIX=	sdk-
>-DISTVERSION=	1.1.82.0
>-PORTREVISION=	3
>+DISTVERSION=	1.1.108.0
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -25,7 +24,7 @@ GH_PROJECT=	Vulkan-ValidationLayers
> 
> # WSI_* in here are leftover from when all of Vulkan SDK was in one repo
> CMAKE_OFF=	BUILD_TESTS BUILD_WSI_XCB_SUPPORT BUILD_WSI_XLIB_SUPPORT \
>-		BUILD_WSI_WAYLAND_SUPPORT BUILD_WSI_MIR_SUPPORT
>+		BUILD_WSI_WAYLAND_SUPPORT
> CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
> 
> .include <bsd.port.mk>
>diff --git c/devel/vulkan-validation-layers/distinfo i/devel/vulkan-validation-layers/distinfo
>index dd1afc6d9441..64e5a021fc12 100644
>--- c/devel/vulkan-validation-layers/distinfo
>+++ i/devel/vulkan-validation-layers/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1533665599
>-SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.82.0_GH0.tar.gz) = 6d83d1f7085bcfe67a791fce0bfb500dfb5d4833f062db1fc272bdc86e87eded
>-SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.82.0_GH0.tar.gz) = 962154
>+TIMESTAMP = 1562247215
>+SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.108.0_GH0.tar.gz) = 7e286217cb0e83a86b563db9c3f9404d84fbdfcacd7976e865f616ebecfe5811
>+SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.108.0_GH0.tar.gz) = 1187826
>diff --git c/devel/vulkan-validation-layers/files/patch-CMakeLists.txt i/devel/vulkan-validation-layers/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 2948c3d9d9d5..000000000000
>--- c/devel/vulkan-validation-layers/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- CMakeLists.txt.orig	2018-07-30 17:53:08 UTC
>-+++ CMakeLists.txt
>-@@ -63,9 +63,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
>- # "Helper" targets that don't have interesting source code should set their FOLDER property to this
>- set(LAYERS_HELPER_FOLDER "Helper Targets")
>- 
>--if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
>-+if(UNIX)
>-     set(
>--        FALLBACK_CONFIG_DIRS "/etc/xdg"
>-+        FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
>-         CACHE
>-             STRING
>-             "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
>-@@ -78,7 +78,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_
>-         )
>- endif()
>- 
>--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>-+if(UNIX AND NOT APPLE)
>-     include(FindPkgConfig)
>-     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
>-     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
>diff --git c/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt i/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt
>deleted file mode 100644
>index 67b9c05d8408..000000000000
>--- c/devel/vulkan-validation-layers/files/patch-layers_CMakeLists.txt
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- layers/CMakeLists.txt.orig	2018-07-30 17:53:08 UTC
>-+++ layers/CMakeLists.txt
>-@@ -23,7 +23,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>-     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()
>-@@ -131,7 +131,7 @@ if(WIN32)
>-         add_custom_target(vk_validation_error_messages ALL COMMAND copy ${src_val_msgs} ${dst_val_msgs} VERBATIM)
>-         set_target_properties(vk_validation_error_messages PROPERTIES FOLDER ${LAYERS_HELPER_FOLDER})
>-     endif()
>--elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
>-+ elseif(UNIX AND NOT APPLE)
>-     # extra setup for out-of-tree builds
>-     if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR))
>-         foreach(config_file ${LAYER_JSON_FILES})
>diff --git c/devel/vulkan-validation-layers/pkg-plist i/devel/vulkan-validation-layers/pkg-plist
>index 41645d26c7f6..bde276028076 100644
>--- c/devel/vulkan-validation-layers/pkg-plist
>+++ i/devel/vulkan-validation-layers/pkg-plist
>@@ -1,3 +1,4 @@
>+include/cast_utils.h
> include/hash_util.h
> include/hash_vk_types.h
> include/vk_dispatch_table_helper.h
>@@ -22,14 +23,16 @@ include/vk_safe_struct.h
> include/vk_typemap_helper.h
> include/vk_validation_error_messages.h
> lib/libVkLayer_core_validation.so
>-lib/libVkLayer_object_tracker.so
>-lib/libVkLayer_parameter_validation.so
>-lib/libVkLayer_threading.so
>+lib/libVkLayer_khronos_validation.so
>+lib/libVkLayer_object_lifetimes.so
>+lib/libVkLayer_stateless_validation.so
>+lib/libVkLayer_thread_safety.so
> lib/libVkLayer_unique_objects.so
> lib/libVkLayer_utils.a
> share/vulkan/explicit_layer.d/VkLayer_core_validation.json
>-share/vulkan/explicit_layer.d/VkLayer_object_tracker.json
>-share/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
>+share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
>+share/vulkan/explicit_layer.d/VkLayer_object_lifetimes.json
> share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
>-share/vulkan/explicit_layer.d/VkLayer_threading.json
>+share/vulkan/explicit_layer.d/VkLayer_stateless_validation.json
>+share/vulkan/explicit_layer.d/VkLayer_thread_safety.json
> share/vulkan/explicit_layer.d/VkLayer_unique_objects.json
>diff --git c/graphics/vulkan-loader/Makefile i/graphics/vulkan-loader/Makefile
>index c2580d10cf50..1cdae2e9c862 100644
>--- c/graphics/vulkan-loader/Makefile
>+++ i/graphics/vulkan-loader/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	vulkan-loader
> DISTVERSIONPREFIX=sdk-
>-DISTVERSION=	1.1.82.0
>-PORTREVISION=	3
>+DISTVERSION=	1.1.108.0
> CATEGORIES=	graphics devel
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -21,7 +20,7 @@ GH_ACCOUNT=	KhronosGroup
> GH_PROJECT=	Vulkan-Loader
> 
> CMAKE_ON=	CMAKE_SKIP_RPATH
>-CMAKE_OFF=	BUILD_TESTS BUILD_WSI_MIR_SUPPORT
>+CMAKE_OFF=	BUILD_TESTS
> 
> OPTIONS_DEFINE=	XLIB XCB WAYLAND
> OPTIONS_DEFAULT=XLIB XCB WAYLAND
>diff --git c/graphics/vulkan-loader/distinfo i/graphics/vulkan-loader/distinfo
>index 3c169857e743..149f8e43ba5a 100644
>--- c/graphics/vulkan-loader/distinfo
>+++ i/graphics/vulkan-loader/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1533664679
>-SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.1.82.0_GH0.tar.gz) = 86cd3e93d99cbfbb8550e7f2137cacfdaf9aa6611b814e054b2156b4b4775b0c
>-SIZE (KhronosGroup-Vulkan-Loader-sdk-1.1.82.0_GH0.tar.gz) = 1341774
>+TIMESTAMP = 1562258759
>+SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.1.108.0_GH0.tar.gz) = cf8c8965b51ddb4cc905d4f7370324de54e17366a8dfaf96c0a922e9c32d3817
>+SIZE (KhronosGroup-Vulkan-Loader-sdk-1.1.108.0_GH0.tar.gz) = 1342959
>diff --git c/graphics/vulkan-loader/files/patch-CMakeLists.txt i/graphics/vulkan-loader/files/patch-CMakeLists.txt
>index ef328049a55c..c1e31b0e33c4 100644
>--- c/graphics/vulkan-loader/files/patch-CMakeLists.txt
>+++ i/graphics/vulkan-loader/files/patch-CMakeLists.txt
>@@ -1,27 +1,15 @@
>---- CMakeLists.txt.orig	2018-08-03 22:10:42 UTC
>-+++ CMakeLists.txt
>-@@ -57,9 +57,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
>- # "Helper" targets that don't have interesting source code should set their FOLDER property to this
>- set(LOADER_HELPER_FOLDER "Helper Targets")
>+--- CMakeLists.txt.orig	2019-06-11 20:20:18.000000000 +0300
>++++ CMakeLists.txt	2019-07-04 19:50:11.342946000 +0300
>+@@ -77,7 +77,7 @@
>  
>--if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
>-+if(UNIX AND NOT APPLE)
>+ if(UNIX)
>      set(
> -        FALLBACK_CONFIG_DIRS "/etc/xdg"
> +        FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
>          CACHE
>              STRING
>              "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
>-@@ -72,7 +72,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_
>-         )
>- endif()
>- 
>--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>-+if(UNIX AND NOT APPLE)
>-     include(FindPkgConfig)
>-     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
>-     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
>-@@ -81,10 +81,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>+@@ -97,10 +97,12 @@
>  
>      if(BUILD_WSI_XCB_SUPPORT)
>          find_package(XCB REQUIRED)
>diff --git c/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt i/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt
>index 6dc7df83c230..ca949d3df149 100644
>--- c/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt
>+++ i/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt
>@@ -1,20 +1,11 @@
>---- loader/CMakeLists.txt.orig	2018-08-03 22:10:42 UTC
>-+++ loader/CMakeLists.txt
>-@@ -40,7 +40,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
>-     endif()
>- elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
>-     add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
>--elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
>-+elseif(UNIX AND NOT APPLE)
>-     if(BUILD_WSI_XCB_SUPPORT)
>-         add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
>-     endif()
>-@@ -223,7 +223,7 @@ else()
>-     add_dependencies(vulkan generate_helper_files loader_gen_files loader_asm_gen_files)
>-     target_compile_definitions(vulkan PUBLIC -DLOADER_DYNAMIC_LIB)
>-     set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
>+--- loader/CMakeLists.txt.orig	2019-06-11 20:20:18.000000000 +0300
>++++ loader/CMakeLists.txt	2019-07-04 19:51:14.741049000 +0300
>+@@ -247,7 +247,7 @@
>+                                      "1"
>+                                      VERSION
>+                                      "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
> -    target_link_libraries(vulkan -ldl -lpthread -lm)
> +    target_link_libraries(vulkan ${CMAKE_DL_LIBS} -lpthread -lm)
>+     target_link_libraries(vulkan Vulkan::Headers)
>  
>      if(APPLE)
>-         find_library(COREFOUNDATION_LIBRARY NAMES CoreFoundation)
>diff --git c/graphics/vulkan-loader/pkg-plist i/graphics/vulkan-loader/pkg-plist
>index d52e84595793..026ab13dd665 100644
>--- c/graphics/vulkan-loader/pkg-plist
>+++ i/graphics/vulkan-loader/pkg-plist
>@@ -1,4 +1,4 @@
> lib/libvulkan.so
> lib/libvulkan.so.1
>-lib/libvulkan.so.1.1.82
>+lib/libvulkan.so.1.1.108
> libdata/pkgconfig/vulkan.pc

Actions: View | Diff

Attachments on bug 238945: 205522