graphics/vulkan-headers: update to 1.2.176
Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.2.174...v1.2.176 Reported by: portscout, Repology
This commit is contained in:
parent
7823968f03
commit
a88b69a272
7 changed files with 72 additions and 26 deletions
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= vulkan-headers
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.2.174
|
||||
DISTVERSION= 1.2.176
|
||||
CATEGORIES= graphics
|
||||
|
||||
MAINTAINER= jbeich@FreeBSD.org
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1617005981
|
||||
SHA256 (KhronosGroup-Vulkan-Headers-v1.2.174_GH0.tar.gz) = 32a0a842081412eac756bf07a6f7ded421c78b2dcba3d4a8f6c410b532d0c739
|
||||
SIZE (KhronosGroup-Vulkan-Headers-v1.2.174_GH0.tar.gz) = 909126
|
||||
TIMESTAMP = 1618813914
|
||||
SHA256 (KhronosGroup-Vulkan-Headers-v1.2.176_GH0.tar.gz) = d77b033e74448341b42d1b6f2b380570e870b0443875f26c9e8a636f01ee6fe7
|
||||
SIZE (KhronosGroup-Vulkan-Headers-v1.2.176_GH0.tar.gz) = 1030697
|
||||
|
|
|
@ -1,56 +1,56 @@
|
|||
--- include/vulkan/vulkan.hpp.orig 2021-03-01 06:51:42 UTC
|
||||
--- include/vulkan/vulkan.hpp.orig 2021-04-19 06:31:54 UTC
|
||||
+++ include/vulkan/vulkan.hpp
|
||||
@@ -67,7 +67,7 @@
|
||||
#endif
|
||||
|
||||
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# include <dlfcn.h>
|
||||
# elif defined( _WIN32 )
|
||||
typedef struct HINSTANCE__ * HINSTANCE;
|
||||
@@ -92518,7 +92518,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
@@ -121385,7 +121385,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( !vulkanLibraryName.empty() )
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
|
||||
# elif defined( _WIN32 )
|
||||
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
|
||||
@@ -92528,7 +92528,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
@@ -121395,7 +121395,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
else
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __QNXNTO__ )
|
||||
+# if defined( __unix__ ) || defined( __QNXNTO__ )
|
||||
-# if defined( __linux__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
+# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
|
||||
if ( m_library == nullptr )
|
||||
{
|
||||
@@ -92571,7 +92571,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
@@ -121439,7 +121439,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( m_library )
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
dlclose( m_library );
|
||||
# elif defined( _WIN32 )
|
||||
::FreeLibrary( m_library );
|
||||
@@ -92584,7 +92584,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
@@ -121452,7 +121452,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
template <typename T>
|
||||
T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
|
||||
T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT
|
||||
{
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
return (T)dlsym( m_library, function );
|
||||
# elif defined( _WIN32 )
|
||||
return (T)::GetProcAddress( m_library, function );
|
||||
@@ -92596,7 +92596,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; }
|
||||
return ( T )::GetProcAddress( m_library, function );
|
||||
@@ -121467,7 +121467,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
|
||||
private:
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ )
|
||||
-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
void * m_library;
|
||||
# elif defined( _WIN32 )
|
||||
::HINSTANCE m_library;
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
include/vk_video/vulkan_video_codec_h264std.h
|
||||
include/vk_video/vulkan_video_codec_h264std_decode.h
|
||||
include/vk_video/vulkan_video_codec_h264std_encode.h
|
||||
include/vk_video/vulkan_video_codec_h265std.h
|
||||
include/vk_video/vulkan_video_codec_h265std_decode.h
|
||||
include/vk_video/vulkan_video_codecs_common.h
|
||||
include/vulkan/vk_icd.h
|
||||
include/vulkan/vk_layer.h
|
||||
include/vulkan/vk_platform.h
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
PORTNAME= vulkan-loader
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.2.174
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= graphics devel
|
||||
|
||||
MAINTAINER= jbeich@FreeBSD.org
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
Part of https://github.com/KhronosGroup/Vulkan-Loader/commit/eb6d6f95dff8
|
||||
|
||||
$ make check-plist
|
||||
====> Checking for pkg-plist issues (check-plist)
|
||||
===> Parsing plist
|
||||
===> Checking for items in STAGEDIR missing from pkg-plist
|
||||
Error: Orphaned: lib/libvulkan.so.0.0.176
|
||||
===> Checking for items in pkg-plist which are not in STAGEDIR
|
||||
Error: Missing: lib/libvulkan.so.1.2.176
|
||||
===> Error: Plist issues found.
|
||||
*** Error code 1
|
||||
|
||||
--- cmake/FindVulkanHeaders.cmake.orig 2021-03-29 20:05:47 UTC
|
||||
+++ cmake/FindVulkanHeaders.cmake
|
||||
@@ -114,19 +114,19 @@ endif()
|
||||
file(STRINGS
|
||||
${VulkanHeaders_main_header}
|
||||
VulkanHeaders_lines
|
||||
- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)")
|
||||
+ REGEX "^#define VK_HEADER_VERSION(_COMPLETE)? ")
|
||||
|
||||
foreach(VulkanHeaders_line ${VulkanHeaders_lines})
|
||||
|
||||
# First, handle the case where we have a major/minor version
|
||||
# Format is:
|
||||
- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0)
|
||||
+ # #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, X, Y, VK_HEADER_VERSION)
|
||||
# We grab the major version (X) and minor version (Y) out of the parentheses
|
||||
- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
|
||||
+ string(REGEX MATCH "VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line})
|
||||
string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}")
|
||||
if (VulkanHeaders_MAJOR_MINOR)
|
||||
- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major)
|
||||
- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor)
|
||||
+ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major)
|
||||
+ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor)
|
||||
if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR})
|
||||
set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major})
|
||||
set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})
|
|
@ -1,4 +1,4 @@
|
|||
lib/libvulkan.so
|
||||
lib/libvulkan.so.1
|
||||
lib/libvulkan.so.1.2.174
|
||||
lib/libvulkan.so.1.2.176
|
||||
libdata/pkgconfig/vulkan.pc
|
||||
|
|
Loading…
Reference in a new issue