From 1141318a25936b3daa370a51894ede04b1f7c4d7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 08:57:02 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .shaderc.metadata | 2 +- SPECS/shaderc.spec | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index f67b3b5..b82a809 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/shaderc-d0b0222.tar.gz +SOURCES/shaderc-2023.7.tar.gz diff --git a/.shaderc.metadata b/.shaderc.metadata index 3ac4421..b998602 100644 --- a/.shaderc.metadata +++ b/.shaderc.metadata @@ -1 +1 @@ -f4dc4690f08d9ac436033d47ebb901ac47d84b87 SOURCES/shaderc-d0b0222.tar.gz +800eb34b6e1e6ef70ace0c383fe4fe62f899d31c SOURCES/shaderc-2023.7.tar.gz diff --git a/SPECS/shaderc.spec b/SPECS/shaderc.spec index f0166bf..82b1684 100644 --- a/SPECS/shaderc.spec +++ b/SPECS/shaderc.spec @@ -1,22 +1,14 @@ -# Force out of source build -%undefine __cmake_in_source_build - -# Release 2023.1 -%global commit d0b02222f33e1e5e1f521e4e4e1cbfa7fe2cf540 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20230116 - # Glslang revision from packaged version -%global glslang_version sdk-1.3.239.0 +%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4 Name: shaderc -Version: 2023.1 -Release: 2%{?dist} +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,12 @@ 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 + * Thu Feb 16 2023 Dave Airlie - 2023.1-2 - Update for 1.3.239.0 sdk release