Date: Thu, 10 Dec 2020 00:39:44 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557395 - in head: devel/spirv-tools devel/vulkan-headers devel/vulkan-headers/files devel/vulkan-tools devel/vulkan-validation-layers graphics/vulkan-loader graphics/vulkan-loader/files Message-ID: <202012100039.0BA0di0u050782@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Dec 10 00:39:43 2020 New Revision: 557395 URL: https://svnweb.freebsd.org/changeset/ports/557395 Log: devel/vulkan-*: update to 1.2.162 Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/sdk-1.2.154.0...v1.2.162 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/sdk-1.2.154.1...v1.2.162 Changes: https://github.com/KhronosGroup/Vulkan-Tools/compare/sdk-1.2.154.0...v1.2.162 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/sdk-1.2.154.0...v1.2.162 Changes: https://github.com/KhronosGroup/SPIRV-Tools/compare/v2020.4...v2020.6 PR: 251698 Approved by: Greg V <greg@unrelenting.technology> (maintainer) Modified: head/devel/spirv-tools/Makefile (contents, props changed) head/devel/spirv-tools/distinfo (contents, props changed) head/devel/vulkan-headers/Makefile (contents, props changed) head/devel/vulkan-headers/distinfo (contents, props changed) head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (contents, props changed) head/devel/vulkan-tools/Makefile (contents, props changed) head/devel/vulkan-tools/distinfo (contents, props changed) head/devel/vulkan-validation-layers/Makefile (contents, props changed) head/devel/vulkan-validation-layers/distinfo (contents, props changed) head/devel/vulkan-validation-layers/pkg-plist (contents, props changed) head/graphics/vulkan-loader/Makefile (contents, props changed) head/graphics/vulkan-loader/distinfo (contents, props changed) head/graphics/vulkan-loader/files/patch-loader_loader.c (contents, props changed) head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (contents, props changed) head/graphics/vulkan-loader/pkg-plist (contents, props changed) Modified: head/devel/spirv-tools/Makefile ============================================================================== --- head/devel/spirv-tools/Makefile Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/spirv-tools/Makefile Thu Dec 10 00:39:43 2020 (r557395) @@ -2,7 +2,7 @@ PORTNAME= spirv-tools DISTVERSIONPREFIX= v -DISTVERSION= 2020.4 +DISTVERSION= 2020.6 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:1.5.3.reservations1:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers CMAKE_ON= SPIRV_SKIP_TESTS CMAKE_OFF= SPIRV_WERROR Modified: head/devel/spirv-tools/distinfo ============================================================================== --- head/devel/spirv-tools/distinfo Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/spirv-tools/distinfo Thu Dec 10 00:39:43 2020 (r557395) @@ -1,5 +1,5 @@ -TIMESTAMP = 1606327101 -SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2 -SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd -SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836 +TIMESTAMP = 1607357641 +SHA256 (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3 +SIZE (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = 2595300 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500 Modified: head/devel/vulkan-headers/Makefile ============================================================================== --- head/devel/vulkan-headers/Makefile Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-headers/Makefile Thu Dec 10 00:39:43 2020 (r557395) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= vulkan-headers -DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.2.154.0 +DISTVERSIONPREFIX=v +DISTVERSION= 1.2.162 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology Modified: head/devel/vulkan-headers/distinfo ============================================================================== --- head/devel/vulkan-headers/distinfo Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-headers/distinfo Thu Dec 10 00:39:43 2020 (r557395) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600680367 -SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9 -SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.154.0_GH0.tar.gz) = 817107 +TIMESTAMP = 1606147399 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.162_GH0.tar.gz) = deab1a7a28ad3e0a7a0a1c4cd9c54758dce115a5f231b7205432d2bbbfb4d456 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.162_GH0.tar.gz) = 852973 Modified: head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp ============================================================================== --- head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp Thu Dec 10 00:39:43 2020 (r557395) @@ -1,6 +1,6 @@ ---- include/vulkan/vulkan.hpp.orig 2020-09-21 09:26:07 UTC +--- include/vulkan/vulkan.hpp.orig 2020-12-07 12:15:47 UTC +++ include/vulkan/vulkan.hpp -@@ -66,7 +66,7 @@ +@@ -67,7 +67,7 @@ #endif #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 @@ -9,7 +9,7 @@ # include <dlfcn.h> # elif defined( _WIN32 ) typedef struct HINSTANCE__ * HINSTANCE; -@@ -90062,7 +90062,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -92754,7 +92754,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( !vulkanLibraryName.empty() ) { @@ -18,7 +18,7 @@ m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); -@@ -90072,7 +90072,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -92764,7 +92764,7 @@ namespace VULKAN_HPP_NAMESPACE } else { @@ -27,7 +27,7 @@ m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); if ( m_library == nullptr ) { -@@ -90119,7 +90119,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -92807,7 +92807,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { @@ -36,7 +36,7 @@ dlclose( m_library ); # elif defined( _WIN32 ) ::FreeLibrary( m_library ); -@@ -90132,7 +90132,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -92820,7 +92820,7 @@ namespace VULKAN_HPP_NAMESPACE template <typename T> T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT { @@ -45,10 +45,10 @@ return (T)dlsym( m_library, function ); # elif defined( _WIN32 ) return (T)::GetProcAddress( m_library, function ); -@@ -90145,7 +90145,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -92832,7 +92832,7 @@ namespace VULKAN_HPP_NAMESPACE + bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } private: - bool m_success; -# if defined( __linux__ ) || defined( __APPLE__ ) +# if defined( __unix__ ) || defined( __APPLE__ ) void * m_library; Modified: head/devel/vulkan-tools/Makefile ============================================================================== --- head/devel/vulkan-tools/Makefile Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-tools/Makefile Thu Dec 10 00:39:43 2020 (r557395) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= vulkan-tools -DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.2.154.0 +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.162 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology Modified: head/devel/vulkan-tools/distinfo ============================================================================== --- head/devel/vulkan-tools/distinfo Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-tools/distinfo Thu Dec 10 00:39:43 2020 (r557395) @@ -1,5 +1,5 @@ -TIMESTAMP = 1601595292 -SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272 -SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.154.0_GH0.tar.gz) = 720085 +TIMESTAMP = 1606258133 +SHA256 (KhronosGroup-Vulkan-Tools-v1.2.162_GH0.tar.gz) = 98a3a00471da65df833b4ffeb1ab29ec1d169d5feab54270cf4cd8f50f82e682 +SIZE (KhronosGroup-Vulkan-Tools-v1.2.162_GH0.tar.gz) = 724232 SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1 SIZE (ea2e75bea224.patch) = 22460 Modified: head/devel/vulkan-validation-layers/Makefile ============================================================================== --- head/devel/vulkan-validation-layers/Makefile Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-validation-layers/Makefile Thu Dec 10 00:39:43 2020 (r557395) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= vulkan-validation-layers -DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.2.154.0 +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.162 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -21,20 +21,12 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers # 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_OFF= BUILD_TESTS ${WAYLAND XCB XLIB:L:C/.*/BUILD_WSI_&_SUPPORT/} CMAKE_ON= BUILD_LAYER_SUPPORT_FILES -CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} \ - -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \ - -DSPIRV_HEADERS_INSTALL_DIR=${WRKSRC_headers} \ - -DSPIRV_TOOLS_INSTALL_DIR=${LOCALBASE} \ - -DCMAKE_BUILD_TYPE=Release - -post-install: -# Avoid conflict with devel/xxhash - @${RM} ${STAGEDIR}${PREFIX}/include/xxhash.* +CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \ + -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" .include <bsd.port.mk> Modified: head/devel/vulkan-validation-layers/distinfo ============================================================================== --- head/devel/vulkan-validation-layers/distinfo Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-validation-layers/distinfo Thu Dec 10 00:39:43 2020 (r557395) @@ -1,5 +1,5 @@ -TIMESTAMP = 1606326879 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9 -SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 2316466 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd -SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836 +TIMESTAMP = 1607366877 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.162_GH0.tar.gz) = 83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917 +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.162_GH0.tar.gz) = 2398927 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500 Modified: head/devel/vulkan-validation-layers/pkg-plist ============================================================================== --- head/devel/vulkan-validation-layers/pkg-plist Thu Dec 10 00:39:33 2020 (r557394) +++ head/devel/vulkan-validation-layers/pkg-plist Thu Dec 10 00:39:43 2020 (r557395) @@ -1,26 +1,28 @@ -include/cast_utils.h -include/hash_util.h -include/hash_vk_types.h -include/vk_dispatch_table_helper.h -include/vk_enum_string_helper.h -include/vk_extension_helper.h -include/vk_format_utils.cpp -include/vk_format_utils.h -include/vk_layer_config.cpp -include/vk_layer_config.h -include/vk_layer_data.h -include/vk_layer_dispatch_table.h -include/vk_layer_extension_utils.cpp -include/vk_layer_extension_utils.h -include/vk_layer_logging.h -include/vk_layer_utils.cpp -include/vk_layer_utils.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 +include/vulkan/cast_utils.h +include/vulkan/hash_util.h +include/vulkan/hash_vk_types.h +include/vulkan/vk_dispatch_table_helper.h +include/vulkan/vk_enum_string_helper.h +include/vulkan/vk_extension_helper.h +include/vulkan/vk_format_utils.cpp +include/vulkan/vk_format_utils.h +include/vulkan/vk_layer_config.cpp +include/vulkan/vk_layer_config.h +include/vulkan/vk_layer_data.h +include/vulkan/vk_layer_dispatch_table.h +include/vulkan/vk_layer_extension_utils.cpp +include/vulkan/vk_layer_extension_utils.h +include/vulkan/vk_layer_logging.h +include/vulkan/vk_layer_utils.cpp +include/vulkan/vk_layer_utils.h +include/vulkan/vk_loader_platform.h +include/vulkan/vk_object_types.h +include/vulkan/vk_safe_struct.cpp +include/vulkan/vk_safe_struct.h +include/vulkan/vk_typemap_helper.h +include/vulkan/vk_validation_error_messages.h +include/vulkan/xxhash.c +include/vulkan/xxhash.h lib/libVkLayer_khronos_validation.so lib/libVkLayer_utils.a share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json Modified: head/graphics/vulkan-loader/Makefile ============================================================================== --- head/graphics/vulkan-loader/Makefile Thu Dec 10 00:39:33 2020 (r557394) +++ head/graphics/vulkan-loader/Makefile Thu Dec 10 00:39:43 2020 (r557395) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= vulkan-loader -DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.2.154.1 +DISTVERSIONPREFIX=v +DISTVERSION= 1.2.162 CATEGORIES= graphics devel MAINTAINER= greg@unrelenting.technology Modified: head/graphics/vulkan-loader/distinfo ============================================================================== --- head/graphics/vulkan-loader/distinfo Thu Dec 10 00:39:33 2020 (r557394) +++ head/graphics/vulkan-loader/distinfo Thu Dec 10 00:39:43 2020 (r557395) @@ -1,3 +1,3 @@ -TIMESTAMP = 1602103147 -SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5 -SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.154.1_GH0.tar.gz) = 1417527 +TIMESTAMP = 1606148343 +SHA256 (KhronosGroup-Vulkan-Loader-v1.2.162_GH0.tar.gz) = e582dce35051a34af82db2a8fcd38fbc5837b4506e76e6cda685dca02dee01c7 +SIZE (KhronosGroup-Vulkan-Loader-v1.2.162_GH0.tar.gz) = 1421710 Modified: head/graphics/vulkan-loader/files/patch-loader_loader.c ============================================================================== --- head/graphics/vulkan-loader/files/patch-loader_loader.c Thu Dec 10 00:39:33 2020 (r557394) +++ head/graphics/vulkan-loader/files/patch-loader_loader.c Thu Dec 10 00:39:43 2020 (r557395) @@ -1,15 +1,15 @@ ---- loader/loader.c.orig 2020-04-02 16:20:56 UTC +--- loader/loader.c.orig 2020-11-23 16:19:03 UTC +++ loader/loader.c -@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) static inline bool IsHighIntegrity() { return geteuid() != getuid() || getegid() != getgid(); -@@ -249,7 +249,7 @@ static inline char *loader_getenv(const char *name, co +@@ -268,7 +268,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; Modified: head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h ============================================================================== --- head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h Thu Dec 10 00:39:33 2020 (r557394) +++ head/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h Thu Dec 10 00:39:43 2020 (r557395) @@ -1,15 +1,15 @@ ---- loader/vk_loader_platform.h.orig 2020-10-07 20:39:07 UTC +--- loader/vk_loader_platform.h.orig 2020-11-23 16:19:03 UTC +++ loader/vk_loader_platform.h -@@ -31,7 +31,7 @@ +@@ -35,7 +35,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) /* Linux-specific common code: */ // Headers: -@@ -116,6 +116,26 @@ static inline char *loader_platform_executable_path(ch +@@ -120,6 +120,26 @@ static inline char *loader_platform_executable_path(ch int ret = proc_pidpath(pid, buffer, size); if (ret <= 0) return NULL; buffer[ret] = '\0'; @@ -35,4 +35,4 @@ + return buffer; } - #endif // defined (__APPLE__) + #elif defined(__Fuchsia__) Modified: head/graphics/vulkan-loader/pkg-plist ============================================================================== --- head/graphics/vulkan-loader/pkg-plist Thu Dec 10 00:39:33 2020 (r557394) +++ head/graphics/vulkan-loader/pkg-plist Thu Dec 10 00:39:43 2020 (r557395) @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.2.154 +lib/libvulkan.so.1.2.162 libdata/pkgconfig/vulkan.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012100039.0BA0di0u050782>