diff --git a/.gitignore b/.gitignore index 26cac02..03cb5d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glslang-2742e959347ae2fac58acd0d022c92a0ff1f24bf.tar.gz +SOURCES/glslang-sdk-1.3.216.0.tar.gz diff --git a/.glslang.metadata b/.glslang.metadata index c288d87..734e9c1 100644 --- a/.glslang.metadata +++ b/.glslang.metadata @@ -1 +1 @@ -53d23bfd3b5684b0736342d06d8bbb0b23f5c2e5 SOURCES/glslang-2742e959347ae2fac58acd0d022c92a0ff1f24bf.tar.gz +1e5b03daa1a4e573cff5567f508fa1eeea35da4c SOURCES/glslang-sdk-1.3.216.0.tar.gz diff --git a/SPECS/glslang.spec b/SPECS/glslang.spec index 708e3b1..b98858b 100644 --- a/SPECS/glslang.spec +++ b/SPECS/glslang.spec @@ -1,16 +1,13 @@ -%global commit 2742e959347ae2fac58acd0d022c92a0ff1f24bf -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20220202 -%global gitrel .%{commit_date}.git%{shortcommit} +%global sdkver 1.3.216.0 Name: glslang Version: 11.9.0 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 -URL: https://github.com/KhronosGroup -Source0: %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +URL: https://github.com/KhronosGroup/%{name} +Source0: %url/archive/sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz Patch1: glslang-default-resource-limits_staticlib.patch # Patch to build against system spirv-tools (rebased locally) #Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch @@ -36,7 +33,7 @@ ES and OpenGL shading languages. It implements a strict interpretation of the specifications for these languages. %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 -n %{name}-sdk-%{sdkver} # Fix rpmlint warning on debuginfo find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x @@ -81,6 +78,9 @@ install -pm 0644 %{_vpath_builddir}/StandAlone/libglslang-default-resource-limit %{_libdir}/cmake/* %changelog +* Wed Jun 22 2022 Dave Airlie - 11.9.0-2 +- Latest snapshot used in 1.3.216 sdk + * Fri Feb 25 2022 Dave Airlie - 11.9.0-1.20220202.git2742e95 - Latest snapshot used in 1.3.204 sdk