[packages/glslang] up to 20180205 snap

[atler]

commit ee6519cd7aa879e64dc0c8216592bd97bf9557c7
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Feb 10 20:11:58 2018 +0100

    up to 20180205 snap

 glslang-libdir.patch | 40 ----------------------------------------
 glslang.spec         | 18 ++++--------------
 runtests.patch       |  4 +++-
 3 files changed, 7 insertions(+), 55 deletions(-)
---
diff --git a/glslang.spec b/glslang.spec
index 4921b13..3fd9d40 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -2,8 +2,8 @@
 # Conditional build:
 %bcond_without	tests		# build with tests
 #
-%define	snap	20161222
-%define	commit	807a0d9e2f4e176f75d62ac3c179c81800ec2608
+%define	snap	20180205
+%define	commit	2651ccaec8170b3257642b3c438f50dc4f181fdd
 
 Summary:	Khronos reference front-end for GLSL and ESSL
 Summary(pl.UTF-8):	Wzorcowy frontend GLSL i ESSL z projektu Khronos
@@ -13,9 +13,8 @@ Release:	1
 License:	BSD-like
 Group:		Applications/Graphics
 Source0:	https://github.com/KhronosGroup/glslang/archive/%{commit}/%{name}-%{version}.tar.gz
-# Source0-md5:	1d6791bde97542685acbeef26c68fb2d
+# Source0-md5:	6ae5c2ff0dd4704a5978a4abf83f13fe
 Patch0:		runtests.patch
-Patch1:		%{name}-libdir.patch
 URL:		https://github.com/KhronosGroup/glslang
 BuildRequires:	cmake >= 2.8.11
 BuildRequires:	bison
@@ -44,7 +43,6 @@ AST.
 %prep
 %setup -qn %{name}-%{commit}
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
@@ -67,15 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 
 install build/StandAlone/libglslang-default-resource-limits.so $RPM_BUILD_ROOT%{_libdir}
 
-install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/{SPIRV,StandAlone,glslang/{Include,MachineIndependent/preprocessor,OSDependent,Public}}
-cp -p SPIRV/{*.h,*.hpp} $RPM_BUILD_ROOT%{_includedir}/%{name}/SPIRV
-cp -p glslang/Include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/glslang/Include
-cp -p glslang/MachineIndependent/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/glslang/MachineIndependent
-cp -p glslang/MachineIndependent/preprocessor/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/glslang/MachineIndependent/preprocessor
-cp -p glslang/OSDependent/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/glslang/OSDependent
-cp -p glslang/Public/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/glslang/Public
-cp -p StandAlone/Worklist.h $RPM_BUILD_ROOT%{_includedir}/%{name}/StandAlone
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,4 +84,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libSPIRV.a
 %{_libdir}/libSPVRemapper.a
 %{_libdir}/libglslang.a
+%{_includedir}/SPIRV
 %{_includedir}/glslang
diff --git a/glslang-libdir.patch b/glslang-libdir.patch
deleted file mode 100644
index 15f757a..0000000
--- a/glslang-libdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/glslang/CMakeLists.txt.orig	2016-12-22 01:40:29.000000000 +0100
-+++ glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/glslang/CMakeLists.txt	2017-05-26 19:10:05.532591364 +0200
-@@ -92,4 +92,4 @@
- endif(WIN32)
- 
- install(TARGETS glslang 
--        ARCHIVE DESTINATION lib)
-+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
---- glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/OGLCompilersDLL/CMakeLists.txt.orig	2016-12-22 01:40:29.000000000 +0100
-+++ glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/OGLCompilersDLL/CMakeLists.txt	2017-05-26 19:10:19.595924534 +0200
-@@ -8,4 +8,4 @@
- endif(WIN32)
- 
- install(TARGETS OGLCompiler 
--        ARCHIVE DESTINATION lib)
-+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
---- glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/SPIRV/CMakeLists.txt.orig	2016-12-22 01:40:29.000000000 +0100
-+++ glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/SPIRV/CMakeLists.txt	2017-05-26 19:10:32.555924389 +0200
-@@ -50,4 +50,4 @@
- endif(WIN32)
- 
- install(TARGETS SPIRV SPVRemapper
--        ARCHIVE DESTINATION lib)
-+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
---- glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/hlsl/CMakeLists.txt.orig	2016-12-22 01:40:29.000000000 +0100
-+++ glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/hlsl/CMakeLists.txt	2017-05-26 19:11:24.195923799 +0200
-@@ -25,4 +25,4 @@
- endif(WIN32)
- 
- install(TARGETS HLSL
--        ARCHIVE DESTINATION lib)
-+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
---- glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/glslang/OSDependent/Unix/CMakeLists.txt.orig	2016-12-22 01:40:29.000000000 +0100
-+++ glslang-807a0d9e2f4e176f75d62ac3c179c81800ec2608/glslang/OSDependent/Unix/CMakeLists.txt	2017-05-26 19:14:17.379255155 +0200
-@@ -2,4 +2,4 @@
- set_property(TARGET OSDependent PROPERTY FOLDER glslang)
- 
- install(TARGETS OSDependent 
--        ARCHIVE DESTINATION lib)
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/runtests.patch b/runtests.patch
index abcb2aa..eb3ac39 100644
--- a/runtests.patch
+++ b/runtests.patch
@@ -1,7 +1,7 @@
 diff -dur glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b.orig/Test/runtests glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b/Test/runtests
 --- glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b.orig/Test/runtests	2016-05-13 17:33:42.000000000 +0200
 +++ glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b/Test/runtests	2016-07-14 10:00:43.000000000 +0200
-@@ -1,8 +1,10 @@
+@@ -1,9 +1,11 @@
  #!/usr/bin/env bash
  
 +export LD_LIBRARY_PATH=../build/StandAlone
@@ -9,7 +9,9 @@ diff -dur glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b.orig/Test/runtests gl
  TARGETDIR=localResults
  BASEDIR=baseResults
 -EXE=../build/install/bin/glslangValidator
+-REMAPEXE=../build/install/bin/spirv-remap
 +EXE=../build/StandAlone/glslangValidator
++REMAPEXE=../build/StandAlone/spirv-remap
  HASERROR=0
  mkdir -p localResults
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glslang.git/commitdiff/ee6519cd7aa879e64dc0c8216592bd97bf9557c7