commit 1f062230e80acdd1d043ab643ad4922bcff7477a Author: CentOS Sources Date: Tue May 17 05:03:29 2022 -0400 import vulkan-loader-1.3.204.0-2.el9 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6cd6788 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/Vulkan-Loader-sdk-1.3.204.0.tar.gz diff --git a/.vulkan-loader.metadata b/.vulkan-loader.metadata new file mode 100644 index 0000000..852e192 --- /dev/null +++ b/.vulkan-loader.metadata @@ -0,0 +1 @@ +5631dcb52bbe369f3af888317ecde0049bc1f211 SOURCES/Vulkan-Loader-sdk-1.3.204.0.tar.gz diff --git a/SOURCES/0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch b/SOURCES/0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch new file mode 100644 index 0000000..98e7623 --- /dev/null +++ b/SOURCES/0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch @@ -0,0 +1,34 @@ +From fb93d3ff8b63bdfdf88a8f25a715f816a52d5dd8 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Dec 2021 14:50:06 +1000 +Subject: [PATCH] loader/aarch64: attempt to avoid text relocations in the + unknown code + +The commit below added a TEXTREL into the loader library, TEXTRELs +and security people don't get on well, so we'd like to avoid that. + +This is my attempt at fixing it, I'm not an aarch64 expert at all, +so I'd really appreciate someone who is to take a look. + +Fixes: 4f78f14c0533 ("loader: Add aarch64 unknown ext chain implementation") +--- + loader/unknown_ext_chain_gas_aarch64.S | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/loader/unknown_ext_chain_gas_aarch64.S b/loader/unknown_ext_chain_gas_aarch64.S +index 1e065007d..a1fa46205 100644 +--- a/loader/unknown_ext_chain_gas_aarch64.S ++++ b/loader/unknown_ext_chain_gas_aarch64.S +@@ -50,7 +50,8 @@ terminError\num: + mov x0, x11 // Vulkan instance pointer (first arg) + mov x1, VK_DEBUG_REPORT_ERROR_BIT_EXT // The error logging bit (second arg) + mov x2, #0 // Zero (third arg) +- ldr x3, =termin_error_string // The error string (fourth arg) ++ adrp x9, termin_error_string ++ ldr x3, [x9, #:lo12:termin_error_string] // The error string (fourth arg) + ldr x4, [x11, x10] // The function name (fifth arg) + bl loader_log // Log the error message before we crash + mov x0, #0 +-- +2.33.1 + diff --git a/SPECS/vulkan-loader.spec b/SPECS/vulkan-loader.spec new file mode 100644 index 0000000..5e16311 --- /dev/null +++ b/SPECS/vulkan-loader.spec @@ -0,0 +1,187 @@ +Name: vulkan-loader +Version: 1.3.204.0 +Release: 2%{?dist} +Summary: Vulkan ICD desktop loader + +License: ASL 2.0 +URL: https://github.com/KhronosGroup/Vulkan-Loader +Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz + +Patch0: 0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake3 +BuildRequires: ninja-build +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: vulkan-headers = %{version} +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrandr) + +Provides: vulkan%{?_isa} = %{version}-%{release} +Provides: vulkan = %{version}-%{release} +Obsoletes: vulkan < %{version}-%{release} +Provides: vulkan-filesystem = %{version}-%{release} +Obsoletes: vulkan-filesystem < %{version}-%{release} + +%if 0%{?fedora} <= 27 +%ifarch x86_64 i686 +Requires: mesa-vulkan-drivers%{?_isa} +%endif +%else +Requires: mesa-vulkan-drivers%{?_isa} +%endif + +%description +This project provides the Khronos official Vulkan ICD desktop +loader for Windows, Linux, and MacOS. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: vulkan-headers +Provides: vulkan-devel%{?_isa} = %{version}-%{release} +Provides: vulkan-devel = %{version}-%{release} +Obsoletes: vulkan-devel < %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%autosetup -p1 -n Vulkan-Loader-sdk-%{version} + + +%build +%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release . +%cmake_build + + +%install +%cmake_install + +# create the filesystem +mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ +%{buildroot}%{_datadir}/vulkan/{explicit,implicit}_layer.d/ \ +%{buildroot}{%{_sysconfdir},%{_datadir}}/vulkan/icd.d + + +%ldconfig_scriptlets + + +%files +%license LICENSE.txt +%doc README.md CONTRIBUTING.md +%dir %{_sysconfdir}/vulkan/ +%dir %{_sysconfdir}/vulkan/explicit_layer.d/ +%dir %{_sysconfdir}/vulkan/icd.d/ +%dir %{_sysconfdir}/vulkan/implicit_layer.d/ +%dir %{_datadir}/vulkan/ +%dir %{_datadir}/vulkan/explicit_layer.d/ +%dir %{_datadir}/vulkan/icd.d/ +%dir %{_datadir}/vulkan/implicit_layer.d/ +%{_libdir}/*.so.* + +%files devel +%{_libdir}/pkgconfig/vulkan.pc +%{_libdir}/*.so + + +%changelog +* Fri Feb 25 2022 Dave Airlie \ - 1.3.204.0-2 +- Fix aarch64 textrel + +* Fri Feb 25 2022 Dave Airlie - 1.3.204.0-1 +- Update to 1.3.204.0 + +* Tue Aug 10 2021 Mohan Boddu - 1.2.182.0-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Jul 30 2021 Dave Airlie - 1.2.182.0-1 +- Update to 1.2.182.0 loader + +* Fri Apr 16 2021 Mohan Boddu - 1.2.162.0-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Fri Jan 29 2021 Dave Airlie - 1.2.162.0-2 +- Fix regression with vulkan loader upstream + +* Fri Jan 29 2021 Dave Airlie - 1.2.162.0-1 +- Update to 1.2.162.0 loader + +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.154.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 04 2020 Dave Airlie - 1.2.154.1-1 +- Update to 1.2.154.1 loader + +* Thu Oct 08 2020 Dave Airlie - 1.2.148.1-1 +- Update to 1.2.148.1 loader - fixes layer loading issue + +* Tue Aug 04 2020 Dave Airlie - 1.2.148.0-1 +- Update to 1.2.148.0 loader + +* Sat Aug 01 2020 Fedora Release Engineering - 1.2.135.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.135.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 22 2020 Dave Airlie - 1.2.135.0-1 +- Update to 1.2.135.0 + +* Wed Jan 29 2020 Dave Airlie - 1.2.131.1-1 +- Update to 1.2.131.1 + +* Tue Nov 12 2019 Dave Airlie - 1.1.126.0-1 +- Update to 1.1.126.0 + +* Wed Jul 31 2019 Dave Airlie - 1.1.114.0-1 +- Update to 1.1.114.0 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.108.0-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 25 2019 Dave Airlie - 1.1.108.0-0 +- Update to 1.1.108.0 + +* Wed Mar 06 2019 Dave Airlie - 1.1.101.0-0 +- Update to 1.1.101.0 + +* Wed Feb 13 2019 Dave Airlie - 1.1.97.0-0 +- Update to 1.1.97.0 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.92.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Dec 03 2018 Dave Airlie - 1.1.92.0-1 +- Update to 1.1.92.0 + +* Mon Nov 19 2018 Dave Airlie - 1.1.85.0-1 +- Update to 1.1.85.0 + +* Tue Aug 07 2018 Leigh Scott - 1.1.82.0-1 +- Update to 1.1.82.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.77.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Leigh Scott - 1.1.77.0-4 +- Fix update path + +* Tue Jun 26 2018 Leigh Scott - 1.1.77.0-3 +- Add conditional for mesa-vulkan-drivers requires + +* Tue Jun 26 2018 Leigh Scott - 1.1.77.0-2 +- Improve description and summary +- Set release + +* Sat Jun 23 2018 Leigh Scott - 1.1.77.0-1 +- Initial package