From 52e1d5543879fae6401c78785c8bf6005d3529f3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 17 Jun 2022 06:37:36 +1000 Subject: [PATCH] Rebase to 1.3.216 SDK Version --- .gitignore | 1 + sources | 2 +- spirv-tools.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8ce781f..50b852b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /spirv-tools-*.tar.gz +/SPIRV-Tools-sdk-1.3.216.0.tar.gz diff --git a/sources b/sources index 0f03a4f..f89afe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (spirv-tools-7826e1941eab1aa66fbe84c48b95921bff402a96.tar.gz) = cd75c237b1dc3ea20d37f95a5e37d804a64c0eab40126ee417d5a0457afa76451143d1a4c9ece14a8b8bce7a7eae531de8c63ae5f3c2a19b371aa5a6f81ee01e +SHA512 (SPIRV-Tools-sdk-1.3.216.0.tar.gz) = 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188 diff --git a/spirv-tools.spec b/spirv-tools.spec index e93f1c9..7005b8c 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,18 +1,15 @@ %undefine __cmake_in_source_build -%global commit 7826e1941eab1aa66fbe84c48b95921bff402a96 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20220407 -%global gitrel .%{commit_date}.git%{shortcommit} +%global sdkver 1.3.216.0 Name: spirv-tools Version: 2022.2 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?dist} Summary: API and commands for processing SPIR-V modules License: ASL 2.0 URL: https://github.com/KhronosGroup/SPIRV-Tools -Source0: %url/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz +Source0: %url/archive/sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz Patch0: fix-gcc12-build.patch @@ -47,7 +44,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Development files for %{name} %prep -%autosetup -p1 -n SPIRV-Tools-%{commit} +%autosetup -p1 -n SPIRV-Tools-sdk-%{sdkver} %build %cmake3 -DCMAKE_BUILD_TYPE=Release \ @@ -92,6 +89,9 @@ Development files for %{name} %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Fri Jun 17 2022 Dave Airlie - 2022.2-2 +- Rebase to 1.3.216 SDK Version + * Wed Apr 27 2022 Dave Airlie - 2022.2-1.20220407.git7826e19 - Rebase to 1.3.211 SDK Version