[packages/glslang] Up to 20160513 snapshot

jajcus jajcus at pld-linux.org
Thu Jul 14 13:57:46 CEST 2016


commit b2f7823ad288dfcbaba25f1fe434821a09693f2c
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Thu Jul 14 10:28:16 2016 +0200

    Up to 20160513 snapshot
    
    Expected by vulkan-sdk 1.0.17.0

 glslang.spec   | 15 +++++++++++----
 runtests.patch | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/glslang.spec b/glslang.spec
index 9c8025d..a6290dc 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -2,8 +2,8 @@
 # Conditional build:
 %bcond_without	tests		# build with tests
 #
-%define	snap	20160325
-%define	commit	c3869fee412a90c4eadea0bf936ab2530d2dff51
+%define	snap	20160513
+%define	commit	4678ca9dacfec7a084dbc69bbe568bdad6889f1b
 
 Summary:	Khronos reference front-end for GLSL and ESSL
 Name:		glslang
@@ -12,7 +12,8 @@ Release:	1
 License:	BSD-like
 Group:		Applications/Graphics
 Source0:	https://github.com/KhronosGroup/glslang/archive/%{commit}/%{name}-%{version}.tar.gz
-# Source0-md5:	061957700875a21369cf79a5a97e230f
+# Source0-md5:	071445912a8d0f8a533046f0f3b35127
+Patch0:		runtests.patch
 URL:		https://github.com/KhronosGroup/glslang
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -32,6 +33,7 @@ A front-end library for programmatic parsing of GLSL/ESSL into an AST.
 
 %prep
 %setup -qn %{name}-%{commit}
+%patch0 -p1
 
 %build
 install -d build
@@ -40,9 +42,12 @@ cd build
 		../
 %{__make}
 %{__make} install DESTDIR=install
+cd ..
 
 %if %{with tests}
-./install%{_bindir}/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
+cd Test
+./runtests
+cd ..
 %endif
 
 %install
@@ -63,6 +68,7 @@ cp -p glslang/MachineIndependent/preprocessor/*.h $RPM_BUILD_ROOT%{_includedir}/
 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
+install build/StandAlone/libglslang-default-resource-limits.so $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README-spirv-remap.txt
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/runtests.patch b/runtests.patch
new file mode 100644
index 0000000..752b0d9
--- /dev/null
+++ b/runtests.patch
@@ -0,0 +1,15 @@
+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 @@
+ #!/usr/bin/env bash
+ 
++export LD_LIBRARY_PATH=../build/StandAlone
++
+ TARGETDIR=localResults
+ BASEDIR=baseResults
+-EXE=../build/install/bin/glslangValidator
++EXE=../build/install/usr/bin/glslangValidator
+ HASERROR=0
+ mkdir -p localResults
+ 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list