From 3f93034977ce1fb6dad034adc42b347ee413b461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 18 Jan 2024 13:00:07 +0100 Subject: [PATCH] update to 1.3.268.0 SDK Resolves: https://issues.redhat.com/browse/RHEL-1512 --- .gitignore | 1 + shaderc.spec | 27 ++++++++++++--------------- sources | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index ff87ab1..aa07746 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /shaderc-d0b0222.tar.gz /shaderc-8226ab8.tar.gz /shaderc-45b735d.tar.gz +/shaderc-2023.7.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 55ca2e3..82b1684 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,22 +1,14 @@ -# Force out of source build -%undefine __cmake_in_source_build - -# Release 2023.1 -%global commit 45b735dfddefe26a99b77e5a74e30d860713ac64 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20230524 - # Glslang revision from packaged version -%global glslang_version sdk-1.3.239.0 +%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4 Name: shaderc -Version: 2023.4 +Version: 2023.7 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 URL: https://github.com/google/shaderc -Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch Patch2: glslang_linker_flags.patch @@ -24,10 +16,12 @@ Patch2: glslang_linker_flags.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build -BuildRequires: python3-devel -BuildRequires: glslang-devel -BuildRequires: spirv-headers-devel +BuildRequires: sed BuildRequires: spirv-tools + +BuildRequires: glslang-devel +BuildRequires: python3-devel +BuildRequires: spirv-headers-devel BuildRequires: spirv-tools-devel %description @@ -71,7 +65,7 @@ A library for compiling shader strings into SPIR-V. Static libraries for libshaderc. %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 rm -rf third_party @@ -127,6 +121,9 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Wed Jan 17 2024 José Expósito - 2023.7-1 +- Update to 1.3.268.0 SDK + * Fri Jul 07 2023 Dave Airlie - 2023.4-1 - Update for 1.3.250.1 sdk release diff --git a/sources b/sources index 56a907c..f48ee18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-45b735d.tar.gz) = ebd814bcfe377d079e81d0cc3b5d772ed57e7f8526cdb21e7508a67479e6e0e5f9d6558f1247e6e4b170592fca190b4d0dcccae6607206de2b6626b41f4eeaf2 +SHA512 (shaderc-2023.7.tar.gz) = f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269