Index: devel/glslang/Makefile =================================================================== --- devel/glslang/Makefile (revision 535188) +++ devel/glslang/Makefile (working copy) @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= glslang -DISTVERSION= 7.11.3214 +DISTVERSION= 8.13.3743 PORTREVISION= 1 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 Index: devel/glslang/distinfo =================================================================== --- devel/glslang/distinfo (revision 535188) +++ devel/glslang/distinfo (working copy) @@ -1,5 +1,5 @@ -TIMESTAMP = 1562246947 -SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9 -SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979 +TIMESTAMP = 1589409209 +SHA256 (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 639ebec56f1a7402f2fa094469a5ddea1eceecfaf2e9efe361376a0f73a7ee2f +SIZE (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 3183453 SHA256 (24b3e8384e93.patch) = 06738b3f2d3579cd9b4d1ff876ba93d6b10a741b4deb4eab7fe3008cc577c893 SIZE (24b3e8384e93.patch) = 972 Index: devel/spirv-tools/Makefile =================================================================== --- devel/spirv-tools/Makefile (revision 535188) +++ devel/spirv-tools/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= spirv-tools DISTVERSIONPREFIX= v -DISTVERSION= 2019.3 +DISTVERSION= 2020.2 PORTREVISION= 1 CATEGORIES= devel graphics @@ -18,7 +18,7 @@ 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 Index: devel/spirv-tools/distinfo =================================================================== --- devel/spirv-tools/distinfo (revision 535188) +++ devel/spirv-tools/distinfo (working copy) @@ -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 Index: devel/spirv-tools/pkg-plist =================================================================== --- devel/spirv-tools/pkg-plist (revision 535188) +++ devel/spirv-tools/pkg-plist (working copy) @@ -5,7 +5,6 @@ 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 Index: devel/vulkan-headers/Makefile =================================================================== --- devel/vulkan-headers/Makefile (revision 535188) +++ devel/vulkan-headers/Makefile (working copy) @@ -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 Index: devel/vulkan-headers/distinfo =================================================================== --- devel/vulkan-headers/distinfo (revision 535188) +++ devel/vulkan-headers/distinfo (working copy) @@ -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 Index: devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp =================================================================== --- devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (nonexistent) +++ devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (working copy) @@ -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 + # 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 + 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; Property changes on: devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/vulkan-headers/pkg-plist =================================================================== --- devel/vulkan-headers/pkg-plist (revision 535188) +++ devel/vulkan-headers/pkg-plist (working copy) @@ -5,6 +5,7 @@ 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 Index: devel/vulkan-tools/Makefile =================================================================== --- devel/vulkan-tools/Makefile (revision 535188) +++ devel/vulkan-tools/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.1.108.0 +DISTVERSION= 1.2.135.0 PORTREVISION= 1 CATEGORIES= devel graphics Index: devel/vulkan-tools/distinfo =================================================================== --- devel/vulkan-tools/distinfo (revision 535188) +++ devel/vulkan-tools/distinfo (working copy) @@ -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 Index: devel/vulkan-tools/files/patch-cube_cube.cpp =================================================================== --- devel/vulkan-tools/files/patch-cube_cube.cpp (revision 535188) +++ devel/vulkan-tools/files/patch-cube_cube.cpp (working copy) @@ -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; } Index: devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h =================================================================== --- devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h (nonexistent) +++ devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h (working copy) @@ -0,0 +1,45 @@ +--- vulkaninfo/vulkaninfo.h.orig 2020-04-08 02:52:46 UTC ++++ vulkaninfo/vulkaninfo.h +@@ -60,7 +60,7 @@ + #include + #endif // _WIN32 + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__unix__) || defined(__APPLE__) + #include + #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 + void Load(T &func_dest, const char *func_name) { +-#if defined(__linux__) ++#if defined(__unix__) + func_dest = reinterpret_cast(dlsym(library, func_name)); + #elif defined(_WIN32) + func_dest = reinterpret_cast(GetProcAddress(library, func_name)); + #endif + } +-#if defined(__linux__) ++#if defined(__unix__) + void *library; + #elif defined(_WIN32) + HMODULE library; Property changes on: devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/vulkan-validation-layers/Makefile =================================================================== --- devel/vulkan-validation-layers/Makefile (revision 535188) +++ devel/vulkan-validation-layers/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= sdk- -DISTVERSION= 1.1.108.0 +DISTVERSION= 1.2.135.0 PORTREVISION= 1 CATEGORIES= devel graphics @@ -26,6 +26,9 @@ # 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 .include Index: devel/vulkan-validation-layers/distinfo =================================================================== --- devel/vulkan-validation-layers/distinfo (revision 535188) +++ devel/vulkan-validation-layers/distinfo (working copy) @@ -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 Index: devel/vulkan-validation-layers/pkg-plist =================================================================== --- devel/vulkan-validation-layers/pkg-plist (revision 535188) +++ devel/vulkan-validation-layers/pkg-plist (working copy) @@ -15,7 +15,6 @@ 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 @@ -22,17 +21,6 @@ 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 Index: graphics/shaderc/Makefile =================================================================== --- graphics/shaderc/Makefile (revision 535188) +++ graphics/shaderc/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= shaderc DISTVERSIONPREFIX=v -DISTVERSION= 2018.0 +DISTVERSION= 2020.0 PORTREVISION= 2 CATEGORIES= graphics devel @@ -22,10 +22,12 @@ 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}" +CMAKE_ARGS+= -DPYTHON_EXE:STRING="${PYTHON_CMD}" \ + -DSPIRV-Headers_SOURCE_DIR=${WRKSRC}/third_party/spirv-headers CFLAGS+= -Wno-ignored-attributes -Wno-c++11-narrowing # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc Index: graphics/shaderc/distinfo =================================================================== --- graphics/shaderc/distinfo (revision 535188) +++ graphics/shaderc/distinfo (working copy) @@ -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 Index: graphics/vulkan-loader/Makefile =================================================================== --- graphics/vulkan-loader/Makefile (revision 535188) +++ graphics/vulkan-loader/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX=sdk- -DISTVERSION= 1.1.108.0 +DISTVERSION= 1.2.135.0 PORTREVISION= 1 CATEGORIES= graphics devel Index: graphics/vulkan-loader/distinfo =================================================================== --- graphics/vulkan-loader/distinfo (revision 535188) +++ graphics/vulkan-loader/distinfo (working copy) @@ -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 Index: graphics/vulkan-loader/files/patch-CMakeLists.txt =================================================================== --- graphics/vulkan-loader/files/patch-CMakeLists.txt (revision 535188) +++ graphics/vulkan-loader/files/patch-CMakeLists.txt (nonexistent) @@ -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) Property changes on: graphics/vulkan-loader/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/vulkan-loader/files/patch-loader_CMakeLists.txt =================================================================== --- graphics/vulkan-loader/files/patch-loader_CMakeLists.txt (revision 535188) +++ graphics/vulkan-loader/files/patch-loader_CMakeLists.txt (nonexistent) @@ -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) Property changes on: graphics/vulkan-loader/files/patch-loader_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/vulkan-loader/files/patch-loader_loader.c =================================================================== --- graphics/vulkan-loader/files/patch-loader_loader.c (revision 535188) +++ graphics/vulkan-loader/files/patch-loader_loader.c (working copy) @@ -1,6 +1,6 @@ ---- 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 @@ -7,12 +7,12 @@ -#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. Index: graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h =================================================================== --- graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (revision 535188) +++ graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (working copy) @@ -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" Index: graphics/vulkan-loader/pkg-plist =================================================================== --- graphics/vulkan-loader/pkg-plist (revision 535188) +++ graphics/vulkan-loader/pkg-plist (working copy) @@ -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