From 56264af2aa8fe59a83be61ea038166ccddcf8639 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 5 Aug 2020 08:09:13 +1000 Subject: [PATCH] Latest upstream snapshot --- glslang-default-resource-limits_staticlib.patch | 11 +++++++---- glslang.spec | 11 +++++++---- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/glslang-default-resource-limits_staticlib.patch b/glslang-default-resource-limits_staticlib.patch index c5a0013..9469329 100644 --- a/glslang-default-resource-limits_staticlib.patch +++ b/glslang-default-resource-limits_staticlib.patch @@ -1,7 +1,10 @@ -diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt ---- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma 2020-04-22 11:00:58.685198803 +1000 -+++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt 2020-04-22 11:01:12.559574492 +1000 -@@ -1,4 +1,4 @@ +diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt +--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma 2020-08-04 13:49:34.201893471 +1000 ++++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt 2020-08-04 13:49:40.622063592 +1000 +@@ -31,7 +31,7 @@ + # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + -add_library(glslang-default-resource-limits +add_library(glslang-default-resource-limits STATIC ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp diff --git a/glslang.spec b/glslang.spec index dbe590b..7afbe3b 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,11 +1,11 @@ -%global commit c9b28b9f3388c607ea5506f5e6197b7150238ad3 +%global commit 5743eed4d16757402517a1068137f4bc1645ee87 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 2020421 +%global commit_date 20200803 %global gitrel .%{commit_date}.git%{shortcommit} Name: glslang -Version: 8.13.3559 -Release: 5%{?gitrel}%{?dist} +Version: 11.0.0 +Release: 1%{?gitrel}%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 @@ -86,6 +86,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/cmake/* %changelog +* Wed Aug 05 2020 Dave Airlie - 11.0.0-1 +- Latest upstream snapshot + * Tue Aug 04 2020 Dave Airlie - 8.13.3559-5 - Use cmake macros. diff --git a/sources b/sources index 452e9f2..fafe778 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3.tar.gz) = 07f0f038e62f2b145fc6c39f604cb5208d4e46c7c770d0ae69e816dfc5cbc4de62cee7cccf0eb2c4241cb375d1618f8952d9d29b946f1f4ca5435d7061a2afcd +SHA512 (glslang-5743eed4d16757402517a1068137f4bc1645ee87.tar.gz) = 5811bd655279814db4c035496eefcaff1f0566899277bbfad6ce3842514467797effc07dd43405b99df32579633bde94f246e81677ae1a208ed5ea3b55179588