diff --git a/SPIRV-LLVM-Translator-15.0.0.tar.gz b/SPIRV-LLVM-Translator-15.0.0.tar.gz new file mode 100644 index 0000000..33dcf44 Binary files /dev/null and b/SPIRV-LLVM-Translator-15.0.0.tar.gz differ diff --git a/sdk-1.3.246.1.tar.gz b/sdk-1.3.246.1.tar.gz new file mode 100644 index 0000000..58b93c9 Binary files /dev/null and b/sdk-1.3.246.1.tar.gz differ diff --git a/spirv-llvm-translator-0592c4f.tar.gz b/spirv-llvm-translator-0592c4f.tar.gz deleted file mode 100644 index f394f7e..0000000 Binary files a/spirv-llvm-translator-0592c4f.tar.gz and /dev/null differ diff --git a/spirv-llvm-translator.spec b/spirv-llvm-translator.spec index 30db116..a828e90 100644 --- a/spirv-llvm-translator.spec +++ b/spirv-llvm-translator.spec @@ -1,14 +1,14 @@ -%global commit 0592c4f6fc42ec947f462e81628280e960a12042 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global spirv_headers_version 1.3.246.1 Name: spirv-llvm-translator -Version: 12.0.0 +Version: 15.0.0 Release: 1 Summary: LLVM to SPIRV Translator License: NCSA URL: https://github.com/KhronosGroup/SPIRV-LLVM-Translator -Source0: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/SPIRV-LLVM-Translator-%{version}.tar.gz +Source1: https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-%{spirv_headers_version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ @@ -16,6 +16,7 @@ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: llvm-devel BuildRequires: llvm-static +BuildRequires: llvm-test %description Khronos LLVM to SPIRV Translator. This is a library @@ -39,12 +40,16 @@ Requires: %{name} = %{version}-%{release} This package contains the standalone llvm to spirv tool. %prep -%autosetup -n SPIRV-LLVM-Translator-%{commit} +%setup -T -q -b 1 -n SPIRV-Headers-sdk-%{spirv_headers_version} +cd .. +mv SPIRV-Headers-sdk-%{spirv_headers_version} SPIRV-Headers +%autosetup -n SPIRV-LLVM-Translator-%{version} %build %cmake -GNinja \ -DLLVM_BUILD_TOOLS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=%{_builddir}/SPIRV-Headers \ -DCMAKE_INSTALL_RPATH:BOOL=";" %ninja_build #%cmake_build @@ -55,17 +60,19 @@ This package contains the standalone llvm to spirv tool. %files %doc README.md -%{_libdir}/libLLVMSPIRVLib.so.12 +%{_libdir}/libLLVMSPIRVLib.so* %files tools %{_bindir}/llvm-spirv %files devel -%dir %{_includedir}/LLVMSPIRVLib/ -%{_includedir}/LLVMSPIRVLib/ +%{_includedir}/LLVMSPIRVLib/* %{_libdir}/libLLVMSPIRVLib.so %{_libdir}/pkgconfig/LLVMSPIRVLib.pc %changelog +* Thu Jun 8 2023 cf-zhao - 15.0.0-1 +- Update to 15.0.0 + * Wed Jan 26 2022 chenchen - 12.0.0-1 - Package init