commit b70087f79d5215960b724fac725df01d81a5afc0
Author: Jakub Bogusz <[email protected]>
Date: Wed Apr 28 18:26:48 2021 +0200
- updated to 11.1.0 (last version that builds with spirv-tools 2020.6; new
libglslang soname)
glslang-system-spirv.patch | 11 +++++++++++
glslang.spec | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/glslang.spec b/glslang.spec
index 6a0ebd2..436b1c8 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -6,20 +6,20 @@
Summary: Khronos reference front-end for GLSL and ESSL
Summary(pl.UTF-8): Wzorcowy frontend GLSL i ESSL z projektu Khronos
Name: glslang
-Version: 8.13.3743
+Version: 11.1.0
Release: 1
License: BSD-like
Group: Applications/Graphics
#Source0Download: https://github.com/KhronosGroup/glslang/releases
Source0:
https://github.com/KhronosGroup/glslang/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 93dca40a44fc88b6710348458d06b54f
+# Source0-md5: 1688a1e36945d72df960b859ede55078
Patch0: %{name}-system-spirv.patch
URL: https://github.com/KhronosGroup/glslang
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: libstdc++-devel >= 6:4.7
%if %{with tests} || %{with spirv_opt}
-BuildRequires: spirv-tools-devel
+BuildRequires: spirv-tools-devel >= 1:2020.6
%endif
%if %{with spirv_opt}
%requires_ge_to spirv-tools-libs spirv-tools-devel
@@ -82,15 +82,16 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libHLSL.so
%attr(755,root,root) %{_libdir}/libSPIRV.so
%attr(755,root,root) %{_libdir}/libSPVRemapper.so
-%attr(755,root,root) %{_libdir}/libglslang.so
+%attr(755,root,root) %{_libdir}/libglslang.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglslang.so.11
%attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so
%files devel
%defattr(644,root,root,755)
%doc README.md
+%attr(755,root,root) %{_libdir}/libglslang.so
%{_libdir}/libOGLCompiler.a
%{_libdir}/libOSDependent.a
-%{_includedir}/SPIRV
%{_includedir}/glslang
%{_libdir}/cmake/HLSLTargets*.cmake
%{_libdir}/cmake/OGLCompilerTargets*.cmake
diff --git a/glslang-system-spirv.patch b/glslang-system-spirv.patch
index 6779be2..c517cb7 100644
--- a/glslang-system-spirv.patch
+++ b/glslang-system-spirv.patch
@@ -11,3 +11,14 @@
if(ENABLE_OPT)
message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1)
+--- glslang-11.1.0/SPIRV/CMakeLists.txt.orig 2020-12-08 02:20:27.000000000
+0100
++++ glslang-11.1.0/SPIRV/CMakeLists.txt 2021-04-28 18:11:13.736491495
+0200
+@@ -95,7 +95,7 @@
+ PRIVATE ${spirv-tools_SOURCE_DIR}/include
+ PRIVATE ${spirv-tools_SOURCE_DIR}/source
+ )
+- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
++ target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt
SPIRV-Tools)
+ target_include_directories(SPIRV PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glslang.git/commitdiff/b70087f79d5215960b724fac725df01d81a5afc0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
