From 42157bca375031a82885c5116ca0d086a34e7bb3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 13 Jun 2018 16:30:19 -0400 Subject: [PATCH 1/6] Change to Requires: mesa-vulkan-drivers. Too many things still don't agree what Recommends means, and they're even lighter-weight than the GL drivers which are already hard Requires. --- vulkan.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index f1303f4..0e9a922 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -40,7 +40,7 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) -Recommends: mesa-vulkan-drivers +Requires: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} Requires: spirv-tools-libs%{?_isa} = 2018.3.0 @@ -145,6 +145,11 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Wed Jun 13 2018 Adam Jackson - 1.1.73.0-2 +- Change to Requires: mesa-vulkan-drivers. Too many things still don't agree + what Recommends means, and they're even lighter-weight than the GL drivers + which are already hard Requires. + * Tue Apr 24 2018 Leigh Scott - 1.1.73.0-1 - Update to 1.1.73.0 From 9f39a12bf381d5f5fb0518d341f8da9e576f7820 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 16 Jun 2018 15:12:24 +0100 Subject: [PATCH 2/6] Make vulkan x86 only to match vulkan drivers --- vulkan.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index 0e9a922..8f023ea 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -21,6 +21,9 @@ Patch0: cmake_spirv_tools_commit.patch Patch1: 0003-layers-Don-t-set-an-rpath.patch Patch2: 0008-demos-Don-t-build-tri-or-cube.patch +# mesa-vulkan-drivers and nvidia driver don't support other arch +ExclusiveArch: x86_64 i686 + BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 @@ -145,6 +148,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Sat Jun 16 2018 Leigh Scott - 1.1.73.0-3 +- Make vulkan x86 only to match vulkan drivers + * Wed Jun 13 2018 Adam Jackson - 1.1.73.0-2 - Change to Requires: mesa-vulkan-drivers. Too many things still don't agree what Recommends means, and they're even lighter-weight than the GL drivers From 87e37ae6ad1778784909c95f2511c4b5154832b8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 18 Jun 2018 12:41:02 -0400 Subject: [PATCH 3/6] Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. --- vulkan.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 8f023ea..0f77dc6 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -21,9 +21,6 @@ Patch0: cmake_spirv_tools_commit.patch Patch1: 0003-layers-Don-t-set-an-rpath.patch Patch2: 0008-demos-Don-t-build-tri-or-cube.patch -# mesa-vulkan-drivers and nvidia driver don't support other arch -ExclusiveArch: x86_64 i686 - BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: cmake3 @@ -148,6 +145,10 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 +- Undo previous change. Mesa is wrong to not build radv for more arches, + and there's nothing x86-specific about this package, the Vulkan loader. + * Sat Jun 16 2018 Leigh Scott - 1.1.73.0-3 - Make vulkan x86 only to match vulkan drivers From 93f69c94ec7de5ceecaa69ff89caa78f50406b2f Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 18 Jun 2018 19:52:26 +0100 Subject: [PATCH 4/6] Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! --- vulkan.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 0f77dc6..6ba66c5 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -40,7 +40,6 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) -Requires: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} Requires: spirv-tools-libs%{?_isa} = 2018.3.0 @@ -145,6 +144,9 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 +- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! + * Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 - Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. From a979b432bf0c328807654a7cc3af43d197d5fa58 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Jun 2018 00:38:52 +0100 Subject: [PATCH 5/6] Revert "Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it!" This reverts commit ff0332e366bd20e904530932ce88ddd009b0de58. --- vulkan.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vulkan.spec b/vulkan.spec index 6ba66c5..0f77dc6 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 5%{?dist} +Release: 4%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -40,6 +40,7 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-egl) +Requires: mesa-vulkan-drivers %endif Requires: vulkan-filesystem = %{version}-%{release} Requires: spirv-tools-libs%{?_isa} = 2018.3.0 @@ -144,9 +145,6 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog -* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 -- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! - * Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 - Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader. From 050b5ceef84a599d4b07dad780b07c6b3f4f4c6d Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 19 Jun 2018 00:42:57 +0100 Subject: [PATCH 6/6] Revert last commit --- vulkan.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vulkan.spec b/vulkan.spec index 0f77dc6..368e487 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -10,7 +10,7 @@ Name: vulkan Version: 1.1.73.0 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Vulkan loader and validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup @@ -145,6 +145,12 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo %dir %{_datadir}/vulkan/implicit_layer.d/ %changelog +* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-6 +- Revert last commit + +* Mon Jun 18 2018 Leigh Scott - 1.1.73.0-5 +- Remove bogus mesa-vulkan-drivers requires, vulkan doesn't require it! + * Mon Jun 18 2018 Adam Jackson - 1.1.73.0-4 - Undo previous change. Mesa is wrong to not build radv for more arches, and there's nothing x86-specific about this package, the Vulkan loader.