Attachment 214508 Details for Bug 242775 – 1.2.135 update, v3

[patch] 1.2.135 update, v3

vkports_update.v3.diff (text/plain), 28.04 KB, created by Jan Beich on 2020-05-14 23:07:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-05-14 23:07:20 UTC

Size: 28.04 KB

patch

obsolete

>From ebc3f659d83166a6e3d42a4f6719fab8db0d432f Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 14 May 2020 17:57:52 +0000
>Subject: [PATCH] devel/vulkan-*: update to 1.2.135.0
>
>PR:		242775
>Submitted by:	Austin Shafer <ashafer@badland.io>
>Approved by:	Greg V <greg@unrelenting.technology> (maintainer)
>---
> devel/glslang/Makefile                        |  6 +--
> devel/glslang/distinfo                        |  8 ++--
> devel/glslang/pkg-plist                       | 36 ++++++++++++++
> devel/spirv-tools/Makefile                    |  5 +-
> devel/spirv-tools/distinfo                    | 10 ++--
> devel/spirv-tools/pkg-plist                   | 13 ++++-
> devel/vulkan-headers/Makefile                 |  2 +-
> devel/vulkan-headers/distinfo                 |  6 +--
> .../files/patch-include_vulkan_vulkan.hpp     | 47 +++++++++++++++++++
> devel/vulkan-headers/pkg-plist                |  2 +
> devel/vulkan-tools/Makefile                   |  5 +-
> devel/vulkan-tools/distinfo                   |  6 +--
> .../files/patch-cube_CMakeLists.txt           |  8 ----
> devel/vulkan-tools/files/patch-cube_cube.cpp  |  4 +-
> .../files/patch-vulkaninfo_vulkaninfo.h       | 45 ++++++++++++++++++
> devel/vulkan-validation-layers/Makefile       | 12 +++--
> devel/vulkan-validation-layers/distinfo       |  6 +--
> devel/vulkan-validation-layers/pkg-plist      | 12 -----
> graphics/shaderc/Makefile                     |  8 ++--
> graphics/shaderc/distinfo                     |  8 ++--
> graphics/shaderc/pkg-plist                    |  7 ++-
> graphics/vkd3d/Makefile                       |  4 +-
> graphics/vkd3d/distinfo                       |  4 +-
> graphics/vulkan-loader/Makefile               |  3 +-
> graphics/vulkan-loader/distinfo               |  6 +--
> .../vulkan-loader/files/patch-CMakeLists.txt  | 24 ----------
> .../files/patch-loader_CMakeLists.txt         | 11 -----
> .../vulkan-loader/files/patch-loader_loader.c | 12 ++---
> .../files/patch-loader_vk__loader__platform.h |  2 +-
> graphics/vulkan-loader/pkg-plist              |  2 +-
> 30 files changed, 206 insertions(+), 118 deletions(-)
> create mode 100644 devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp
> create mode 100644 devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
> delete mode 100644 graphics/vulkan-loader/files/patch-CMakeLists.txt
> delete mode 100644 graphics/vulkan-loader/files/patch-loader_CMakeLists.txt
>
>diff --git a/devel/glslang/Makefile b/devel/glslang/Makefile
>index d704c59f62a2..175e1d1218cb 100644
>--- a/devel/glslang/Makefile
>+++ b/devel/glslang/Makefile
>@@ -1,13 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	glslang
>-DISTVERSION=	7.11.3214
>-PORTREVISION=	1
>+DISTVERSION=	8.13.3743
> CATEGORIES=	devel graphics
> 
>-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>-PATCHFILES+=	24b3e8384e93.patch:-p1
>-
> MAINTAINER=	greg@unrelenting.technology
> COMMENT=	OpenGL and OpenGL ES shader front end and validator
> 
>diff --git a/devel/glslang/distinfo b/devel/glslang/distinfo
>index a8c587476a25..ecbf75e7546f 100644
>--- a/devel/glslang/distinfo
>+++ b/devel/glslang/distinfo
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1562246947
>-SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9
>-SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979
>-SHA256 (24b3e8384e93.patch) = 06738b3f2d3579cd9b4d1ff876ba93d6b10a741b4deb4eab7fe3008cc577c893
>-SIZE (24b3e8384e93.patch) = 972
>+TIMESTAMP = 1589409209
>+SHA256 (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 639ebec56f1a7402f2fa094469a5ddea1eceecfaf2e9efe361376a0f73a7ee2f
>+SIZE (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 3183453
>diff --git a/devel/glslang/pkg-plist b/devel/glslang/pkg-plist
>index 8c98134b6108..ec57fa1f7965 100644
>--- a/devel/glslang/pkg-plist
>+++ b/devel/glslang/pkg-plist
>@@ -7,6 +7,7 @@ include/SPIRV/GLSL.ext.NV.h
> include/SPIRV/GLSL.std.450.h
> include/SPIRV/GlslangToSpv.h
> include/SPIRV/Logger.h
>+include/SPIRV/NonSemanticDebugPrintf.h
> include/SPIRV/SPVRemapper.h
> include/SPIRV/SpvBuilder.h
> include/SPIRV/SpvTools.h
>@@ -26,6 +27,8 @@ include/glslang/Include/ResourceLimits.h
> include/glslang/Include/ShHandle.h
> include/glslang/Include/Types.h
> include/glslang/Include/arrays.h
>+include/glslang/Include/glslang_c_interface.h
>+include/glslang/Include/glslang_c_shader_types.h
> include/glslang/Include/intermediate.h
> include/glslang/Include/revision.h
> include/glslang/MachineIndependent/Initialize.h
>@@ -47,6 +50,39 @@ include/glslang/MachineIndependent/preprocessor/PpTokens.h
> include/glslang/MachineIndependent/propagateNoContraction.h
> include/glslang/MachineIndependent/reflection.h
> include/glslang/Public/ShaderLang.h
>+include/glslang/SPIRV/GLSL.ext.AMD.h
>+include/glslang/SPIRV/GLSL.ext.EXT.h
>+include/glslang/SPIRV/GLSL.ext.KHR.h
>+include/glslang/SPIRV/GLSL.ext.NV.h
>+include/glslang/SPIRV/GLSL.std.450.h
>+include/glslang/SPIRV/GlslangToSpv.h
>+include/glslang/SPIRV/Logger.h
>+include/glslang/SPIRV/NonSemanticDebugPrintf.h
>+include/glslang/SPIRV/SPVRemapper.h
>+include/glslang/SPIRV/SpvBuilder.h
>+include/glslang/SPIRV/SpvTools.h
>+include/glslang/SPIRV/bitutils.h
>+include/glslang/SPIRV/disassemble.h
>+include/glslang/SPIRV/doc.h
>+include/glslang/SPIRV/hex_float.h
>+include/glslang/SPIRV/spirv.hpp
>+include/glslang/SPIRV/spvIR.h
>+lib/cmake/HLSLTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/HLSLTargets.cmake
>+lib/cmake/OGLCompilerTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/OGLCompilerTargets.cmake
>+lib/cmake/OSDependentTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/OSDependentTargets.cmake
>+lib/cmake/SPIRVTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/SPIRVTargets.cmake
>+lib/cmake/SPVRemapperTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/SPVRemapperTargets.cmake
>+lib/cmake/glslangTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/glslangTargets.cmake
>+lib/cmake/glslangValidatorTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/glslangValidatorTargets.cmake
>+lib/cmake/spirv-remapTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/spirv-remapTargets.cmake
> lib/libHLSL.a
> lib/libOGLCompiler.a
> lib/libOSDependent.a
>diff --git a/devel/spirv-tools/Makefile b/devel/spirv-tools/Makefile
>index 36f632a15053..c3bec84f6258 100644
>--- a/devel/spirv-tools/Makefile
>+++ b/devel/spirv-tools/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	spirv-tools
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2019.3
>-PORTREVISION=	1
>+DISTVERSION=	2020.2
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -18,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:1.4.1:headers/external/spirv-headers
>+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers
> 
> CMAKE_ON=	SPIRV_SKIP_TESTS
> CMAKE_OFF=	SPIRV_WERROR
>diff --git a/devel/spirv-tools/distinfo b/devel/spirv-tools/distinfo
>index 2f43dd6830ef..cd64c2568b0b 100644
>--- a/devel/spirv-tools/distinfo
>+++ b/devel/spirv-tools/distinfo
>@@ -1,5 +1,5 @@
>-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-1.4.1_GH0.tar.gz) = a244f0629f75eb450e090cd773d30e22367cb231e964c7492588eb9000201fd1
>-SIZE (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = 359347
>+TIMESTAMP = 1589409763
>+SHA256 (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 29f376f6ebc24d3ce39c1aa47101c4b5d256c8247e41068b541dd43bb88d4174
>+SIZE (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 2126892
>+SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
>+SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853
>diff --git a/devel/spirv-tools/pkg-plist b/devel/spirv-tools/pkg-plist
>index 0a5a16d7c060..e54a5ec428f1 100644
>--- a/devel/spirv-tools/pkg-plist
>+++ b/devel/spirv-tools/pkg-plist
>@@ -5,13 +5,24 @@ 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/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake
>+lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
>+lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
>+lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake
>+lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
>+lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
>+lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
>+lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
> lib/libSPIRV-Tools-link.a
> lib/libSPIRV-Tools-opt.a
> lib/libSPIRV-Tools-reduce.a
>diff --git a/devel/vulkan-headers/Makefile b/devel/vulkan-headers/Makefile
>index cf801b145acf..48b7bc8118a6 100644
>--- a/devel/vulkan-headers/Makefile
>+++ b/devel/vulkan-headers/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	vulkan-headers
> DISTVERSIONPREFIX=sdk-
>-DISTVERSION=	1.1.108.0
>+DISTVERSION=	1.2.135.0
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>diff --git a/devel/vulkan-headers/distinfo b/devel/vulkan-headers/distinfo
>index 4da6b74c3d3c..f6ef42854ff3 100644
>--- a/devel/vulkan-headers/distinfo
>+++ b/devel/vulkan-headers/distinfo
>@@ -1,3 +1,3 @@
>-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
>+TIMESTAMP = 1589407360
>+SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = befc69991e1e268db75921c577be32a3f315d01d78b39b74ef87ba6908787b63
>+SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = 757133
>diff --git a/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp b/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp
>new file mode 100644
>index 000000000000..42ebcc526726
>--- /dev/null
>+++ b/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp
>@@ -0,0 +1,47 @@
>+--- include/vulkan/vulkan.hpp.orig	2020-05-14 18:48:51 UTC
>++++ include/vulkan/vulkan.hpp
>+@@ -65,7 +65,7 @@
>+ #endif
>+ 
>+ #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
>+-#  if defined(__linux__) || defined(__APPLE__)
>++#  if defined(__unix__)
>+ #   include <dlfcn.h>
>+ #  endif
>+ 
>+@@ -81153,7 +81153,7 @@ namespace VULKAN_HPP_NAMESPACE
>+     DynamicLoader() : m_success( false )
>+ #endif
>+     {
>+-#if defined(__linux__)
>++#if defined(__unix__)
>+       m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
>+ #elif defined(__APPLE__)
>+       m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
>+@@ -81195,7 +81195,7 @@ namespace VULKAN_HPP_NAMESPACE
>+     {
>+       if ( m_library )
>+       {
>+-#if defined(__linux__) || defined(__APPLE__)
>++#if defined(__unix__)
>+         dlclose( m_library );
>+ #elif defined(_WIN32)
>+         FreeLibrary( m_library );
>+@@ -81206,7 +81206,7 @@ namespace VULKAN_HPP_NAMESPACE
>+     template <typename T>
>+     T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
>+     {
>+-#if defined(__linux__) || defined(__APPLE__)
>++#if defined(__unix__)
>+       return (T)dlsym( m_library, function );
>+ #elif defined(_WIN32)
>+       return (T)GetProcAddress( m_library, function );
>+@@ -81217,7 +81217,7 @@ namespace VULKAN_HPP_NAMESPACE
>+ 
>+   private:
>+     bool m_success;
>+-#if defined(__linux__) || defined(__APPLE__)
>++#if defined(__unix__)
>+     void *m_library;
>+ #elif defined(_WIN32)
>+     HMODULE m_library;
>diff --git a/devel/vulkan-headers/pkg-plist b/devel/vulkan-headers/pkg-plist
>index 9634bbb4bb82..53f0dbe38b9d 100644
>--- a/devel/vulkan-headers/pkg-plist
>+++ b/devel/vulkan-headers/pkg-plist
>@@ -5,6 +5,7 @@ include/vulkan/vk_sdk_platform.h
> include/vulkan/vulkan.h
> include/vulkan/vulkan.hpp
> include/vulkan/vulkan_android.h
>+include/vulkan/vulkan_beta.h
> include/vulkan/vulkan_core.h
> include/vulkan/vulkan_fuchsia.h
> include/vulkan/vulkan_ggp.h
>@@ -22,6 +23,7 @@ share/vulkan/registry/conventions.py
> share/vulkan/registry/generator.py
> share/vulkan/registry/genvk.py
> share/vulkan/registry/reg.py
>+share/vulkan/registry/spec_tools/util.py
> share/vulkan/registry/validusage.json
> share/vulkan/registry/vk.xml
> share/vulkan/registry/vkconventions.py
>diff --git a/devel/vulkan-tools/Makefile b/devel/vulkan-tools/Makefile
>index b845f2a899e2..9e484bdaf4f8 100644
>--- a/devel/vulkan-tools/Makefile
>+++ b/devel/vulkan-tools/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	vulkan-tools
> DISTVERSIONPREFIX=	sdk-
>-DISTVERSION=	1.1.108.0
>-PORTREVISION=	2
>+DISTVERSION=	1.2.135.0
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -21,7 +20,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	KhronosGroup
> GH_PROJECT=	Vulkan-Tools
> 
>-CMAKE_OFF=	BUILD_TESTS BUILD_ICD
>+CMAKE_OFF=	BUILD_ICD
> CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
> 
> OPTIONS_DEFINE=		WAYLAND XCB XLIB
>diff --git a/devel/vulkan-tools/distinfo b/devel/vulkan-tools/distinfo
>index 8f7c04c88952..d8342a8a6a8b 100644
>--- a/devel/vulkan-tools/distinfo
>+++ b/devel/vulkan-tools/distinfo
>@@ -1,3 +1,3 @@
>-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
>+TIMESTAMP = 1589481709
>+SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 83add7b6390ab1eb9b71106b50d7f5ae6afb74374762f0028afc9fdef5380c83
>+SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 710085
>diff --git a/devel/vulkan-tools/files/patch-cube_CMakeLists.txt b/devel/vulkan-tools/files/patch-cube_CMakeLists.txt
>index edfc35ca7449..a3450eaf00e0 100644
>--- a/devel/vulkan-tools/files/patch-cube_CMakeLists.txt
>+++ b/devel/vulkan-tools/files/patch-cube_CMakeLists.txt
>@@ -13,11 +13,3 @@
>      endif()
>  
>      if(BUILD_WSI_WAYLAND_SUPPORT)
>-@@ -174,6 +176,7 @@ elseif(NOT WIN32)
>-                        cube.vert.inc
>-                        cube.frag.inc)
>-         target_link_libraries(vkcube Vulkan::Vulkan)
>-+        include(CheckLibraryExists)
>-         CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT)
>-         if (NEED_RT)
>-             target_link_libraries(vkcube rt)
>diff --git a/devel/vulkan-tools/files/patch-cube_cube.cpp b/devel/vulkan-tools/files/patch-cube_cube.cpp
>index 11817526cb01..12fdcff31e5e 100644
>--- a/devel/vulkan-tools/files/patch-cube_cube.cpp
>+++ b/devel/vulkan-tools/files/patch-cube_cube.cpp
>@@ -1,6 +1,6 @@
>---- cube/cube.cpp.orig	2018-08-07 18:51:55 UTC
>+--- cube/cube.cpp.orig	2020-04-08 02:52:46 UTC
> +++ cube/cube.cpp
>-@@ -2922,7 +2922,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
>+@@ -2999,7 +2999,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
>      return (int)msg.wParam;
>  }
>  
>diff --git a/devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h b/devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
>new file mode 100644
>index 000000000000..c242706cec6d
>--- /dev/null
>+++ b/devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
>@@ -0,0 +1,45 @@
>+--- vulkaninfo/vulkaninfo.h.orig	2020-04-08 02:52:46 UTC
>++++ vulkaninfo/vulkaninfo.h
>+@@ -60,7 +60,7 @@
>+ #include <windows.h>
>+ #endif  // _WIN32
>+ 
>+-#if defined(__linux__) || defined(__APPLE__)
>++#if defined(__unix__) || defined(__APPLE__)
>+ #include <dlfcn.h>
>+ #endif
>+ 
>+@@ -253,7 +253,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&... 
>+ // ----------- Instance Setup ------- //
>+ struct VkDll {
>+     VkResult Initialize() {
>+-#if defined(__linux__)
>++#if defined(__unix__)
>+         library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
>+         if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
>+ #elif defined(_WIN32)
>+@@ -265,7 +265,7 @@ struct VkDll {
>+         return VK_SUCCESS;
>+     }
>+     void Close() {
>+-#if defined(__linux__)
>++#if defined(__unix__)
>+         dlclose(library);
>+ #elif defined(_WIN32)
>+         FreeLibrary(library);
>+@@ -427,13 +427,13 @@ struct VkDll {
>+    private:
>+     template <typename T>
>+     void Load(T &func_dest, const char *func_name) {
>+-#if defined(__linux__)
>++#if defined(__unix__)
>+         func_dest = reinterpret_cast<T>(dlsym(library, func_name));
>+ #elif defined(_WIN32)
>+         func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
>+ #endif
>+     }
>+-#if defined(__linux__)
>++#if defined(__unix__)
>+     void *library;
>+ #elif defined(_WIN32)
>+     HMODULE library;
>diff --git a/devel/vulkan-validation-layers/Makefile b/devel/vulkan-validation-layers/Makefile
>index 81ebfbc4a27d..5a0d8cbb47f8 100644
>--- a/devel/vulkan-validation-layers/Makefile
>+++ b/devel/vulkan-validation-layers/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	vulkan-validation-layers
> DISTVERSIONPREFIX=	sdk-
>-DISTVERSION=	1.1.108.0
>-PORTREVISION=	1
>+DISTVERSION=	1.2.135.0
> CATEGORIES=	devel graphics
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -26,6 +25,13 @@ 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
>-CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
>+CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
>+CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE} \
>+		-DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \
>+		-DCMAKE_BUILD_TYPE=Release
>+
>+post-install:
>+# Avoid conflict with devel/xxhash
>+	@${RM} ${STAGEDIR}${PREFIX}/include/xxhash.*
> 
> .include <bsd.port.mk>
>diff --git a/devel/vulkan-validation-layers/distinfo b/devel/vulkan-validation-layers/distinfo
>index 64e5a021fc12..ae4bb4c3ddfb 100644
>--- a/devel/vulkan-validation-layers/distinfo
>+++ b/devel/vulkan-validation-layers/distinfo
>@@ -1,3 +1,3 @@
>-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
>+TIMESTAMP = 1589407394
>+SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3
>+SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 1980283
>diff --git a/devel/vulkan-validation-layers/pkg-plist b/devel/vulkan-validation-layers/pkg-plist
>index bde276028076..11562b9c2344 100644
>--- a/devel/vulkan-validation-layers/pkg-plist
>+++ b/devel/vulkan-validation-layers/pkg-plist
>@@ -15,24 +15,12 @@ include/vk_layer_extension_utils.h
> include/vk_layer_logging.h
> include/vk_layer_utils.cpp
> include/vk_layer_utils.h
>-include/vk_loader_layer.h
> include/vk_loader_platform.h
> include/vk_object_types.h
> include/vk_safe_struct.cpp
> include/vk_safe_struct.h
> include/vk_typemap_helper.h
> include/vk_validation_error_messages.h
>-lib/libVkLayer_core_validation.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_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_stateless_validation.json
>-share/vulkan/explicit_layer.d/VkLayer_thread_safety.json
>-share/vulkan/explicit_layer.d/VkLayer_unique_objects.json
>diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
>index fae0d399b043..4a1cea3e1739 100644
>--- a/graphics/shaderc/Makefile
>+++ b/graphics/shaderc/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	shaderc
> DISTVERSIONPREFIX=v
>-DISTVERSION=	2018.0
>-PORTREVISION=	2
>+DISTVERSION=	2020.0
> CATEGORIES=	graphics devel
> 
> PATCH_SITES=	https://github.com/haasn/${GH_PROJECT}/commit/
>@@ -22,11 +21,10 @@ USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	google
>+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/third_party/spirv-headers
> 
> CMAKE_ON+=	SHADERC_SKIP_TESTS
>-CMAKE_OFF+=	SHADERC_ENABLE_NV_EXTENSIONS
>-CMAKE_ARGS+=	-DPYTHON_EXE:STRING="${PYTHON_CMD}"
>-CFLAGS+=	-Wno-ignored-attributes -Wno-c++11-narrowing
>+CMAKE_ARGS+=	-DSPIRV-Headers_SOURCE_DIR=${WRKSRC}/third_party/spirv-headers
> 
> # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc
> 
>diff --git a/graphics/shaderc/distinfo b/graphics/shaderc/distinfo
>index cb8b2b64b0a8..2739b5abb607 100644
>--- a/graphics/shaderc/distinfo
>+++ b/graphics/shaderc/distinfo
>@@ -1,5 +1,7 @@
>-TIMESTAMP = 1538421668
>-SHA256 (google-shaderc-v2018.0_GH0.tar.gz) = b96f27e7375a6df08732ebd47c18febf82bd0a87e541fd7814fd8c3aa6c8913a
>-SIZE (google-shaderc-v2018.0_GH0.tar.gz) = 206013
>+TIMESTAMP = 1589483588
>+SHA256 (google-shaderc-v2020.0_GH0.tar.gz) = e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec
>+SIZE (google-shaderc-v2020.0_GH0.tar.gz) = 274371
>+SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
>+SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853
> SHA256 (21c8be385b3f.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea
> SIZE (21c8be385b3f.patch) = 1744
>diff --git a/graphics/shaderc/pkg-plist b/graphics/shaderc/pkg-plist
>index 354ab7f5856e..6f5b49ad47f5 100644
>--- a/graphics/shaderc/pkg-plist
>+++ b/graphics/shaderc/pkg-plist
>@@ -1,8 +1,13 @@
> bin/glslc
>+include/shaderc/env.h
> include/shaderc/shaderc.h
> include/shaderc/shaderc.hpp
>+include/shaderc/status.h
>+include/shaderc/visibility.h
> lib/libshaderc.a
> lib/libshaderc_combined.a
> lib/libshaderc_shared.so
> lib/libshaderc_shared.so.1
>-lib/libshaderc_util.a
>+libdata/pkgconfig/shaderc.pc
>+libdata/pkgconfig/shaderc_combined.pc
>+libdata/pkgconfig/shaderc_static.pc
>diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile
>index c0d0de501b87..5fecfb49b6c3 100644
>--- a/graphics/vkd3d/Makefile
>+++ b/graphics/vkd3d/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	vkd3d
> PORTVERSION=	1.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics
> MASTER_SITES=	https://dl.winehq.org/${PORTNAME}/source/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -28,7 +28,7 @@ TEST_TARGET=	check
> # XXX Move to a separate port (a la devel/vulkan-headers) and maybe make
> #     devel/spirv-tools depend on it as well
> USE_GITHUB=	nodefault
>-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.4.1:headers/external/spirv-headers
>+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers
> CPPFLAGS+=	-isystem${WRKSRC}/external/spirv-headers/include
> 
> post-patch:
>diff --git a/graphics/vkd3d/distinfo b/graphics/vkd3d/distinfo
>index 7c2df85aa390..5a542ff84585 100644
>--- a/graphics/vkd3d/distinfo
>+++ b/graphics/vkd3d/distinfo
>@@ -1,5 +1,5 @@
> TIMESTAMP = 1538761416
> SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6
> SIZE (vkd3d-1.1.tar.xz) = 487452
>-SHA256 (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = a244f0629f75eb450e090cd773d30e22367cb231e964c7492588eb9000201fd1
>-SIZE (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = 359347
>+SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
>+SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853
>diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
>index 1394622be48b..26662764eea8 100644
>--- a/graphics/vulkan-loader/Makefile
>+++ b/graphics/vulkan-loader/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	vulkan-loader
> DISTVERSIONPREFIX=sdk-
>-DISTVERSION=	1.1.108.0
>-PORTREVISION=	1
>+DISTVERSION=	1.2.135.0
> CATEGORIES=	graphics devel
> 
> MAINTAINER=	greg@unrelenting.technology
>diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo
>index 149f8e43ba5a..f140fc955362 100644
>--- a/graphics/vulkan-loader/distinfo
>+++ b/graphics/vulkan-loader/distinfo
>@@ -1,3 +1,3 @@
>-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
>+TIMESTAMP = 1589407291
>+SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 98cd19e4603ca6acc5427686516d0abbf5026acf519d9e40f8136acf809cd117
>+SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 1406699
>diff --git a/graphics/vulkan-loader/files/patch-CMakeLists.txt b/graphics/vulkan-loader/files/patch-CMakeLists.txt
>deleted file mode 100644
>index b866989b58df..000000000000
>--- a/graphics/vulkan-loader/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- CMakeLists.txt.orig	2019-06-11 17:20:18 UTC
>-+++ CMakeLists.txt
>-@@ -77,7 +77,7 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
>- 
>- 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."
>-@@ -97,10 +97,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)
>diff --git a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt b/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt
>deleted file mode 100644
>index c0064799a47f..000000000000
>--- a/graphics/vulkan-loader/files/patch-loader_CMakeLists.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- loader/CMakeLists.txt.orig	2019-06-11 17:20:18 UTC
>-+++ loader/CMakeLists.txt
>-@@ -247,7 +247,7 @@ else()
>-                                      "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)
>diff --git a/graphics/vulkan-loader/files/patch-loader_loader.c b/graphics/vulkan-loader/files/patch-loader_loader.c
>index 5083a1971274..dfbdf49fdbe4 100644
>--- a/graphics/vulkan-loader/files/patch-loader_loader.c
>+++ b/graphics/vulkan-loader/files/patch-loader_loader.c
>@@ -1,18 +1,18 @@
>---- loader/loader.c.orig	2018-08-03 22:10:42 UTC
>+--- loader/loader.c.orig	2020-04-02 16:20:56 UTC
> +++ loader/loader.c
>-@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d
>+@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d
>  }
>  
>  // Environment variables
> -#if defined(__linux__) || defined(__APPLE__)
> +#if defined(__unix__)
>  
>- static inline char *loader_getenv(const char *name, const struct loader_instance *inst) {
>-     // No allocation of memory necessary for Linux, but we should at least touch
>-@@ -225,7 +225,7 @@ static inline char *loader_getenv(const char *name, co
>- }
>+ static inline bool IsHighIntegrity() {
>+     return geteuid() != getuid() || getegid() != getgid();
>+@@ -249,7 +249,7 @@ static inline char *loader_getenv(const char *name, co
>  
>  static inline char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
>+     char *out;
> -#if defined(__APPLE__)
> +#if !defined(__linux__)
>      // Apple does not appear to have a secure getenv implementation.
>diff --git a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
>index 2ff87a33e32a..153cf8ecc747 100644
>--- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
>+++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
>@@ -1,4 +1,4 @@
>---- loader/vk_loader_platform.h.orig	2018-08-03 22:10:42 UTC
>+--- loader/vk_loader_platform.h.orig	2020-04-02 16:20:56 UTC
> +++ loader/vk_loader_platform.h
> @@ -31,7 +31,7 @@
>  #include "vulkan/vk_platform.h"
>diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist
>index 026ab13dd665..65703fbba40f 100644
>--- a/graphics/vulkan-loader/pkg-plist
>+++ b/graphics/vulkan-loader/pkg-plist
>@@ -1,4 +1,4 @@
> lib/libvulkan.so
> lib/libvulkan.so.1
>-lib/libvulkan.so.1.1.108
>+lib/libvulkan.so.1.2.135
> libdata/pkgconfig/vulkan.pc

Actions: View | Diff

Attachments on bug 242775: 214499 | 214508