pool/glslang
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1002298 from X11:Wayland

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1002298
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2022-09-10 18:17:09 +00:00 committed by Git OBS Bridge
commit 2a09d06098
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glslang.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Sep 9 10:35:49 UTC 2022 - Ralf Habacker <ralf.habacker@freenet.de>
- Adjust the cmake support files to use the shared libraries added
from the latest changes
-------------------------------------------------------------------
Wed Sep 7 09:20:41 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Rework static library removal & building procedure to identify
new static libs. (libGenericCodeGen.so and
libMachineIndependent.so are now added)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 22 23:01:23 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Mon Aug 22 23:01:23 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

13
glslang.spec
View File

@ -79,7 +79,6 @@ compressor's dictionary can find better cross module commonality.
%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
@ -87,10 +86,14 @@ 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), # 3rd party programs use -lOGLCompiler (because pristine glslang shipped .a files),
# so satisfy them under our shared build. # so satisfy them under our shared build.
ln -s libglslang.so "$b/%_libdir/libOGLCompiler.so" for i in libOGLCompiler libOSDependent libGenericCodeGen libMachineIndependent; do
ln -s libglslang.so "$b/%_libdir/libOSDependent.so" ln -s libglslang.so "$b/%_libdir/$i.so"
rm -f "$b/%_libdir/$i.a"
done
sed -i 's,\.a",\.so",g' %buildroot%{_datadir}/glslang/glslang-targets-*.cmake
%fdupes %buildroot/%_prefix %fdupes %buildroot/%_prefix
%post -n %lname -p /sbin/ldconfig %post -n %lname -p /sbin/ldconfig
@ -104,7 +107,9 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so"
%_bindir/spirv* %_bindir/spirv*
%_libdir/cmake/ %_libdir/cmake/
%_libdir/*resource*.so %_libdir/*resource*.so
%_libdir/libGenericCodeGen.so
%_libdir/libHLSL.so %_libdir/libHLSL.so
%_libdir/libMachineIndependent.so
%_libdir/libOGLCompiler.so %_libdir/libOGLCompiler.so
%_libdir/libOSDependent.so %_libdir/libOSDependent.so
%_libdir/libSPIRV.so %_libdir/libSPIRV.so