From a6b0d72eda485f6b88c4356f0f7a60dca8f685ad Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 15:40:40 -0500 Subject: [PATCH] import spirv-tools-2019.4-2.20191109.git3e4abc9.el8 --- .gitignore | 2 +- .spirv-tools.metadata | 2 +- SOURCES/fix-cmake-install.patch | 12 ++++++++++ SPECS/spirv-tools.spec | 39 +++++++++++++++++++++++++-------- 4 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 SOURCES/fix-cmake-install.patch diff --git a/.gitignore b/.gitignore index 6741048..3796317 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/spirv-tools-2018.4.tar.gz +SOURCES/spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz diff --git a/.spirv-tools.metadata b/.spirv-tools.metadata index d3f5674..3b98afa 100644 --- a/.spirv-tools.metadata +++ b/.spirv-tools.metadata @@ -1 +1 @@ -4fc1b4546d3e6c85c64d53b28c3fd016d6fd0c48 SOURCES/spirv-tools-2018.4.tar.gz +5d6e6bd863715e27ee13ee5af403b64f87637ec7 SOURCES/spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz diff --git a/SOURCES/fix-cmake-install.patch b/SOURCES/fix-cmake-install.patch new file mode 100644 index 0000000..abc912e --- /dev/null +++ b/SOURCES/fix-cmake-install.patch @@ -0,0 +1,12 @@ +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 814b2a3..b2c0882 100644 --- a/SPECS/spirv-tools.spec +++ b/SPECS/spirv-tools.spec @@ -1,21 +1,27 @@ -#global commit 26a698c34788bb69123a1f3789970a16cf4d9641 -#global shortcommit %%(c=%{commit}; echo ${c:0:7}) -#global commit_date 20180407 -#global gitrel .%%{commit_date}.git%%{shortcommit} +%global commit 3e4abc9ac382b6fc7a88316a700652404b6fb9f7 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20191109 +%global gitrel .%{commit_date}.git%{shortcommit} Name: spirv-tools -Version: 2018.4 -Release: 1%{?dist} +Version: 2019.4 +Release: 2%{?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/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %url/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz + +Patch0: fix-cmake-install.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build +%if 0%{?rhel} == 7 +BuildRequires: python36-devel +%else BuildRequires: python3-devel +%endif BuildRequires: python3-rpm-macros BuildRequires: spirv-headers-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -39,7 +45,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Development files for %{name} %prep -%autosetup -p1 -n SPIRV-Tools-%{version} +%autosetup -p1 -n SPIRV-Tools-%{commit} %build %__mkdir_p %_target_platform @@ -66,21 +72,36 @@ popd %{_bindir}/spirv-lesspipe.sh %{_bindir}/spirv-link %{_bindir}/spirv-opt -%{_bindir}/spirv-stats +%{_bindir}/spirv-reduce %{_bindir}/spirv-val %files libs %{_libdir}/libSPIRV-Tools-link.so %{_libdir}/libSPIRV-Tools-opt.so %{_libdir}/libSPIRV-Tools-shared.so +%{_libdir}/libSPIRV-Tools-reduce.so %{_libdir}/libSPIRV-Tools.so %files devel %{_includedir}/spirv-tools/ +%{_libdir}/cmake/* %{_libdir}/pkgconfig/SPIRV-Tools-shared.pc %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Sat Dec 07 2019 Dave Airlie - 2019.4-2 +- rebuild for 8.2.0 + +* Tue Nov 12 2019 Dave Airlie - 2019.4-1 +- latest upstream snapshot + +* Sun Aug 04 2019 Dave Airlie - 2019.4-0.1 +- Update to latest upstream for glslang +- drop spirv-stats as per upstream. + +* Thu Mar 07 2019 Dave Airlie - 2019.1-1 +- Update to 2019.1 release + * Mon Jul 23 2018 Leigh Scott - 2018.4-1 - Update to 2018.4 release