diff --git a/.gitignore b/.gitignore index 3796317..1175e04 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz +SOURCES/spirv-tools-97f1d485b76303ea7094fa164c0cc770b79f6f78.tar.gz diff --git a/.spirv-tools.metadata b/.spirv-tools.metadata index 3b98afa..49603d3 100644 --- a/.spirv-tools.metadata +++ b/.spirv-tools.metadata @@ -1 +1 @@ -5d6e6bd863715e27ee13ee5af403b64f87637ec7 SOURCES/spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz +8e7b972d6bd221f385da0ddf186502bfaf370701 SOURCES/spirv-tools-97f1d485b76303ea7094fa164c0cc770b79f6f78.tar.gz diff --git a/SOURCES/fix-cmake-install.patch b/SOURCES/fix-cmake-install.patch deleted file mode 100644 index abc912e..0000000 --- a/SOURCES/fix-cmake-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt.dma SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt ---- SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt.dma 2019-11-12 13:58:34.347573658 +1000 -+++ SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt 2019-11-12 13:58:47.166919110 +1000 -@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - endmacro() - else() - macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} lib/cmake/${TARGET}) -+ set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET}) - endmacro() - endif() - diff --git a/SPECS/spirv-tools.spec b/SPECS/spirv-tools.spec index b2c0882..dc14287 100644 --- a/SPECS/spirv-tools.spec +++ b/SPECS/spirv-tools.spec @@ -1,19 +1,17 @@ -%global commit 3e4abc9ac382b6fc7a88316a700652404b6fb9f7 +%global commit 97f1d485b76303ea7094fa164c0cc770b79f6f78 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20191109 +%global commit_date 20200129 %global gitrel .%{commit_date}.git%{shortcommit} Name: spirv-tools -Version: 2019.4 -Release: 2%{?gitrel}%{?dist} +Version: 2019.5 +Release: 1%{?gitrel}%{?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 -Patch0: fix-cmake-install.patch - BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -89,6 +87,9 @@ popd %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Wed Jan 29 2020 Dave Airlie - 2019.5-1 +- update to latest upstream + * Sat Dec 07 2019 Dave Airlie - 2019.4-2 - rebuild for 8.2.0