Sync from SUSE:SLFO:1.1 shaderc revision adef31bb5e9cb5350b38af8fe1367897

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

@@ -4,11 +4,11 @@
  utils/update_build_version.sh |    1 +
  3 files changed, 4 insertions(+), 2 deletions(-)
 
-Index: shaderc-2024.0/CMakeLists.txt
+Index: shaderc-2023.2/CMakeLists.txt
 ===================================================================
---- shaderc-2024.0.orig/CMakeLists.txt
-+++ shaderc-2024.0/CMakeLists.txt
-@@ -120,7 +120,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.
@@ -16,19 +16,19 @@ Index: shaderc-2024.0/CMakeLists.txt
  
  add_subdirectory(libshaderc_util)
  add_subdirectory(libshaderc)
-@@ -131,7 +130,7 @@ endif()
+@@ -141,7 +140,7 @@ endif()
  
  add_custom_target(build-version
-   ${Python_EXECUTABLE}
+   ${PYTHON_EXECUTABLE}
 -  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
 +  ${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-2024.0/libshaderc/CMakeLists.txt
+Index: shaderc-2023.2/libshaderc/CMakeLists.txt
 ===================================================================
---- shaderc-2024.0.orig/libshaderc/CMakeLists.txt
-+++ shaderc-2024.0/libshaderc/CMakeLists.txt
+--- 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
@@ -38,9 +38,9 @@ Index: shaderc-2024.0/libshaderc/CMakeLists.txt
  )
  
  target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
-Index: shaderc-2024.0/utils/update_build_version.sh
+Index: shaderc-2023.2/utils/update_build_version.sh
 ===================================================================
 --- /dev/null
-+++ shaderc-2024.0/utils/update_build_version.sh
++++ shaderc-2023.2/utils/update_build_version.sh
 @@ -0,0 +1 @@
 +#!/bin/true

shaderc.changes

@@ -1,69 +1,3 @@
--------------------------------------------------------------------
-Tue Dec 24 02:37:17 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2024.4
-  * Vulkan 1.4 support
-
--------------------------------------------------------------------
-Tue Oct  8 16:02:50 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2024.3
-  * During HLSL compilation or any optimizing compile, do not
-    tell the validator to use "friendly names". This should save
-    time spent in the initial validation step of the optimization
-    recipe.
-  * Adapt test golden results to Glslang changes which reorder
-    decorations by object enum value.
-
--------------------------------------------------------------------
-Thu May 16 12:10:06 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2024.1
-  * No changelog was provided
-
--------------------------------------------------------------------
-Fri Apr 12 17:08:42 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2024.0
-  * Explicitly use python3 in shebangs/scripts
-
--------------------------------------------------------------------
-Fri Jan 19 13:04:49 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2023.8
-  * API: Expose rlaxed Vulkan rules from glslang
-
--------------------------------------------------------------------
-Thu Nov  9 15:46:07 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Fix previous change: export to CXXFLAGS instead of CPPFLAGS so
-  that it's actually picked up. Add optflags to CXXFLAGS to ensure
-  it's not lost.
-
--------------------------------------------------------------------
-Thu Nov  2 18:07:38 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
-
-- Adjust for glslang-nonstd-devel switching paths
-
--------------------------------------------------------------------
-Fri Oct 20 12:10:45 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2023.7
-  * Adapt a test to different error message from SPIRV-Tools
-
--------------------------------------------------------------------
-Wed Sep  6 22:58:36 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2023.6
-  * Build system updates only
-
--------------------------------------------------------------------
-Mon May 29 12:51:28 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2023.4
-  * Add option to preserve bindings
-  * Add options to control mesh shading limits
-
 -------------------------------------------------------------------
 Tue Mar 28 23:26:28 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

shaderc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package shaderc
 #
-# Copyright (c) 2024 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:        2024.4
+Version:        2023.2
 Release:        0
 Summary:        A collection of tools, libraries and tests for shader compilation
 License:        Apache-2.0
@@ -31,15 +31,14 @@ Source99:       baselibs.conf
 Patch1:         0001-Use-system-third-party-libs.patch
 BuildRequires:  c++_compiler
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  glslang-devel >= 15.1
+BuildRequires:  glslang-devel >= 12
 BuildRequires:  glslang-nonstd-devel
-BuildRequires:  python3-base
-BuildRequires:  spirv-headers >= 1.6.4+sdk303
-BuildRequires:  spirv-tools-devel >= 2024.4~rc2
+BuildRequires:  spirv-headers >= 1.6.1~sdk239
+BuildRequires:  spirv-tools-devel >= 2023.1
 
 %description
 A collection of tools, libraries and tests for shader compilation.
-Included are:
+At the moment, included are:
 
 * glslc, a command line compiler for GLSL/HLSL to SPIR-V, and
 * libshaderc, a library API for doing the same.
@@ -69,10 +68,8 @@ Shaderc wraps around core functionality in glslang and SPIRV-Tools
 %autosetup -p1
 chmod a+x utils/update_build_version.sh
 echo "\"%version\"" >glslc/src/build-version.inc
-find . -type f -exec grep -l '#!/usr/bin/env python' {} + | xargs perl -i -lpe 's{/env python\w*}{/python3}g'
 
 %build
-export CXXFLAGS="%{optflags} -I%_includedir/External"
 %cmake -DSHADERC_SKIP_TESTS=ON
 %cmake_build
 
@@ -82,7 +79,8 @@ export CXXFLAGS="%{optflags} -I%_includedir/External"
 rm %buildroot/%_libdir/*.a
 rm %buildroot/%_libdir/pkgconfig/shaderc_{static,combined}.pc
 
-%ldconfig_scriptlets -n %lname
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
 %files
 %license LICENSE