From 8bfd0aca935f846944aa6020821ab701e93a4d13eb845dc2b8240c95de9ece08 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Jan 2021 01:07:24 +0000 Subject: [PATCH] Accepting request 862162 from home:dirkmueller:branches:X11:Wayland - update to 2020.4: - Removed svpc - Fixed issues with embedders getting duplicate symbols - Converted C-style casts to static_cast - Rolled ahead to fix/pickup Vulkan Raytracing support OBS-URL: https://build.opensuse.org/request/show/862162 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=20 --- 0001-Use-system-third-party-libs.patch | 23 ++++++++++++----------- shaderc.changes | 9 +++++++++ shaderc.spec | 4 ++-- v2020.3.tar.gz | 3 --- v2020.4.tar.gz | 3 +++ 5 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 v2020.3.tar.gz create mode 100644 v2020.4.tar.gz diff --git a/0001-Use-system-third-party-libs.patch b/0001-Use-system-third-party-libs.patch index 20159cb..1cb745f 100644 --- a/0001-Use-system-third-party-libs.patch +++ b/0001-Use-system-third-party-libs.patch @@ -1,15 +1,15 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-07-23 16:43:08.000000000 -0500 -+++ b/CMakeLists.txt 2020-08-16 20:18:41.235394189 -0500 -@@ -113,7 +113,6 @@ +Index: shaderc-2020.4/CMakeLists.txt +=================================================================== +--- shaderc-2020.4.orig/CMakeLists.txt ++++ shaderc-2020.4/CMakeLists.txt +@@ -102,18 +102,12 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - if(SHADERC_ENABLE_SPVC) - add_subdirectory(libshaderc_spvc) -@@ -124,11 +123,6 @@ + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) add_subdirectory(glslc) add_subdirectory(examples) @@ -21,10 +21,11 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL -diff -Naur a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt ---- a/libshaderc/CMakeLists.txt 2020-07-23 16:43:08.000000000 -0500 -+++ b/libshaderc/CMakeLists.txt 2020-08-16 20:22:18.420735391 -0500 -@@ -66,6 +66,8 @@ +Index: shaderc-2020.4/libshaderc/CMakeLists.txt +=================================================================== +--- shaderc-2020.4.orig/libshaderc/CMakeLists.txt ++++ shaderc-2020.4/libshaderc/CMakeLists.txt +@@ -66,6 +66,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang SPIRV-Tools diff --git a/shaderc.changes b/shaderc.changes index ccda821..5dddc9e 100644 --- a/shaderc.changes +++ b/shaderc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 11 00:50:07 UTC 2021 - Dirk Müller + +- update to 2020.4: + - Removed svpc + - Fixed issues with embedders getting duplicate symbols + - Converted C-style casts to static_cast + - Rolled ahead to fix/pickup Vulkan Raytracing support + ------------------------------------------------------------------- Fri Sep 4 12:08:28 UTC 2020 - Jan Engelhardt diff --git a/shaderc.spec b/shaderc.spec index 7fd3c61..42d9e5a 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,7 +1,7 @@ # # spec file for package shaderc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: shaderc %define lname libshaderc_shared1 -Version: 2020.3 +Version: 2020.4 Release: 0 Summary: A collection of tools, libraries and tests for shader compilation License: Apache-2.0 diff --git a/v2020.3.tar.gz b/v2020.3.tar.gz deleted file mode 100644 index 0fca401..0000000 --- a/v2020.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e595f71d0db0c37ee959b538cfda16e39e3f0dce8893a0bc0ac0080c342c0275 -size 278952 diff --git a/v2020.4.tar.gz b/v2020.4.tar.gz new file mode 100644 index 0000000..297060b --- /dev/null +++ b/v2020.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19e4c812bfbdbabbfb658062628c377339d14894080b5c169216a1d86483bdcc +size 220148