diff --git a/fix-hack.patch b/fix-hack.patch new file mode 100644 index 0000000..1da0110 --- /dev/null +++ b/fix-hack.patch @@ -0,0 +1,10 @@ +diff -up glslang-05d12a9461dd0a76053bdd42f062a37a10d56afb/Test/baseResults/spv.debugInfo.1.1.frag.out.dma glslang-05d12a9461dd0a76053bdd42f062a37a10d56afb/Test/baseResults/spv.debugInfo.1.1.frag.out +--- glslang-05d12a9461dd0a76053bdd42f062a37a10d56afb/Test/baseResults/spv.debugInfo.1.1.frag.out.dma 2019-02-12 15:50:57.272983148 +1000 ++++ glslang-05d12a9461dd0a76053bdd42f062a37a10d56afb/Test/baseResults/spv.debugInfo.1.1.frag.out 2019-02-12 15:51:08.378280485 +1000 +@@ -1,6 +1,4 @@ + spv.debugInfo.frag +-error: SPIRV-Tools Validation Errors +-error: Invalid SPIR-V binary version 1.3 for target environment SPIR-V 1.0 (under OpenGL 4.5 semantics). + // Module Version 10300 + // Generated by (magic number): 80007 + // Id's are bound by 124 diff --git a/glslang.spec b/glslang.spec index 3c511e8..1991e39 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,11 +1,11 @@ -%global commit e99a26810f65314183163c07664a40e05647c15f +%global commit 05d12a9461dd0a76053bdd42f062a37a10d56afb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20180727 +%global commit_date 20190212 %global gitrel .%{commit_date}.git%{shortcommit} Name: glslang Version: 3.1 -Release: 0.11%{?gitrel}%{?dist} +Release: 0.12%{?gitrel}%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 @@ -14,7 +14,7 @@ Source0: %url/%{name}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz Patch0: nodate.patch Patch1: glslang-default-resource-limits_staticlib.patch Patch2: glslang_tests.patch - +Patch3: fix-hack.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -79,6 +79,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/libglslang-default-resource-limits.a %changelog +* Tue Feb 12 2019 Dave Airlie - 3.1-0.12.20190212.git05d12a9 +- Update for vulkan 1.1.92.0 + * Thu Jan 31 2019 Fedora Release Engineering - 3.1-0.11.20180727.gite99a268 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index d282779..e15af61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glslang-e99a26810f65314183163c07664a40e05647c15f.tar.gz) = 0b4b44d84b0d550b3d21a0efa8e3d2c474ae302ca022d6ade80cbd499090104943973d0a39097ae150fe69d7980ac19d5c368acbfa336487da852b54ecb302e1 +SHA512 (glslang-05d12a9461dd0a76053bdd42f062a37a10d56afb.tar.gz) = d42d4618c8f8f3122ede99d19e4d8cc18acb4c9c7c2f6707a24942b9253ac291a988cbf6b4ded52d421c29329e15dc589833fde7a2f9eb4acded6e2e1dbbf53c