[packages/glslang] - updated to 14.0.0 (new sonames, HLSL stub library dropped)
qboosh
qboosh at pld-linux.org
Sun Feb 18 12:01:39 CET 2024
commit 9add0833cce312d717cba78bba75e6339df2ab8f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 18 11:00:45 2024 +0100
- updated to 14.0.0 (new sonames, HLSL stub library dropped)
glslang-symlink.patch | 11 -----------
glslang-system-spirv.patch | 24 ------------------------
glslang.spec | 30 ++++++++++++------------------
3 files changed, 12 insertions(+), 53 deletions(-)
---
diff --git a/glslang.spec b/glslang.spec
index 6d94218..e1b0bdb 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -1,20 +1,18 @@
#
# Conditional build:
-%bcond_without spirv_opt # build with spirv-opt capability
-%bcond_without tests # build with tests
+%bcond_without spirv_opt # spirv-opt capability
+%bcond_without tests # testing
Summary: Khronos reference front-end for GLSL and ESSL
Summary(pl.UTF-8): Wzorcowy frontend GLSL i ESSL z projektu Khronos
Name: glslang
-Version: 12.3.1
+Version: 14.0.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: 0d453bdb40e79948bd05aa3910fdec56
-Patch0: %{name}-system-spirv.patch
-Patch1: %{name}-symlink.patch
+# Source0-md5: bfbf7fb0d18d00306ef229f289a8d593
URL: https://github.com/KhronosGroup/glslang
BuildRequires: bison
BuildRequires: cmake >= 3.14.0
@@ -52,11 +50,10 @@ AST.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%cmake -B build \
+ -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
%{!?with_spirv_opt:-DENABLE_OPT=OFF}
%{__make} -C build
@@ -82,30 +79,27 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE.txt README-spirv-remap.txt
+%doc CHANGES.md LICENSE.txt README-spirv-remap.txt
%attr(755,root,root) %{_bindir}/glslang
-%attr(755,root,root) %{_bindir}/glslangValidator
%attr(755,root,root) %{_bindir}/spirv-remap
-%attr(755,root,root) %{_libdir}/libHLSL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libHLSL.so.12
%attr(755,root,root) %{_libdir}/libSPIRV.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libSPIRV.so.12
+%attr(755,root,root) %ghost %{_libdir}/libSPIRV.so.14
%attr(755,root,root) %{_libdir}/libSPVRemapper.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libSPVRemapper.so.12
+%attr(755,root,root) %ghost %{_libdir}/libSPVRemapper.so.14
%attr(755,root,root) %{_libdir}/libglslang.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglslang.so.12
+%attr(755,root,root) %ghost %{_libdir}/libglslang.so.14
+%attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglslang-default-resource-limits.so.14
%files devel
%defattr(644,root,root,755)
%doc README.md
-%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
-%{_libdir}/libglslang-default-resource-limits.a
+%attr(755,root,root) %{_libdir}/libglslang-default-resource-limits.so
%{_includedir}/glslang
%{_libdir}/cmake/glslang
-%{_libdir}/cmake/HLSLTargets.cmake
%{_libdir}/cmake/SPIRVTargets.cmake
%{_libdir}/cmake/SPVRemapperTargets.cmake
%{_libdir}/cmake/glslang-default-resource-limitsTargets.cmake
diff --git a/glslang-symlink.patch b/glslang-symlink.patch
deleted file mode 100644
index 7b58500..0000000
--- a/glslang-symlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glslang-12.3.1/StandAlone/CMakeLists.txt.orig 2023-07-20 22:53:51.000000000 +0200
-+++ glslang-12.3.1/StandAlone/CMakeLists.txt 2023-09-25 22:03:57.168347510 +0200
-@@ -121,7 +121,7 @@ if(ENABLE_GLSLANG_INSTALL)
- # Create the same symlink at install time
- install(CODE "execute_process( \
- COMMAND ${CMAKE_COMMAND} -E ${link_method} $<TARGET_FILE_NAME:glslang-standalone> ${legacy_glslang_name} \
-- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
-+ WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}\")")
-
- if(ENABLE_SPVREMAPPER)
- install(TARGETS spirv-remap EXPORT glslang-targets)
diff --git a/glslang-system-spirv.patch b/glslang-system-spirv.patch
deleted file mode 100644
index 0606c06..0000000
--- a/glslang-system-spirv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- glslang-11.1.0/CMakeLists.txt.orig 2021-04-28 20:23:56.849255577 +0200
-+++ glslang-11.1.0/CMakeLists.txt 2021-04-28 20:25:03.082717552 +0200
-@@ -320,10 +320,6 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
- add_subdirectory(External)
- endif()
-
--if(NOT TARGET SPIRV-Tools-opt)
-- set(ENABLE_OPT OFF)
--endif()
--
- 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/9add0833cce312d717cba78bba75e6339df2ab8f
More information about the pld-cvs-commit
mailing list