Compare commits
No commits in common. "c8" and "imports/c8s/vulkan-loader-1.2.162.0-1.el8" have entirely different histories.
c8
...
imports/c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/Vulkan-Loader-sdk-1.3.283.0.tar.gz
|
SOURCES/Vulkan-Loader-sdk-1.2.162.0.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
23a6ddf29216fb8b1a45bab8723b79079c6ab0e3 SOURCES/Vulkan-Loader-sdk-1.3.283.0.tar.gz
|
df585c26d3a04fa521bf5c051f04a3e2e8a8b088 SOURCES/Vulkan-Loader-sdk-1.2.162.0.tar.gz
|
||||||
|
12
SOURCES/add-notes.patch
Normal file
12
SOURCES/add-notes.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up Vulkan-Loader-sdk-1.1.114.0/loader/CMakeLists.txt.da Vulkan-Loader-sdk-1.1.114.0/loader/CMakeLists.txt
|
||||||
|
--- Vulkan-Loader-sdk-1.1.114.0/loader/CMakeLists.txt.da 2019-08-08 11:12:09.817782355 +1000
|
||||||
|
+++ Vulkan-Loader-sdk-1.1.114.0/loader/CMakeLists.txt 2019-08-08 11:13:10.812416417 +1000
|
||||||
|
@@ -149,7 +149,7 @@ elseif(APPLE)
|
||||||
|
add_custom_target(loader_asm_gen_files) # This causes no assembly files to be generated.
|
||||||
|
else(UNIX AND NOT APPLE) # i.e.: Linux
|
||||||
|
enable_language(ASM)
|
||||||
|
- set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS}")
|
||||||
|
+ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -Wa,--generate-missing-build-notes=yes")
|
||||||
|
|
||||||
|
check_include_file("cet.h" HAVE_CET_H)
|
||||||
|
if(HAVE_CET_H)
|
37
SOURCES/fix-vulkan-loader.patch
Normal file
37
SOURCES/fix-vulkan-loader.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 66a23ac8c566299343668f094de50798a5f4a0e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michel Zou <xantares09@hotmail.com>
|
||||||
|
Date: Wed, 16 Dec 2020 15:03:23 +0100
|
||||||
|
Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX
|
||||||
|
|
||||||
|
Closes #527
|
||||||
|
---
|
||||||
|
loader/CMakeLists.txt | 2 +-
|
||||||
|
loader/vulkan.pc.in | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
|
||||||
|
index 659511855..ba9f460f1 100644
|
||||||
|
--- a/loader/CMakeLists.txt
|
||||||
|
+++ b/loader/CMakeLists.txt
|
||||||
|
@@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND)
|
||||||
|
set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
|
||||||
|
endforeach()
|
||||||
|
if(WIN32)
|
||||||
|
- set(LIB_SUFFIX "-1")
|
||||||
|
+ set(VULKAN_LIB_SUFFIX "-1")
|
||||||
|
endif ()
|
||||||
|
configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
|
||||||
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||||
|
diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
|
||||||
|
index fc17cb1f3..44049ee34 100644
|
||||||
|
--- a/loader/vulkan.pc.in
|
||||||
|
+++ b/loader/vulkan.pc.in
|
||||||
|
@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||||
|
Name: @CMAKE_PROJECT_NAME@
|
||||||
|
Description: Vulkan Loader
|
||||||
|
Version: @VK_API_VERSION@
|
||||||
|
-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
|
||||||
|
+Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@
|
||||||
|
Libs.private: @PRIVATE_LIBS@
|
||||||
|
Cflags: -I${includedir}
|
||||||
|
|
@ -1,15 +1,20 @@
|
|||||||
Name: vulkan-loader
|
Name: vulkan-loader
|
||||||
Version: 1.3.283.0
|
Version: 1.2.162.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Vulkan ICD desktop loader
|
Summary: Vulkan ICD desktop loader
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/KhronosGroup/Vulkan-Loader
|
URL: https://github.com/KhronosGroup/Vulkan-Loader
|
||||||
Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version}.tar.gz
|
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
|
||||||
|
# vulkan loader fix from github
|
||||||
|
Patch2: fix-vulkan-loader.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: vulkan-headers = %{version}
|
BuildRequires: vulkan-headers = %{version}
|
||||||
@ -31,7 +36,7 @@ Obsoletes: vulkan-filesystem < %{version}-%{release}
|
|||||||
Requires: mesa-vulkan-drivers%{?_isa}
|
Requires: mesa-vulkan-drivers%{?_isa}
|
||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
Recommends: mesa-vulkan-drivers%{?_isa}
|
Requires: mesa-vulkan-drivers%{?_isa}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -52,16 +57,16 @@ developing applications that use %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n Vulkan-Loader-vulkan-sdk-%{version}
|
%autosetup -n Vulkan-Loader-sdk-%{version} -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release
|
%cmake -GNinja -DCMAKE_BUILD_TYPE=Release .
|
||||||
%cmake_build
|
%ninja_build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%cmake_install
|
%ninja_install
|
||||||
|
|
||||||
# create the filesystem
|
# create the filesystem
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
|
mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
|
||||||
@ -88,34 +93,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
|
|||||||
%files devel
|
%files devel
|
||||||
%{_libdir}/pkgconfig/vulkan.pc
|
%{_libdir}/pkgconfig/vulkan.pc
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/cmake/VulkanLoader/*.cmake
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Sep 10 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-1
|
|
||||||
- Update to 1.3.283.0 SDK
|
|
||||||
Resolves: https://issues.redhat.com/browse/RHEL-54287
|
|
||||||
|
|
||||||
* 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
|
* Mon Feb 01 2021 Dave Airlie <airlied@redhat.com> - 1.2.162.0-1
|
||||||
- Update to 1.2.162.0
|
- Update to 1.2.162.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user