jengelh/glslang
SHA256
1
0
Fork 0
forked from pool/glslang
Code Pull Requests Activity

Accepting request 738488 from X11:Wayland

Browse Source 
- Drop unused static libraries, functions of libOGLCompilerDLL and
  libOSDependent are actually present in libglslang already.
  [boo#1153950]

OBS-URL: https://build.opensuse.org/request/show/738488
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2019-10-18 12:30:14 +00:00 committed by Git OBS Bridge
commit 7f85b46a8e
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glslang.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 14 21:01:23 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Drop unused static libraries, functions of libOGLCompilerDLL and
libOSDependent are actually present in libglslang already.
[boo#1153950]
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 7 15:57:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Sat Sep 7 15:57:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

9
glslang.spec
View File

@ -82,6 +82,7 @@ make %{?_smp_mflags}
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
%cmake_install %cmake_install
b="%buildroot" b="%buildroot"
find "$b" -type f -name "*.a" -print -delete
mkdir -p "$b/%_includedir" mkdir -p "$b/%_includedir"
cp -a SPIRV glslang "$b/%_includedir/" cp -a SPIRV glslang "$b/%_includedir/"
find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete
@ -89,6 +90,11 @@ ln -s SPIRV/spirv.hpp "$b/%_includedir/"
find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+"
cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
# 3rd party programs use -lOGLCompiler (because pristine glslang ships .a files),
# so satisfy them under our shared build.
ln -s libglslang.so "$b/%_libdir/libOGLCompiler.so"
ln -s libglslang.so "$b/%_libdir/libOSDependent.so"
%post -n %lname -p /sbin/ldconfig %post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
@ -100,9 +106,10 @@ cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/gls* %_bindir/gls*
%_bindir/spirv* %_bindir/spirv*
%_libdir/*.a
%_libdir/*resource*.so %_libdir/*resource*.so
%_libdir/libHLSL.so %_libdir/libHLSL.so
%_libdir/libOGLCompiler.so
%_libdir/libOSDependent.so
%_libdir/libSPIRV.so %_libdir/libSPIRV.so
%_libdir/libSPVRemapper.so %_libdir/libSPVRemapper.so
%_libdir/libglslang.so %_libdir/libglslang.so