From a9fa72b11b4d0b7439326bb134933e2ee486eda5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 2 Aug 2022 03:09:36 -0400 Subject: [PATCH] import vulkan-loader-1.3.216.0-1.el8_6 --- .gitignore | 2 +- .vulkan-loader.metadata | 2 +- ...ttempt-to-avoid-text-relocations-in-.patch | 34 ------------------- SOURCES/add-notes.patch | 10 +++--- SPECS/vulkan-loader.spec | 9 ++--- 5 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 SOURCES/0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch diff --git a/.gitignore b/.gitignore index 6cd6788..93650f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/Vulkan-Loader-sdk-1.3.204.0.tar.gz +SOURCES/Vulkan-Loader-sdk-1.3.216.0.tar.gz diff --git a/.vulkan-loader.metadata b/.vulkan-loader.metadata index 852e192..1755148 100644 --- a/.vulkan-loader.metadata +++ b/.vulkan-loader.metadata @@ -1 +1 @@ -5631dcb52bbe369f3af888317ecde0049bc1f211 SOURCES/Vulkan-Loader-sdk-1.3.204.0.tar.gz +11870cdc885ca2c5ec73e29326c998c9d8935b6a SOURCES/Vulkan-Loader-sdk-1.3.216.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 deleted file mode 100644 index 98e7623..0000000 --- a/SOURCES/0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/SOURCES/add-notes.patch b/SOURCES/add-notes.patch index 0ebd368..2e4c822 100644 --- a/SOURCES/add-notes.patch +++ b/SOURCES/add-notes.patch @@ -1,7 +1,7 @@ -diff -up Vulkan-Loader-sdk-1.3.204.0/loader/CMakeLists.txt.dma Vulkan-Loader-sdk-1.3.204.0/loader/CMakeLists.txt ---- Vulkan-Loader-sdk-1.3.204.0/loader/CMakeLists.txt.dma 2022-02-22 10:03:10.150545799 +1000 -+++ Vulkan-Loader-sdk-1.3.204.0/loader/CMakeLists.txt 2022-02-22 10:03:37.930052891 +1000 -@@ -221,7 +221,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux +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) @@ -9,4 +9,4 @@ diff -up Vulkan-Loader-sdk-1.3.204.0/loader/CMakeLists.txt.dma Vulkan-Loader-sdk + set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -Wa,--generate-missing-build-notes=yes") set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) - if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "aarch64") + if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") diff --git a/SPECS/vulkan-loader.spec b/SPECS/vulkan-loader.spec index 9e7a460..ae6bc90 100644 --- a/SPECS/vulkan-loader.spec +++ b/SPECS/vulkan-loader.spec @@ -1,6 +1,6 @@ Name: vulkan-loader -Version: 1.3.204.0 -Release: 2%{?dist} +Version: 1.3.216.0 +Release: 1%{?dist} Summary: Vulkan ICD desktop loader License: ASL 2.0 @@ -10,8 +10,6 @@ Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-Loader-sdk-%{version} # hard code adding notes to the one asm file compilation. Patch1: add-notes.patch -Patch2: 0001-loader-aarch64-attempt-to-avoid-text-relocations-in-.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -96,6 +94,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ %changelog +* Mon Jun 20 2022 Dave Airlie - 1.3.216.0-1 +- Update to 1.3.216.0 + * Thu Feb 24 2022 Dave Airlie - 1.3.204.0-2 - Fix aarch64 TEXTREL