From de6056176b5956cf6da37c95d8e847c4dfa2e775e04488e6f4a16f89966d5364 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 12 Apr 2024 18:48:06 +0000 Subject: [PATCH] rediff OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=63 --- 0001-Use-system-third-party-libs.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/0001-Use-system-third-party-libs.patch b/0001-Use-system-third-party-libs.patch index deb5e51..2105286 100644 --- a/0001-Use-system-third-party-libs.patch +++ b/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-2023.8/CMakeLists.txt +Index: shaderc-2024.0/CMakeLists.txt =================================================================== ---- shaderc-2023.8.orig/CMakeLists.txt -+++ shaderc-2023.8/CMakeLists.txt -@@ -124,7 +124,6 @@ endif(MSVC) +--- shaderc-2024.0.orig/CMakeLists.txt ++++ shaderc-2024.0/CMakeLists.txt +@@ -120,7 +120,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -16,19 +16,19 @@ Index: shaderc-2023.8/CMakeLists.txt add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -135,7 +134,7 @@ endif() +@@ -131,7 +130,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-2023.8/libshaderc/CMakeLists.txt +Index: shaderc-2024.0/libshaderc/CMakeLists.txt =================================================================== ---- shaderc-2023.8.orig/libshaderc/CMakeLists.txt -+++ shaderc-2023.8/libshaderc/CMakeLists.txt +--- shaderc-2024.0.orig/libshaderc/CMakeLists.txt ++++ shaderc-2024.0/libshaderc/CMakeLists.txt @@ -67,6 +67,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang @@ -38,9 +38,9 @@ Index: shaderc-2023.8/libshaderc/CMakeLists.txt ) target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS}) -Index: shaderc-2023.8/utils/update_build_version.sh +Index: shaderc-2024.0/utils/update_build_version.sh =================================================================== --- /dev/null -+++ shaderc-2023.8/utils/update_build_version.sh ++++ shaderc-2024.0/utils/update_build_version.sh @@ -0,0 +1 @@ +#!/bin/true