commit 704ab2b8412f5104782fbf0958a7c0fb497404d0 Author: Marcin Krol <h...@tld-linux.org> Date: Thu Apr 4 01:13:18 2024 +0200
- updated to 2024.0 shaderc-shared.patch | 45 ++++++++++++++++++++++++--------------------- shaderc-system-libs.patch | 25 ++++++++++++++----------- shaderc.spec | 4 ++-- 3 files changed, 40 insertions(+), 34 deletions(-) --- diff --git a/shaderc.spec b/shaderc.spec index d29574f..081688d 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.8 +Version: 2024.0 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: 28051b01db5b263f015ad363977ba610 +# Source0-md5: c29fbe8f3c10fc0097e04327e1f64a73 Patch0: %{name}-system-libs.patch Patch1: %{name}-shared.patch URL: https://github.com/google/shaderc diff --git a/shaderc-shared.patch b/shaderc-shared.patch index 3d9f321..ff7577d 100644 --- a/shaderc-shared.patch +++ b/shaderc-shared.patch @@ -1,16 +1,17 @@ ---- shaderc-2021.0/libshaderc/CMakeLists.txt.orig 2021-04-28 20:30:58.667969817 +0200 -+++ shaderc-2021.0/libshaderc/CMakeLists.txt 2021-04-28 20:31:43.873665942 +0200 -@@ -41,7 +41,7 @@ target_compile_definitions(shaderc_share - PRIVATE SHADERC_IMPLEMENTATION - PUBLIC SHADERC_SHAREDLIB - ) --set_target_properties(shaderc_shared PROPERTIES SOVERSION 1) -+set_target_properties(shaderc_shared PROPERTIES OUTPUT_NAME shaderc SOVERSION 1) +diff -urNp -x '*.orig' shaderc-2024.0.org/CMakeLists.txt shaderc-2024.0/CMakeLists.txt +--- shaderc-2024.0.org/CMakeLists.txt 2024-04-04 01:12:49.909224636 +0200 ++++ shaderc-2024.0/CMakeLists.txt 2024-04-04 01:12:49.953225227 +0200 +@@ -158,6 +158,6 @@ function(define_pkg_config_file NAME LIB + endif() + endfunction() - if(SHADERC_ENABLE_INSTALL) - install( ---- 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 +-define_pkg_config_file(shaderc -lshaderc_shared) ++define_pkg_config_file(shaderc -lshaderc) + define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util") + define_pkg_config_file(shaderc_combined -lshaderc_combined) +diff -urNp -x '*.orig' shaderc-2024.0.org/glslc/CMakeLists.txt shaderc-2024.0/glslc/CMakeLists.txt +--- shaderc-2024.0.org/glslc/CMakeLists.txt 2024-03-08 19:52:40.000000000 +0100 ++++ shaderc-2024.0/glslc/CMakeLists.txt 2024-04-04 01:12:49.953225227 +0200 @@ -30,7 +30,7 @@ add_library(glslc STATIC ) @@ -40,13 +41,15 @@ add_dependencies(glslc_exe build-version) shaderc_add_tests( ---- shaderc-2021.0/CMakeLists.txt.orig 2021-05-02 21:59:17.590975179 +0200 -+++ shaderc-2021.0/CMakeLists.txt 2021-05-02 22:00:32.646136904 +0200 -@@ -150,6 +150,6 @@ - endif() - endfunction() +diff -urNp -x '*.orig' shaderc-2024.0.org/libshaderc/CMakeLists.txt shaderc-2024.0/libshaderc/CMakeLists.txt +--- shaderc-2024.0.org/libshaderc/CMakeLists.txt 2024-03-08 19:52:40.000000000 +0100 ++++ shaderc-2024.0/libshaderc/CMakeLists.txt 2024-04-04 01:12:49.953225227 +0200 +@@ -41,7 +41,7 @@ target_compile_definitions(shaderc_share + PRIVATE SHADERC_IMPLEMENTATION + PUBLIC SHADERC_SHAREDLIB + ) +-set_target_properties(shaderc_shared PROPERTIES SOVERSION 1) ++set_target_properties(shaderc_shared PROPERTIES OUTPUT_NAME shaderc SOVERSION 1) --define_pkg_config_file(shaderc -lshaderc_shared) -+define_pkg_config_file(shaderc -lshaderc) - define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util") - define_pkg_config_file(shaderc_combined -lshaderc_combined) + if(SHADERC_ENABLE_INSTALL) + install( diff --git a/shaderc-system-libs.patch b/shaderc-system-libs.patch index f3d8272..2f58704 100644 --- a/shaderc-system-libs.patch +++ b/shaderc-system-libs.patch @@ -1,6 +1,7 @@ ---- shaderc-2021.0/CMakeLists.txt.orig 2021-04-21 23:13:25.000000000 +0200 -+++ shaderc-2021.0/CMakeLists.txt 2021-04-28 20:29:52.644518932 +0200 -@@ -112,7 +112,8 @@ endif(MSVC) +diff -urNp -x '*.orig' shaderc-2024.0.org/CMakeLists.txt shaderc-2024.0/CMakeLists.txt +--- shaderc-2024.0.org/CMakeLists.txt 2024-03-08 19:52:40.000000000 +0100 ++++ shaderc-2024.0/CMakeLists.txt 2024-04-04 01:12:30.772967746 +0200 +@@ -120,7 +120,8 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -10,28 +11,30 @@ add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -124,7 +125,7 @@ endif() +@@ -132,7 +133,7 @@ endif() add_custom_target(build-version - ${PYTHON_EXECUTABLE} + ${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 + ${shaderc_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) ---- shaderc-2021.0/glslc/test/CMakeLists.txt.orig 2021-04-28 20:27:40.587616637 +0200 -+++ shaderc-2021.0/glslc/test/CMakeLists.txt 2021-04-28 20:30:44.457227056 +0200 +diff -urNp -x '*.orig' shaderc-2024.0.org/glslc/test/CMakeLists.txt shaderc-2024.0/glslc/test/CMakeLists.txt +--- shaderc-2024.0.org/glslc/test/CMakeLists.txt 2024-03-08 19:52:40.000000000 +0100 ++++ shaderc-2024.0/glslc/test/CMakeLists.txt 2024-04-04 01:12:30.772967746 +0200 @@ -23,6 +23,6 @@ if(${SHADERC_ENABLE_TESTS}) add_test(NAME glslc_tests - COMMAND ${PYTHON_EXECUTABLE} + COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glslc_test_framework.py - $<TARGET_FILE:glslc_exe> $<TARGET_FILE:spirv-dis> + $<TARGET_FILE:glslc_exe> spirv-dis --test-dir ${CMAKE_CURRENT_SOURCE_DIR}) endif() ---- shaderc-2019.1/utils/update_build_version.py.orig 2020-03-14 22:19:00.495552333 +0100 -+++ shaderc-2019.1/utils/update_build_version.py 2020-03-14 22:22:37.814375016 +0100 -@@ -128,18 +128,18 @@ +diff -urNp -x '*.orig' shaderc-2024.0.org/utils/update_build_version.py shaderc-2024.0/utils/update_build_version.py +--- shaderc-2024.0.org/utils/update_build_version.py 2024-03-08 19:52:40.000000000 +0100 ++++ shaderc-2024.0/utils/update_build_version.py 2024-04-04 01:12:30.772967746 +0200 +@@ -128,18 +128,18 @@ def get_version_string(project, director def main(): ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/shaderc.git/commitdiff/704ab2b8412f5104782fbf0958a7c0fb497404d0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit