[packages/glslang] - pl, revised BRs - adjusted runtests patch to use tools from build dir - added libdir patch (honour

qboosh qboosh at pld-linux.org
Fri May 26 19:30:59 CEST 2017 

commit 0187a0dd73345875e4cfeaac5f20a65e1877b80f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri May 26 19:31:52 2017 +0200

    - pl, revised BRs
    - adjusted runtests patch to use tools from build dir
    - added libdir patch (honour LIB_SUFFIX), install process cleanup

 glslang-libdir.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 glslang.spec         | 46 +++++++++++++++++++++++++++++-----------------
 runtests.patch       |  2 +-
 3 files changed, 70 insertions(+), 18 deletions(-)
---
diff --git a/glslang.spec b/glslang.spec
index 934b1d6..4921b13 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -6,6 +6,7 @@
 %define	commit	807a0d9e2f4e176f75d62ac3c179c81800ec2608
 
 Summary:	Khronos reference front-end for GLSL and ESSL
+Summary(pl.UTF-8):	Wzorcowy frontend GLSL i ESSL z projektu Khronos
 Name:		glslang
 Version:	3.0.s%{snap}
 Release:	1
@@ -14,34 +15,42 @@ Group:		Applications/Graphics
 Source0:	https://github.com/KhronosGroup/glslang/archive/%{commit}/%{name}-%{version}.tar.gz
 # Source0-md5:	1d6791bde97542685acbeef26c68fb2d
 Patch0:		runtests.patch
+Patch1:		%{name}-libdir.patch
 URL:		https://github.com/KhronosGroup/glslang
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.8.11
 BuildRequires:	bison
-BuildRequires:	llvm-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 An OpenGL and OpenGL ES shader front end and validator.
 
+%description -l pl.UTF-8
+Frontend i walidator shaderów OpenGL i OpenGL ES.
+
 %package devel
-Summary:	Khronos reference front-end library for GLSL and ESSL
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
+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
 
 %description devel
-A front-end library for programmatic parsing of GLSL/ESSL into an AST.
+A front-end libraries for programmatic parsing of GLSL/ESSL into an
+AST.
+
+%description devel -l pl.UTF-8
+Biblioteki frontendowe do programowej analizy GLSL/ESSL do postaci
+AST.
 
 %prep
 %setup -qn %{name}-%{commit}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
 cd build
-%cmake \
-		../
+%cmake ..
 %{__make}
-%{__make} install DESTDIR=install
 cd ..
 
 %if %{with tests}
@@ -53,12 +62,10 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}}
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-cd build
-cp -p install%{_bindir}/*  $RPM_BUILD_ROOT%{_bindir}
-cp -p install%{_prefix}/lib/* $RPM_BUILD_ROOT%{_libdir}
-cd ..
+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
@@ -68,7 +75,6 @@ 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
@@ -76,11 +82,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README-spirv-remap.txt
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/glslangValidator
+%attr(755,root,root) %{_bindir}/spirv-remap
 %attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so
 
 %files devel
 %defattr(644,root,root,755)
 %doc README.md
-%{_libdir}/*.a
-%{_includedir}/%{name}
+%{_libdir}/libHLSL.a
+%{_libdir}/libOGLCompiler.a
+%{_libdir}/libOSDependent.a
+%{_libdir}/libSPIRV.a
+%{_libdir}/libSPVRemapper.a
+%{_libdir}/libglslang.a
+%{_includedir}/glslang
diff --git a/glslang-libdir.patch b/glslang-libdir.patch
new file mode 100644
index 0000000..15f757a
--- /dev/null
+++ b/glslang-libdir.patch
@@ -0,0 +1,40 @@
+--- 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 752b0d9..abcb2aa 100644
--- a/runtests.patch
+++ b/runtests.patch
@@ -9,7 +9,7 @@ diff -dur glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b.orig/Test/runtests gl
  TARGETDIR=localResults
  BASEDIR=baseResults
 -EXE=../build/install/bin/glslangValidator
-+EXE=../build/install/usr/bin/glslangValidator
++EXE=../build/StandAlone/glslangValidator
  HASERROR=0
  mkdir -p localResults
  
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list