From 55ef837b3955c06a085890d6305d4190adbd75ea Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:09:04 +0100 Subject: [PATCH] rebuild with OS dependent libraries [release 12.3.1-2mamba;Sun Aug 20 2023] --- glslang.spec | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/glslang.spec b/glslang.spec index 8b62c10..bec70fc 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,6 +1,6 @@ Name: glslang Version: 12.3.1 -Release: 1mamba +Release: 2mamba Summary: Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator Group: Development/Tools Vendor: openmamba @@ -15,6 +15,8 @@ BuildRequires: libgcc BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END BuildRequires: cmake +BuildRequires: spirv-headers +BuildRequires: libspirv-tools-devel Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description @@ -40,14 +42,26 @@ This package contains libraries and header files for developing applications tha %prep %setup -q +#-D -T %build -%cmake -d build +#:<< _EOF +# Static libraries are required by e.g. shaderc +%cmake -d build \ + -DBUILD_SHARED_LIBS=OFF + %make +cd .. +%cmake -d build-shared + %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build +%makeinstall -C build-shared + +# Manual fix for link not created during install +ln -s glslang %{buildroot}%{_bindir}/glslangValidator %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -58,6 +72,7 @@ This package contains libraries and header files for developing applications tha %files %defattr(-,root,root) %{_bindir}/glslang +%{_bindir}/glslangValidator %{_bindir}/spirv-remap %files -n lib%{name} @@ -91,12 +106,23 @@ This package contains libraries and header files for developing applications tha #%{_libdir}/libglslang-default-resource-limits.so %{_libdir}/libglslang.so %{_libdir}/libHLSL.so +%{_libdir}/libGenericCodeGen.a +%{_libdir}/libHLSL.a +%{_libdir}/libMachineIndependent.a +%{_libdir}/libOGLCompiler.a +%{_libdir}/libOSDependent.a +%{_libdir}/libSPIRV.a +%{_libdir}/libSPVRemapper.a +%{_libdir}/libglslang.a %{_libdir}/cmake/*.cmake %dir %{_libdir}/cmake/glslang %{_libdir}/cmake/glslang/glslang*.cmake %doc README-spirv-remap.txt README.md %changelog +* Sun Aug 20 2023 Silvan Calarco 12.3.1-2mamba +- rebuild with OS dependent libraries + * Sat Jul 22 2023 Automatic Build System 12.3.1-1mamba - automatic version update by autodist