[packages/Vulkan-Loader] - updated to sdk 1.2.135.0 - added system-gtest patch (but many tests fail for me)

[qboosh]

commit 751e32c9ae7234fe75f5ccd5d2581063e8ebceaa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 5 18:07:45 2020 +0200

    - updated to sdk 1.2.135.0
    - added system-gtest patch (but many tests fail for me)

 Vulkan-Loader-system-gtest.patch | 12 ++++++++++++
 Vulkan-Loader.spec               | 22 ++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/Vulkan-Loader.spec b/Vulkan-Loader.spec
index 39979ae..26f161d 100644
--- a/Vulkan-Loader.spec
+++ b/Vulkan-Loader.spec
@@ -1,28 +1,30 @@
 #
 # Conditional build:
-%bcond_with	tests	# run tests (requires Google Test sources; TODO: use system gtest)
+%bcond_with	tests	# run tests (some failing?)
 %bcond_without	wayland	# Wayland support in loader
 %bcond_without	x11	# XLib support in loader
 
-%define	api_version	1.2.133
+%define	api_version	1.2.135.0
 
 Summary:	Vulkan API loader
 Summary(pl.UTF-8):	Biblioteka wczytująca sterowniki Vulkan
 Name:		Vulkan-Loader
+# note: prefer "sdk-" tags for better quality level
 Version:	%{api_version}
 Release:	1
 License:	Apache v2.0, parts MIT-like
 Group:		Libraries
 #Source0Download: https://github.com/KhronosGroup/Vulkan-Loader/releases
-Source0:	https://github.com/KhronosGroup/Vulkan-Loader/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	4c176849668a0fc757f45838fcab1131
+Source0:	https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-%{version}/%{name}-sdk-%{version}.tar.gz
+# Source0-md5:	9cc783820e0116bb3dc2148d1236ae67
+Patch0:		%{name}-system-gtest.patch
 URL:		https://github.com/KhronosGroup/Vulkan-Loader/
 BuildRequires:	cmake >= 3.10.2
 %if %{with tests} && %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
 BuildRequires:	Vulkan-Headers = %{api_version}
-#%{?with_tests:BuildRequires:	gtest-devel}
+%{?with_tests:BuildRequires:	gtest-devel}
 %{?with_tests:BuildRequires:	libstdc++-devel >= 6:4.7}
 %{?with_x11:BuildRequires:	libxcb-devel}
 BuildRequires:	pkgconfig
@@ -57,7 +59,8 @@ Development files for the Vulkan loader.
 Pliki nagłówkowe loadera Vulkan.
 
 %prep
-%setup -qn %{name}-%{version}
+%setup -qn %{name}-sdk-%{version}
+%patch0 -p1
 
 %build
 install -d build
@@ -65,7 +68,7 @@ cd build
 
 # .pc file creation expect CMAKE_INSTALL_LIBDIR to be relative (to CMAKE_INSTALL_PREFIX)
 %cmake .. \
-	-DCMAKE_INSTALL_LIBDIR=%{_lib} \
+	-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
 	-DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
 	-DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
 	-DBUILD_WSI_XLIB_SUPPORT=%{?with_x11:ON}%{!?with_x11:OFF} \
@@ -75,7 +78,10 @@ cd build
 
 %if %{with tests}
 cd tests
-LC_ALL=C.UTF-8 VK_LAYER_PATH=layers LD_LIBRARY_PATH=../loader:layers ./run_loader_tests.sh
+LC_ALL=C.UTF-8 \
+LD_LIBRARY_PATH=../loader:layers \
+VK_LAYER_PATH=layers \
+./run_loader_tests.sh
 cd ..
 %endif
 
diff --git a/Vulkan-Loader-system-gtest.patch b/Vulkan-Loader-system-gtest.patch
new file mode 100644
index 0000000..f52fced
--- /dev/null
+++ b/Vulkan-Loader-system-gtest.patch
@@ -0,0 +1,12 @@
+--- Vulkan-Loader-sdk-1.2.135.0/CMakeLists.txt.orig	2020-04-02 18:20:56.000000000 +0200
++++ Vulkan-Loader-sdk-1.2.135.0/CMakeLists.txt	2020-07-05 17:25:44.051987690 +0200
+@@ -38,9 +38,6 @@
+     option(BUILD_TESTS "Build Tests" OFF)
+ endif()
+ 
+-# Add the externals directory early so we pickup the headers if they're present
+-add_subdirectory(external)
+-
+ if (TARGET Vulkan::Headers)
+     message(STATUS "Using Vulkan headers from Vulkan::Headers target")
+     get_target_property(VulkanHeaders_INCLUDE_DIRS Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Vulkan-Loader.git/commitdiff/751e32c9ae7234fe75f5ccd5d2581063e8ebceaa