jengelh/shaderc
SHA256
1
0
Fork 0
forked from pool/shaderc
Code Pull Requests Activity

Accepting request 877955 from X11:Wayland

Browse Source 
- Update to release 2020.5 (forwarded request 875914 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/877955
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shaderc?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2021-03-12 12:31:27 +00:00 committed by Git OBS Bridge
commit f22ab41889
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-Use-system-third-party-libs.patch
View File

@ -1,8 +1,13 @@
Index: shaderc-2020.4/CMakeLists.txt ---
CMakeLists.txt | 7 -------
libshaderc/CMakeLists.txt | 2 ++
2 files changed, 2 insertions(+), 7 deletions(-)
Index: shaderc-2020.5/CMakeLists.txt
=================================================================== ===================================================================
--- shaderc-2020.4.orig/CMakeLists.txt --- shaderc-2020.5.orig/CMakeLists.txt
+++ shaderc-2020.4/CMakeLists.txt +++ shaderc-2020.5/CMakeLists.txt
@@ -102,18 +102,12 @@ endif(MSVC) @@ -112,7 +112,6 @@ endif(MSVC)
# Configure subdirectories. # Configure subdirectories.
# We depend on these for later projects, so they should come first. # We depend on these for later projects, so they should come first.
@ -10,21 +15,23 @@ Index: shaderc-2020.4/CMakeLists.txt
add_subdirectory(libshaderc_util) add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc) add_subdirectory(libshaderc)
add_subdirectory(glslc) @@ -121,12 +120,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
add_subdirectory(examples) add_subdirectory(examples)
endif()
-add_custom_target(build-version -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.py
- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - ${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).") - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
-
function(define_pkg_config_file NAME LIBS) function(define_pkg_config_file NAME LIBS)
add_custom_target(${NAME}-pkg-config ALL add_custom_target(${NAME}-pkg-config ALL
Index: shaderc-2020.4/libshaderc/CMakeLists.txt COMMAND ${CMAKE_COMMAND}
Index: shaderc-2020.5/libshaderc/CMakeLists.txt
=================================================================== ===================================================================
--- shaderc-2020.4.orig/libshaderc/CMakeLists.txt --- shaderc-2020.5.orig/libshaderc/CMakeLists.txt
+++ shaderc-2020.4/libshaderc/CMakeLists.txt +++ shaderc-2020.5/libshaderc/CMakeLists.txt
@@ -66,6 +66,8 @@ set(SHADERC_LIBS @@ -66,6 +66,8 @@ set(SHADERC_LIBS
shaderc_util shaderc_util
SPIRV # from glslang SPIRV # from glslang

6
shaderc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 1 08:44:37 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2020.5
* Support newer glslang
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 11 00:50:07 UTC 2021 - Dirk Müller <dmueller@suse.com> Mon Jan 11 00:50:07 UTC 2021 - Dirk Müller <dmueller@suse.com>

4
shaderc.spec
View File

@ -18,7 +18,7 @@
Name: shaderc Name: shaderc
%define lname libshaderc_shared1 %define lname libshaderc_shared1
Version: 2020.4 Version: 2020.5
Release: 0 Release: 0
Summary: A collection of tools, libraries and tests for shader compilation Summary: A collection of tools, libraries and tests for shader compilation
License: Apache-2.0 License: Apache-2.0
@ -30,7 +30,7 @@ Source: https://github.com/google/shaderc/archive/v%version.tar.gz
Patch1: 0001-Use-system-third-party-libs.patch Patch1: 0001-Use-system-third-party-libs.patch
BuildRequires: c++_compiler BuildRequires: c++_compiler
BuildRequires: cmake BuildRequires: cmake
BuildRequires: glslang-devel >= 8.13.3727+git4 BuildRequires: glslang-devel >= 11.1
BuildRequires: python-xml BuildRequires: python-xml
BuildRequires: spirv-headers >= 1.5.1.corrected+git24 BuildRequires: spirv-headers >= 1.5.1.corrected+git24
BuildRequires: spirv-tools-devel >= 2020.2 BuildRequires: spirv-tools-devel >= 2020.2

3
v2020.4.tar.gz
View File

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

3
v2020.5.tar.gz Normal file
View File

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