diff --git a/baselibs.conf b/baselibs.conf index 207fc54..c18c9bb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-2022_4 +libSPIRV-Tools-2022_4_sdk236 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-2022_4- = " + requires "libSPIRV-Tools-2022_4_sdk236- = " diff --git a/sdk-1.3.236.0.tar.gz b/sdk-1.3.236.0.tar.gz new file mode 100644 index 0000000..eb79ac5 --- /dev/null +++ b/sdk-1.3.236.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6789c782a8ba8fa127c3d579f9362f0cdde7a9ccc2e8513cdf217bba579dfda9 +size 3079909 diff --git a/spirv-tools.changes b/spirv-tools.changes index c9d50d8..ca47758 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 23 08:06:09 UTC 2022 - Jan Engelhardt + +- Update to release 2022.4+SDK-1.3.236.0 + * Only validate full layout in Vulkan environments + * Prevent eliminating case constructs in block merging + * Add pass to eliminate dead output components + * Add support for tesc, tese and geom to EliminateDead*Components + * Add option to ADCE to remove output variables from interface + ------------------------------------------------------------------- Mon Oct 24 19:46:06 UTC 2022 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index ee66c07..c0ac94b 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -17,17 +17,17 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-2022_4 +%define lname libSPIRV-Tools-2022_4_sdk236 Name: spirv-tools -Version: 2022.4 +Version: 2022.4+sdk1.3.236.0 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Tools - -Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v%version.tar.gz +#Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v%version.tar.gz +Source: https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.3.236.0.tar.gz Source9: baselibs.conf Patch1: ver.diff BuildRequires: bison @@ -36,7 +36,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.6.1+sdk231 +BuildRequires: spirv-headers >= 1.6.1+sdk-1.3.236.0 %description The package includes an assembler, binary module parser, @@ -64,9 +64,10 @@ validator, and is used in the standalone tools whilst also enabling integration into other code bases directly. %prep -%autosetup -p1 -n SPIRV-Tools-%version +%define slibv 2022.4.sdk236 +%autosetup -p1 -n SPIRV-Tools-sdk-1.3.236.0 find . -type f -name CMakeLists.txt -exec \ - perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt {} + + perl -i -pe 's{\@PACKAGE_VERSION\@}{%slibv}' CMakeLists.txt {} + %build %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \ @@ -77,7 +78,7 @@ find . -type f -name CMakeLists.txt -exec \ %cmake_install perl -i -lpe 's{^#!/usr/bin/env sh$}{#!/bin/sh}' "%buildroot/%_bindir/spirv-lesspipe.sh" for i in "" "-diff" "-link" "-lint" "-opt" "-reduce" "-shared"; do - ln -s "libSPIRV-Tools$i-%version.so" "%buildroot/%_libdir/libSPIRV-Tools$i.so" + ln -s "libSPIRV-Tools$i-%slibv.so" "%buildroot/%_libdir/libSPIRV-Tools$i.so" done %post -n %lname -p /sbin/ldconfig diff --git a/v2022.4.tar.gz b/v2022.4.tar.gz deleted file mode 100644 index 7cd0f1e..0000000 --- a/v2022.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a156215a2d7c6c5b267933ed691877a9a66f07d75970da33ce9ad627a71389d7 -size 3043339