Merge branch 'c9-beta' into a9-beta-new_llvm

This commit is contained in:
eabdullin 2024-10-03 08:17:07 +03:00
commit bf9f50ed90
4 changed files with 13 additions and 21 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
8dfb1377a13faaff88bed7a430fb71aec5de2deb SOURCES/Vulkan-Loader-sdk-1.3.250.1.tar.gz
23a6ddf29216fb8b1a45bab8723b79079c6ab0e3 SOURCES/Vulkan-Loader-sdk-1.3.283.0.tar.gz

View File

@ -1,12 +0,0 @@
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,13 +1,11 @@
Name: vulkan-loader
Version: 1.3.250.1
Version: 1.3.283.0
Release: 1%{?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: add-notes.patch
Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
@ -46,11 +44,11 @@ developing applications that use %{name}.
%prep
%autosetup -p1 -n Vulkan-Loader-sdk-%{version}
%autosetup -p1 -n Vulkan-Loader-vulkan-sdk-%{version}
%build
%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release .
%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release
%cmake_build
@ -82,9 +80,15 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
%files devel
%{_libdir}/pkgconfig/vulkan.pc
%{_libdir}/*.so
%{_libdir}/cmake/VulkanLoader/*.cmake
%changelog
* Tue May 28 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-1
- Update to 1.3.283.0 SDK
* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 1.3.268.0-1
- Update to 1.3.268.0 SDK
* Thu Jul 06 2023 Dave Airlie <airlied@redhat.com> - 1.3.250.1-1
- Update to 1.3.250.1