- Update to release 2023.2

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=45

0001-Use-system-third-party-libs.patch

@@ -1,13 +1,14 @@
 ---
- CMakeLists.txt            |    7 -------
- libshaderc/CMakeLists.txt |    2 ++
- 2 files changed, 2 insertions(+), 7 deletions(-)
+ CMakeLists.txt                |    3 +--
+ libshaderc/CMakeLists.txt     |    2 ++
+ utils/update_build_version.sh |    1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
 
-Index: shaderc-2020.5/CMakeLists.txt
+Index: shaderc-2023.2/CMakeLists.txt
 ===================================================================
---- shaderc-2020.5.orig/CMakeLists.txt
-+++ shaderc-2020.5/CMakeLists.txt
-@@ -112,7 +112,6 @@ endif(MSVC)
+--- shaderc-2023.2.orig/CMakeLists.txt
++++ shaderc-2023.2/CMakeLists.txt
+@@ -130,7 +130,6 @@ endif(MSVC)
  
  # Configure subdirectories.
  # We depend on these for later projects, so they should come first.
@@ -15,24 +16,20 @@ Index: shaderc-2020.5/CMakeLists.txt
  
  add_subdirectory(libshaderc_util)
  add_subdirectory(libshaderc)
-@@ -121,12 +120,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
-     add_subdirectory(examples)
- endif()
+@@ -141,7 +140,7 @@ endif()
  
--add_custom_target(build-version
--  ${PYTHON_EXECUTABLE}
+ add_custom_target(build-version
+   ${PYTHON_EXECUTABLE}
 -  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
--  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
--  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
--
- function(define_pkg_config_file NAME LIBS)
-   add_custom_target(${NAME}-pkg-config ALL
-     COMMAND ${CMAKE_COMMAND}
-Index: shaderc-2020.5/libshaderc/CMakeLists.txt
++  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.sh
+   ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
+   COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
+ 
+Index: shaderc-2023.2/libshaderc/CMakeLists.txt
 ===================================================================
---- shaderc-2020.5.orig/libshaderc/CMakeLists.txt
-+++ shaderc-2020.5/libshaderc/CMakeLists.txt
-@@ -66,6 +66,8 @@ set(SHADERC_LIBS
+--- shaderc-2023.2.orig/libshaderc/CMakeLists.txt
++++ shaderc-2023.2/libshaderc/CMakeLists.txt
+@@ -67,6 +67,8 @@ set(SHADERC_LIBS
    shaderc_util
    SPIRV # from glslang
    SPIRV-Tools
@@ -41,3 +38,9 @@ Index: shaderc-2020.5/libshaderc/CMakeLists.txt
  )
  
  target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
+Index: shaderc-2023.2/utils/update_build_version.sh
+===================================================================
+--- /dev/null
++++ shaderc-2023.2/utils/update_build_version.sh
+@@ -0,0 +1 @@
++#!/bin/true

shaderc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 28 23:26:28 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2023.2
+  * Fix C++20 compatibility: explicitly construct string_piece when
+    comparing to `char *`
+
 -------------------------------------------------------------------
 Sun Dec  4 12:50:08 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

shaderc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package shaderc
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 # Remember to bump in baselibs.conf
 %define lname libshaderc_shared1
 Name:           shaderc
-Version:        2022.4
+Version:        2023.2
 Release:        0
 Summary:        A collection of tools, libraries and tests for shader compilation
 License:        Apache-2.0
@@ -31,13 +31,9 @@ Source99:       baselibs.conf
 Patch1:         0001-Use-system-third-party-libs.patch
 BuildRequires:  c++_compiler
 BuildRequires:  cmake >= 2.8.12
-# "DEPS" file recommends: glslang 11.12.0-24-g728c6895
-# DEPS file: spirv-headers sdk-1.3.231.0-14-gc214f6f
-# DEPS file: spirv-tools v2022.4-28-gd9446130
-# Slightly lower should work too
-BuildRequires:  glslang-devel >= 11.12.0
-BuildRequires:  spirv-headers >= 1.6.1~sdk231
-BuildRequires:  spirv-tools-devel >= 2022.4
+BuildRequires:  glslang-devel >= 12
+BuildRequires:  spirv-headers >= 1.6.1~sdk239
+BuildRequires:  spirv-tools-devel >= 2023.1
 
 %description
 A collection of tools, libraries and tests for shader compilation.
@@ -69,6 +65,7 @@ Shaderc wraps around core functionality in glslang and SPIRV-Tools
 
 %prep
 %autosetup -p1
+chmod a+x utils/update_build_version.sh
 echo "\"%version\"" >glslc/src/build-version.inc
 
 %build

v2022.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a948436f2eca403026fe2c900df0108a0f4972005230817d805c43d96554c9ea
-size 223535