Attachment #214499 for bug #242775




# $FreeBSD$

PORTNAME=	glslang
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

Lines 1-5 Link Here

(-)devel/glslang/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562246947	1	TIMESTAMP = 1589409209
2	SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9	2	SHA256 (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 639ebec56f1a7402f2fa094469a5ddea1eceecfaf2e9efe361376a0f73a7ee2f
3	SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979	3	SIZE (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 3183453
4	SHA256 (24b3e8384e93.patch) = 06738b3f2d3579cd9b4d1ff876ba93d6b10a741b4deb4eab7fe3008cc577c893	4	SHA256 (24b3e8384e93.patch) = 06738b3f2d3579cd9b4d1ff876ba93d6b10a741b4deb4eab7fe3008cc577c893
5	SIZE (24b3e8384e93.patch) = 972	5	SIZE (24b3e8384e93.patch) = 972

Lines 2-8 Link Here

(-)devel/spirv-tools/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= spirv-tools	3	PORTNAME= spirv-tools
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2019.3	5	DISTVERSION= 2020.2
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel graphics	7	CATEGORIES= devel graphics
8		8
Lines 18-24 Link Here
18	USE_GITHUB= yes	18	USE_GITHUB= yes
19	GH_ACCOUNT= KhronosGroup	19	GH_ACCOUNT= KhronosGroup
20	GH_PROJECT= SPIRV-Tools	20	GH_PROJECT= SPIRV-Tools
21	GH_TUPLE= KhronosGroup:SPIRV-Headers:1.4.1:headers/external/spirv-headers	21	GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers
22		22
23	CMAKE_ON= SPIRV_SKIP_TESTS	23	CMAKE_ON= SPIRV_SKIP_TESTS
24	CMAKE_OFF= SPIRV_WERROR	24	CMAKE_OFF= SPIRV_WERROR

Lines 1-5 Link Here

(-)devel/spirv-tools/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1562246419	1	TIMESTAMP = 1589409763
2	SHA256 (KhronosGroup-SPIRV-Tools-v2019.3_GH0.tar.gz) = 57c59584d83294ac914c1b21530f9441c29d30979a54e5f0a97b10715dc42c64	2	SHA256 (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 29f376f6ebc24d3ce39c1aa47101c4b5d256c8247e41068b541dd43bb88d4174
3	SIZE (KhronosGroup-SPIRV-Tools-v2019.3_GH0.tar.gz) = 1612835	3	SIZE (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 2126892
4	SHA256 (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = a244f0629f75eb450e090cd773d30e22367cb231e964c7492588eb9000201fd1	4	SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
5	SIZE (KhronosGroup-SPIRV-Headers-1.4.1_GH0.tar.gz) = 359347	5	SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853

Lines 5-11 Link Here

(-)devel/spirv-tools/pkg-plist (-1 lines)
5	bin/spirv-link	5	bin/spirv-link
6	bin/spirv-opt	6	bin/spirv-opt
7	bin/spirv-reduce	7	bin/spirv-reduce
8	bin/spirv-stats
9	bin/spirv-val	8	bin/spirv-val
10	include/spirv-tools/instrument.hpp	9	include/spirv-tools/instrument.hpp
11	include/spirv-tools/libspirv.h	10	include/spirv-tools/libspirv.h

Lines 2-8 Link Here

(-)devel/vulkan-headers/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= vulkan-headers	3	PORTNAME= vulkan-headers
4	DISTVERSIONPREFIX=sdk-	4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.1.108.0	5	DISTVERSION= 1.2.135.0
6	CATEGORIES= devel graphics	6	CATEGORIES= devel graphics
7		7
8	MAINTAINER= greg@unrelenting.technology	8	MAINTAINER= greg@unrelenting.technology

Lines 1-3 Link Here

(-)devel/vulkan-headers/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562245991	1	TIMESTAMP = 1589407360
2	SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.1.108.0_GH0.tar.gz) = 944e88911e47e5d34bc4360e3e5833a0d550e3e7483dfa27a5f4d38525a1b943	2	SHA256 (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = befc69991e1e268db75921c577be32a3f315d01d78b39b74ef87ba6908787b63
3	SIZE (KhronosGroup-Vulkan-Headers-sdk-1.1.108.0_GH0.tar.gz) = 580538	3	SIZE (KhronosGroup-Vulkan-Headers-sdk-1.2.135.0_GH0.tar.gz) = 757133




--- 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;

Lines 5-10 Link Here

(-)devel/vulkan-headers/pkg-plist (+1 lines)
5	include/vulkan/vulkan.h	5	include/vulkan/vulkan.h
6	include/vulkan/vulkan.hpp	6	include/vulkan/vulkan.hpp
7	include/vulkan/vulkan_android.h	7	include/vulkan/vulkan_android.h
		8	include/vulkan/vulkan_beta.h
8	include/vulkan/vulkan_core.h	9	include/vulkan/vulkan_core.h
9	include/vulkan/vulkan_fuchsia.h	10	include/vulkan/vulkan_fuchsia.h
10	include/vulkan/vulkan_ggp.h	11	include/vulkan/vulkan_ggp.h

Lines 2-8 Link Here

(-)devel/vulkan-tools/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= vulkan-tools	3	PORTNAME= vulkan-tools
4	DISTVERSIONPREFIX= sdk-	4	DISTVERSIONPREFIX= sdk-
5	DISTVERSION= 1.1.108.0	5	DISTVERSION= 1.2.135.0
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel graphics	7	CATEGORIES= devel graphics
8		8

Lines 1-3 Link Here

(-)devel/vulkan-tools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562259460	1	TIMESTAMP = 1589481709
2	SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.1.108.0_GH0.tar.gz) = cd9325346d535fc6fd5b6ab0b3e52c8ef91cadc534d8db729700745f18ba5678	2	SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 83add7b6390ab1eb9b71106b50d7f5ae6afb74374762f0028afc9fdef5380c83
3	SIZE (KhronosGroup-Vulkan-Tools-sdk-1.1.108.0_GH0.tar.gz) = 615856	3	SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 710085

Lines 1-6 Link Here

(-)devel/vulkan-tools/files/patch-cube_cube.cpp (-2 / +2 lines)
1	--- cube/cube.cpp.orig 2018-08-07 18:51:55 UTC	1	--- cube/cube.cpp.orig 2020-04-08 02:52:46 UTC
2	+++ cube/cube.cpp	2	+++ cube/cube.cpp
3	@@ -2922,7 +2922,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre	3	@@ -2999,7 +2999,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
4	return (int)msg.wParam;	4	return (int)msg.wParam;
5	}	5	}
6		6




--- 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;

Lines 2-8 Link Here

(-)devel/vulkan-validation-layers/Makefile (-2 / +5 lines)
2		2
3	PORTNAME= vulkan-validation-layers	3	PORTNAME= vulkan-validation-layers
4	DISTVERSIONPREFIX= sdk-	4	DISTVERSIONPREFIX= sdk-
5	DISTVERSION= 1.1.108.0	5	DISTVERSION= 1.2.135.0
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel graphics	7	CATEGORIES= devel graphics
8		8
Lines 26-31 Link Here
26	# WSI_* in here are leftover from when all of Vulkan SDK was in one repo	26	# WSI_* in here are leftover from when all of Vulkan SDK was in one repo
27	CMAKE_OFF= BUILD_TESTS BUILD_WSI_XCB_SUPPORT BUILD_WSI_XLIB_SUPPORT \	27	CMAKE_OFF= BUILD_TESTS BUILD_WSI_XCB_SUPPORT BUILD_WSI_XLIB_SUPPORT \
28	BUILD_WSI_WAYLAND_SUPPORT	28	BUILD_WSI_WAYLAND_SUPPORT
29	CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE}	29	CMAKE_ON= BUILD_LAYER_SUPPORT_FILES
		30	CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} \
		31	-DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \
		32	-DCMAKE_BUILD_TYPE=Release
30		33
31	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/vulkan-validation-layers/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562247215	1	TIMESTAMP = 1589407394
2	SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.108.0_GH0.tar.gz) = 7e286217cb0e83a86b563db9c3f9404d84fbdfcacd7976e865f616ebecfe5811	2	SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3
3	SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.1.108.0_GH0.tar.gz) = 1187826	3	SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 1980283




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





PORTNAME=	shaderc
DISTVERSIONPREFIX=v
DISTVERSION=	2020.0
PORTREVISION=	2
CATEGORIES=	graphics devel



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}" \
		-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

Lines 1-5 Link Here

(-)graphics/shaderc/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1538421668	1	TIMESTAMP = 1589483588
2	SHA256 (google-shaderc-v2018.0_GH0.tar.gz) = b96f27e7375a6df08732ebd47c18febf82bd0a87e541fd7814fd8c3aa6c8913a	2	SHA256 (google-shaderc-v2020.0_GH0.tar.gz) = e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec
3	SIZE (google-shaderc-v2018.0_GH0.tar.gz) = 206013	3	SIZE (google-shaderc-v2020.0_GH0.tar.gz) = 274371
		4	SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
		5	SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853
4	SHA256 (21c8be385b3f.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea	6	SHA256 (21c8be385b3f.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea
5	SIZE (21c8be385b3f.patch) = 1744	7	SIZE (21c8be385b3f.patch) = 1744

Lines 2-8 Link Here

(-)graphics/vulkan-loader/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= vulkan-loader	3	PORTNAME= vulkan-loader
4	DISTVERSIONPREFIX=sdk-	4	DISTVERSIONPREFIX=sdk-
5	DISTVERSION= 1.1.108.0	5	DISTVERSION= 1.2.135.0
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= graphics devel	7	CATEGORIES= graphics devel
8		8

Lines 1-3 Link Here

(-)graphics/vulkan-loader/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562258759	1	TIMESTAMP = 1589407291
2	SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.1.108.0_GH0.tar.gz) = cf8c8965b51ddb4cc905d4f7370324de54e17366a8dfaf96c0a922e9c32d3817	2	SHA256 (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 98cd19e4603ca6acc5427686516d0abbf5026acf519d9e40f8136acf809cd117
3	SIZE (KhronosGroup-Vulkan-Loader-sdk-1.1.108.0_GH0.tar.gz) = 1342959	3	SIZE (KhronosGroup-Vulkan-Loader-sdk-1.2.135.0_GH0.tar.gz) = 1406699




--- 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)

Lines 1-11 Link Here

(-)graphics/vulkan-loader/files/patch-loader_CMakeLists.txt (-11 lines)
1	--- loader/CMakeLists.txt.orig 2019-06-11 17:20:18 UTC
2	+++ loader/CMakeLists.txt
3	@@ -247,7 +247,7 @@ else()
4	"1"
5	VERSION
6	"${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
7	- target_link_libraries(vulkan -ldl -lpthread -lm)
8	+ target_link_libraries(vulkan ${CMAKE_DL_LIBS} -lpthread -lm)
9	target_link_libraries(vulkan Vulkan::Headers)
10
11	if(APPLE)




--- loader/loader.c.orig	2020-04-02 16:20:56 UTC
+++ loader/loader.c
@@ -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 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.

Lines 1-4 Link Here

(-)graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h (-1 / +1 lines)
1	--- loader/vk_loader_platform.h.orig 2018-08-03 22:10:42 UTC	1	--- loader/vk_loader_platform.h.orig 2020-04-02 16:20:56 UTC
2	+++ loader/vk_loader_platform.h	2	+++ loader/vk_loader_platform.h
3	@@ -31,7 +31,7 @@	3	@@ -31,7 +31,7 @@
4	#include "vulkan/vk_platform.h"	4	#include "vulkan/vk_platform.h"

Lines 1-4 Link Here

(-)graphics/vulkan-loader/pkg-plist (-1 / +1 lines)
1	lib/libvulkan.so	1	lib/libvulkan.so
2	lib/libvulkan.so.1	2	lib/libvulkan.so.1
3	lib/libvulkan.so.1.1.108	3	lib/libvulkan.so.1.2.135
4	libdata/pkgconfig/vulkan.pc	4	libdata/pkgconfig/vulkan.pc

Return to bug 242775

Lines 1-12 Link Here

(-)devel/glslang/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= glslang	3	PORTNAME= glslang
4	DISTVERSION= 7.11.3214	4	DISTVERSION= 8.13.3743
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= devel graphics	6	CATEGORIES= devel graphics
7		7
8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
9	PATCHFILES+= 24b3e8384e93.patch:-p1
10		9
11	MAINTAINER= greg@unrelenting.technology	10	MAINTAINER= greg@unrelenting.technology
12	COMMENT= OpenGL and OpenGL ES shader front end and validator	11	COMMENT= OpenGL and OpenGL ES shader front end and validator

Line 0 Link Here

(-)devel/vulkan-headers/files/patch-include_vulkan_vulkan.hpp (+47 lines)
	1	--- include/vulkan/vulkan.hpp.orig 2020-05-14 18:48:51 UTC
	2	+++ include/vulkan/vulkan.hpp
	3	@@ -65,7 +65,7 @@
	4	#endif
	5
	6	#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
	7	-# if defined(__linux__) \|\| defined(__APPLE__)
	8	+# if defined(__unix__)
	9	# include <dlfcn.h>
	10	# endif
	11
	12	@@ -81153,7 +81153,7 @@ namespace VULKAN_HPP_NAMESPACE
	13	DynamicLoader() : m_success( false )
	14	#endif
	15	{
	16	-#if defined(__linux__)
	17	+#if defined(__unix__)
	18	m_library = dlopen( "libvulkan.so", RTLD_NOW \| RTLD_LOCAL );
	19	#elif defined(__APPLE__)
	20	m_library = dlopen( "libvulkan.dylib", RTLD_NOW \| RTLD_LOCAL );
	21	@@ -81195,7 +81195,7 @@ namespace VULKAN_HPP_NAMESPACE
	22	{
	23	if ( m_library )
	24	{
	25	-#if defined(__linux__) \|\| defined(__APPLE__)
	26	+#if defined(__unix__)
	27	dlclose( m_library );
	28	#elif defined(_WIN32)
	29	FreeLibrary( m_library );
	30	@@ -81206,7 +81206,7 @@ namespace VULKAN_HPP_NAMESPACE
	31	template <typename T>
	32	T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
	33	{
	34	-#if defined(__linux__) \|\| defined(__APPLE__)
	35	+#if defined(__unix__)
	36	return (T)dlsym( m_library, function );
	37	#elif defined(_WIN32)
	38	return (T)GetProcAddress( m_library, function );
	39	@@ -81217,7 +81217,7 @@ namespace VULKAN_HPP_NAMESPACE
	40
	41	private:
	42	bool m_success;
	43	-#if defined(__linux__) \|\| defined(__APPLE__)
	44	+#if defined(__unix__)
	45	void *m_library;
	46	#elif defined(_WIN32)
	47	HMODULE m_library;

Line 0 Link Here

(-)devel/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h (+45 lines)
	1	--- vulkaninfo/vulkaninfo.h.orig 2020-04-08 02:52:46 UTC
	2	+++ vulkaninfo/vulkaninfo.h
	3	@@ -60,7 +60,7 @@
	4	#include <windows.h>
	5	#endif // _WIN32
	6
	7	-#if defined(__linux__) \|\| defined(__APPLE__)
	8	+#if defined(__unix__) \|\| defined(__APPLE__)
	9	#include <dlfcn.h>
	10	#endif
	11
	12	@@ -253,7 +253,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
	13	// ----------- Instance Setup ------- //
	14	struct VkDll {
	15	VkResult Initialize() {
	16	-#if defined(__linux__)
	17	+#if defined(__unix__)
	18	library = dlopen("libvulkan.so", RTLD_NOW \| RTLD_LOCAL);
	19	if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW \| RTLD_LOCAL);
	20	#elif defined(_WIN32)
	21	@@ -265,7 +265,7 @@ struct VkDll {
	22	return VK_SUCCESS;
	23	}
	24	void Close() {
	25	-#if defined(__linux__)
	26	+#if defined(__unix__)
	27	dlclose(library);
	28	#elif defined(_WIN32)
	29	FreeLibrary(library);
	30	@@ -427,13 +427,13 @@ struct VkDll {
	31	private:
	32	template <typename T>
	33	void Load(T &func_dest, const char *func_name) {
	34	-#if defined(__linux__)
	35	+#if defined(__unix__)
	36	func_dest = reinterpret_cast<T>(dlsym(library, func_name));
	37	#elif defined(_WIN32)
	38	func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
	39	#endif
	40	}
	41	-#if defined(__linux__)
	42	+#if defined(__unix__)
	43	void *library;
	44	#elif defined(_WIN32)
	45	HMODULE library;

Lines 15-21 Link Here

(-)devel/vulkan-validation-layers/pkg-plist (-12 lines)
15	include/vk_layer_logging.h	15	include/vk_layer_logging.h
16	include/vk_layer_utils.cpp	16	include/vk_layer_utils.cpp
17	include/vk_layer_utils.h	17	include/vk_layer_utils.h
18	include/vk_loader_layer.h
19	include/vk_loader_platform.h	18	include/vk_loader_platform.h
20	include/vk_object_types.h	19	include/vk_object_types.h
21	include/vk_safe_struct.cpp	20	include/vk_safe_struct.cpp
Lines 22-38 Link Here
22	include/vk_safe_struct.h	21	include/vk_safe_struct.h
23	include/vk_typemap_helper.h	22	include/vk_typemap_helper.h
24	include/vk_validation_error_messages.h	23	include/vk_validation_error_messages.h
25	lib/libVkLayer_core_validation.so
26	lib/libVkLayer_khronos_validation.so	24	lib/libVkLayer_khronos_validation.so
27	lib/libVkLayer_object_lifetimes.so
28	lib/libVkLayer_stateless_validation.so
29	lib/libVkLayer_thread_safety.so
30	lib/libVkLayer_unique_objects.so
31	lib/libVkLayer_utils.a	25	lib/libVkLayer_utils.a
32	share/vulkan/explicit_layer.d/VkLayer_core_validation.json
33	share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json	26	share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
34	share/vulkan/explicit_layer.d/VkLayer_object_lifetimes.json
35	share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
36	share/vulkan/explicit_layer.d/VkLayer_stateless_validation.json
37	share/vulkan/explicit_layer.d/VkLayer_thread_safety.json
38	share/vulkan/explicit_layer.d/VkLayer_unique_objects.json

Lines 2-8 Link Here

(-)graphics/shaderc/Makefile (-2 / +4 lines)
2		2
3	PORTNAME= shaderc	3	PORTNAME= shaderc
4	DISTVERSIONPREFIX=v	4	DISTVERSIONPREFIX=v
5	DISTVERSION= 2018.0	5	DISTVERSION= 2020.0
6	PORTREVISION= 2	6	PORTREVISION= 2
7	CATEGORIES= graphics devel	7	CATEGORIES= graphics devel
8		8
Lines 22-31 Link Here
22		22
23	USE_GITHUB= yes	23	USE_GITHUB= yes
24	GH_ACCOUNT= google	24	GH_ACCOUNT= google
		25	GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.3:headers/third_party/spirv-headers
25		26
26	CMAKE_ON+= SHADERC_SKIP_TESTS	27	CMAKE_ON+= SHADERC_SKIP_TESTS
27	CMAKE_OFF+= SHADERC_ENABLE_NV_EXTENSIONS	28	CMAKE_OFF+= SHADERC_ENABLE_NV_EXTENSIONS
28	CMAKE_ARGS+= -DPYTHON_EXE:STRING="${PYTHON_CMD}"	29	CMAKE_ARGS+= -DPYTHON_EXE:STRING="${PYTHON_CMD}" \
		30	-DSPIRV-Headers_SOURCE_DIR=${WRKSRC}/third_party/spirv-headers
29	CFLAGS+= -Wno-ignored-attributes -Wno-c++11-narrowing	31	CFLAGS+= -Wno-ignored-attributes -Wno-c++11-narrowing
30		32
31	# https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc	33	# https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc

Lines 1-24 Link Here

(-)graphics/vulkan-loader/files/patch-CMakeLists.txt (-24 lines)
1	--- CMakeLists.txt.orig 2019-06-11 17:20:18 UTC
2	+++ CMakeLists.txt
3	@@ -77,7 +77,7 @@ set(LOADER_HELPER_FOLDER "Helper Targets")
4
5	if(UNIX)
6	set(
7	- FALLBACK_CONFIG_DIRS "/etc/xdg"
8	+ FALLBACK_CONFIG_DIRS "${CMAKE_INSTALL_PREFIX}/etc/xdg:/etc/xdg"
9	CACHE
10	STRING
11	"Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
12	@@ -97,10 +97,12 @@ if(UNIX AND NOT APPLE) # i.e.: Linux
13
14	if(BUILD_WSI_XCB_SUPPORT)
15	find_package(XCB REQUIRED)
16	+ include_directories(SYSTEM ${XCB_INCLUDE_DIR})
17	endif()
18
19	if(BUILD_WSI_XLIB_SUPPORT)
20	find_package(X11 REQUIRED)
21	+ include_directories(SYSTEM ${X11_Xlib_INCLUDE_PATH})
22	endif()
23
24	if(BUILD_WSI_WAYLAND_SUPPORT)

Lines 1-6 Link Here

(-)graphics/vulkan-loader/files/patch-loader_loader.c (-6 / +6 lines)
1	--- loader/loader.c.orig 2018-08-03 22:10:42 UTC	1	--- loader/loader.c.orig 2020-04-02 16:20:56 UTC
2	+++ loader/loader.c	2	+++ loader/loader.c
3	@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d	3	@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d
4	}	4	}
5		5
6	// Environment variables	6	// Environment variables
Lines 7-18 Link Here
7	-#if defined(__linux__) \|\| defined(__APPLE__)	7	-#if defined(__linux__) \|\| defined(__APPLE__)
8	+#if defined(__unix__)	8	+#if defined(__unix__)
9		9
10	static inline char loader_getenv(const char name, const struct loader_instance *inst) {	10	static inline bool IsHighIntegrity() {
11	// No allocation of memory necessary for Linux, but we should at least touch	11	return geteuid() != getuid() \|\| getegid() != getgid();
12	@@ -225,7 +225,7 @@ static inline char loader_getenv(const char name, co	12	@@ -249,7 +249,7 @@ static inline char loader_getenv(const char name, co
13	}
14		13
15	static inline char loader_secure_getenv(const char name, const struct loader_instance *inst) {	14	static inline char loader_secure_getenv(const char name, const struct loader_instance *inst) {
		15	char *out;
16	-#if defined(__APPLE__)	16	-#if defined(__APPLE__)
17	+#if !defined(__linux__)	17	+#if !defined(__linux__)
18	// Apple does not appear to have a secure getenv implementation.	18	// Apple does not appear to have a secure getenv implementation.