Merge remote-tracking branch 'origin/SPIRV-1.3'

diff --combined glslang.spec
index 966ba2db7e2511dd17c82027a17a4a124cd6fc91,0660ab73e834c502163a6582a371367240a9c8f4..1c67f7104625eaf04a7d282a86bcb80626a2a3c4
--- 1/glslang.spec
--- 2/glslang.spec
+++ b/glslang.spec
@@@ -1,22 -1,24 +1,24 @@@
  #
  # Conditional build:
- %bcond_with   tests           # build with tests
- #
+ %bcond_without        tests           # build with tests
 -#
 +
  Summary:      Khronos reference front-end for GLSL and ESSL
  Summary(pl.UTF-8):    Wzorcowy frontend GLSL i ESSL z projektu Khronos
  Name:         glslang
 -Version:      7.11.3214
 +Version:      7.12.3352
  Release:      1
  License:      BSD-like
  Group:                Applications/Graphics
+ #Source0Download: https://github.com/KhronosGroup/glslang/releases
  Source0:      https://github.com/KhronosGroup/glslang/archive/%{version}/%{name}-%{version}.tar.gz
 -# Source0-md5:        4699eeb6501bad8ed982a279fb827390
 +# Source0-md5:        b31bc89ffa86dbb5ab638c9c2a412302
  Patch0:               runtests.patch
+ Patch1:               %{name}-system-spirv.patch
  URL:          https://github.com/KhronosGroup/glslang
  BuildRequires:        cmake >= 2.8.11
  BuildRequires:        bison
  BuildRequires:        libstdc++-devel >= 6:4.7
+ %{?with_tests:BuildRequires:  spirv-tools-devel}
  BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %description
@@@ -29,6 -31,7 +31,7 @@@ Frontend i walidator shaderów OpenGL 
  Summary:      Khronos reference front-end libraries for GLSL and ESSL
  Summary(pl.UTF-8):    Wzorcowe biblioteki frontendowe GLSL i ESSL z projektu Khronos
  Group:                Development/Libraries
+ Requires:     %{name} = %{version}-%{release}
  
  %description devel
  A front-end libraries for programmatic parsing of GLSL/ESSL into an
@@@ -41,6 -44,7 +44,7 @@@ AST
  %prep
  %setup -q
  %patch0 -p1
+ %patch1 -p1
  
  %build
  install -d build
@@@ -61,8 -65,6 +65,6 @@@ rm -rf $RPM_BUILD_ROO
  %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
  
- install build/StandAlone/libglslang-default-resource-limits.so $RPM_BUILD_ROOT%{_libdir}
- 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@@ -74,8 -76,8 +76,8 @@@
  %attr(755,root,root) %{_libdir}/libHLSL.so
  %attr(755,root,root) %{_libdir}/libSPIRV.so
  %attr(755,root,root) %{_libdir}/libSPVRemapper.so
- %attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so
  %attr(755,root,root) %{_libdir}/libglslang.so
+ %attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so
  
  %files devel
  %defattr(644,root,root,755)