[packages/shaderc] - updated to 2023.8 (ready for glslang 14)

qboosh qboosh at pld-linux.org
Sun Feb 18 12:04:02 CET 2024


commit 6755cd7e9e1cc01a38dbc7f84dd32139044a048a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 18 11:03:23 2024 +0100

    - updated to 2023.8 (ready for glslang 14)

 shaderc-shared.patch      | 15 +++++++--------
 shaderc-system-libs.patch | 22 ----------------------
 shaderc.spec              |  9 ++++++---
 3 files changed, 13 insertions(+), 33 deletions(-)
---
diff --git a/shaderc.spec b/shaderc.spec
index 5e8416e..d29574f 100644
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -2,13 +2,13 @@
 Summary:	Collection of tools, libraries and tests for shader compilation
 Summary(pl.UTF-8):	Zestaw narzędzi, bibliotek i testów do kompilacji shaderów
 Name:		shaderc
-Version:	2023.3
-Release:	2
+Version:	2023.8
+Release:	1
 License:	Apache v2.0
 Group:		Libraries
 #Source0Download: https://github.com/google/shaderc/tags
 Source0:	https://github.com/google/shaderc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	5149e2beb4501830218edd4cfab68db5
+# Source0-md5:	28051b01db5b263f015ad363977ba610
 Patch0:		%{name}-system-libs.patch
 Patch1:		%{name}-shared.patch
 URL:		https://github.com/google/shaderc
@@ -86,6 +86,9 @@ Statyczne biblioteki shaderc.
 %patch0 -p1
 %patch1 -p1
 
+# open(..., errors='replace') requires Python 3
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' utils/update_build_version.py
+
 %build
 %cmake -B build \
 	-DCMAKE_INSTALL_INCLUDEDIR=include \
diff --git a/shaderc-shared.patch b/shaderc-shared.patch
index ed07e70..3d9f321 100644
--- a/shaderc-shared.patch
+++ b/shaderc-shared.patch
@@ -9,9 +9,9 @@
  
  if(SHADERC_ENABLE_INSTALL)
    install(
---- shaderc-2021.0/glslc/CMakeLists.txt.orig	2021-04-28 18:26:01.925013098 +0200
-+++ shaderc-2021.0/glslc/CMakeLists.txt	2021-04-28 18:34:04.012401406 +0200
-@@ -30,7 +30,7 @@
+--- shaderc-2023.8/glslc/CMakeLists.txt.orig	2024-01-03 18:45:00.000000000 +0100
++++ shaderc-2023.8/glslc/CMakeLists.txt	2024-02-18 10:19:55.923036871 +0100
+@@ -30,7 +30,7 @@ add_library(glslc STATIC
  )
  
  shaderc_default_compile_options(glslc)
@@ -20,15 +20,14 @@
  
  if (SHADERC_ENABLE_WGSL_OUTPUT)
    if (IS_DIRECTORY "${tint_SOURCE_DIR}/include")
-@@ -42,17 +42,14 @@
-   add_definitions(-DSHADERC_ENABLE_WGSL_OUTPUT=1)
+@@ -43,16 +43,14 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
  endif(SHADERC_ENABLE_WGSL_OUTPUT)
  
--target_link_libraries(glslc PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
+ target_link_libraries(glslc PRIVATE
+-  glslang SPIRV    # Glslang libraries
 -  $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
 -  shaderc_util shaderc                                  # internal Shaderc libraries
-+target_link_libraries(glslc PRIVATE shaderc_shared
++  shaderc_shared
    ${CMAKE_THREAD_LIBS_INIT})
  
  add_executable(glslc_exe src/main.cc)
diff --git a/shaderc-system-libs.patch b/shaderc-system-libs.patch
index 898abea..f3d8272 100644
--- a/shaderc-system-libs.patch
+++ b/shaderc-system-libs.patch
@@ -54,25 +54,3 @@
      mkdir_p(os.path.dirname(output_file))
  
      if os.path.isfile(output_file):
---- shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/libshaderc/CMakeLists.txt.orig	2018-10-26 20:30:19.875918754 +0200
-+++ shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/libshaderc/CMakeLists.txt	2018-10-26 20:30:36.765918565 +0200
-@@ -37,7 +37,7 @@
- 
- find_package(Threads)
- set(SHADERC_LIBS
--  glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT}
-+  glslang HLSL glslang ${CMAKE_THREAD_LIBS_INIT}
-   shaderc_util
-   SPIRV # from glslang
-   SPIRV-Tools
---- shaderc-2023.3/libshaderc_util/CMakeLists.txt.orig	2023-03-17 16:56:41.000000000 +0100
-+++ shaderc-2023.3/libshaderc_util/CMakeLists.txt	2023-04-04 22:25:20.672373268 +0200
-@@ -46,7 +46,7 @@ add_definitions(-DENABLE_HLSL)
- 
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
-+  glslang HLSL glslang SPIRV
-   SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/shaderc.git/commitdiff/6755cd7e9e1cc01a38dbc7f84dd32139044a048a



More information about the pld-cvs-commit mailing list