Compare commits

...

No commits in common. "imports/c8-beta/vulkan-loader-1.1.82.0-1.el8" and "c8" have entirely different histories.

4 changed files with 71 additions and 10 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/Vulkan-Loader-sdk-1.1.82.0.tar.gz
SOURCES/Vulkan-Loader-sdk-1.3.250.1.tar.gz

View File

@ -1 +0,0 @@
f8c25d4821ab04a145b7896a295e3a71da891fcb SOURCES/Vulkan-Loader-sdk-1.1.82.0.tar.gz

12
SOURCES/add-notes.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up Vulkan-Loader-sdk-1.3.216.0/loader/CMakeLists.txt.dma Vulkan-Loader-sdk-1.3.216.0/loader/CMakeLists.txt
--- Vulkan-Loader-sdk-1.3.216.0/loader/CMakeLists.txt.dma 2022-06-20 12:14:17.371384329 +1000
+++ Vulkan-Loader-sdk-1.3.216.0/loader/CMakeLists.txt 2022-06-20 12:14:25.743510904 +1000
@@ -178,7 +178,7 @@ else() # i.e.: Linux
if(USE_GAS)
enable_language(ASM)
- set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS}")
+ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -Wa,--generate-missing-build-notes=yes")
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")

View File

@ -1,5 +1,5 @@
Name: vulkan-loader
Version: 1.1.82.0
Version: 1.3.250.1
Release: 1%{?dist}
Summary: Vulkan ICD desktop loader
@ -7,12 +7,14 @@ License: ASL 2.0
URL: https://github.com/KhronosGroup/Vulkan-Loader
Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz
# hard code adding notes to the one asm file compilation.
Patch1: add-notes.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake3
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: python%{python3_pkgversion}
BuildRequires: %{_bindir}/python3
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: vulkan-headers = %{version}
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
@ -32,7 +34,7 @@ Obsoletes: vulkan-filesystem < %{version}-%{release}
Requires: mesa-vulkan-drivers%{?_isa}
%endif
%else
Requires: mesa-vulkan-drivers%{?_isa}
Recommends: mesa-vulkan-drivers%{?_isa}
%endif
%description
@ -53,11 +55,11 @@ developing applications that use %{name}.
%prep
%autosetup -n Vulkan-Loader-sdk-%{version}
%autosetup -n Vulkan-Loader-sdk-%{version} -p1
%build
%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release .
%cmake -GNinja -DCMAKE_BUILD_TYPE=Release .
%ninja_build
@ -74,7 +76,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
%files
%license LICENSE.txt COPYRIGHT.txt
%license LICENSE.txt
%doc README.md CONTRIBUTING.md
%dir %{_sysconfdir}/vulkan/
%dir %{_sysconfdir}/vulkan/explicit_layer.d/
@ -92,6 +94,54 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
%changelog
* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 1.3.250.1-1
- Update to 1.3.250.1
* Tue Feb 14 2023 Dave Airlie <airlied@redhat.com> - 1.3.239.0-1
- Update to 1.3.239.0
* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 1.3.224.0-2
- Change to recommends
* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 1.3.224.0-1
- Update to 1.3.224.0
* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 1.3.216.0-1
- Update to 1.3.216.0
* Thu Feb 24 2022 Dave Airlie <airlied@redhat.com> - 1.3.204.0-2
- Fix aarch64 TEXTREL
* Mon Feb 21 2022 Dave Airlie <airlied@redhat.com> - 1.3.204.0-1
- Update to 1.3.204.0
* Mon Feb 01 2021 Dave Airlie <airlied@redhat.com> - 1.2.162.0-1
- Update to 1.2.162.0
* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 1.2.148.0-1
- Update to 1.2.148.0
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 1.2.131.1-1
- Update to 1.2.131.1
* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-2
- Rebuild for 8.2.0
* Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-1
- Update to 1.1.126.0
* Thu Aug 08 2019 Dave Airlie <airlied@redhat.com> - 1.1.114.0-3
- Add notes to avoid annobin gaps warning on i686
* Thu Aug 08 2019 Dave Airlie <airlied@redhat.com> - 1.1.114.0-2
- Add support to asm files for -fcf-protection
* Mon Aug 05 2019 Dave Airlie <airlied@redhat.com> - 1.1.114.0-1
- Update to 1.1.114.0
* Wed Mar 06 2019 Dave Airlie <airlied@redhat.com> - 1.1.101.0-0
- Update to 1.1.101.0
* Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.82.0-1
- Update to 1.1.82.0