- updated to sdk 1.2.198.1

- removed outdated system-gtest patch
- versioned Obsoletes for vulkan-loader

diff --git a/Vulkan-Loader-system-gtest.patch b/Vulkan-Loader-system-gtest.patch
deleted file mode 100644 (file)
index f52fced..0000000
--- a/Vulkan-Loader-system-gtest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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)

diff --git a/Vulkan-Loader.spec b/Vulkan-Loader.spec
index 26f161d51d2df1000b03352e7d4451e53a6af22e..8f3015365bb5be20b47f80a05f16aa46018fe739 100644 (file)
--- a/Vulkan-Loader.spec
+++ b/Vulkan-Loader.spec
@@ -4,26 +4,26 @@
 %bcond_without wayland # Wayland support in loader
 %bcond_without x11     # XLib support in loader
 
-%define        api_version     1.2.135.0
+%define        api_version     1.2.198.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}
+Version:       1.2.198.1
 Release:       1
 License:       Apache v2.0, parts MIT-like
 Group:         Libraries
-#Source0Download: https://github.com/KhronosGroup/Vulkan-Loader/releases
+#Source0Download: https://github.com/KhronosGroup/Vulkan-Loader/tags
 Source0:       https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-%{version}/%{name}-sdk-%{version}.tar.gz
-# Source0-md5: 9cc783820e0116bb3dc2148d1236ae67
-Patch0:                %{name}-system-gtest.patch
+# Source0-md5: e2a381bb2457227519a0a75aeee62975
 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:   gmock-devel}
 %{?with_tests:BuildRequires:   gtest-devel}
 %{?with_tests:BuildRequires:   libstdc++-devel >= 6:4.7}
 %{?with_x11:BuildRequires:     libxcb-devel}
@@ -34,8 +34,8 @@ BuildRequires:        python3-modules >= 1:3
 BuildRequires: rpmbuild(macros) >= 1.605
 %{?with_wayland:BuildRequires: wayland-devel}
 %{?with_x11:BuildRequires:     xorg-lib-libX11-devel}
-Provides:      vulkan(loader) = %{api_version}
-Obsoletes:     vulkan-loader
+Provides:      vulkan(loader) = %{version}
+Obsoletes:     vulkan-loader < 1.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,7 +60,6 @@ Pliki nagłówkowe loadera Vulkan.
 
 %prep
 %setup -qn %{name}-sdk-%{version}
-%patch0 -p1
 
 %build
 install -d build