forked from pool/shaderc
- Update to release 2023.2
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=45
This commit is contained in:
parent
637049ce31
commit
37d2727d33
@ -1,13 +1,14 @@
|
|||||||
---
|
---
|
||||||
CMakeLists.txt | 7 -------
|
CMakeLists.txt | 3 +--
|
||||||
libshaderc/CMakeLists.txt | 2 ++
|
libshaderc/CMakeLists.txt | 2 ++
|
||||||
2 files changed, 2 insertions(+), 7 deletions(-)
|
utils/update_build_version.sh | 1 +
|
||||||
|
3 files changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
Index: shaderc-2020.5/CMakeLists.txt
|
Index: shaderc-2023.2/CMakeLists.txt
|
||||||
===================================================================
|
===================================================================
|
||||||
--- shaderc-2020.5.orig/CMakeLists.txt
|
--- shaderc-2023.2.orig/CMakeLists.txt
|
||||||
+++ shaderc-2020.5/CMakeLists.txt
|
+++ shaderc-2023.2/CMakeLists.txt
|
||||||
@@ -112,7 +112,6 @@ endif(MSVC)
|
@@ -130,7 +130,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.
|
||||||
@ -15,24 +16,20 @@ Index: shaderc-2020.5/CMakeLists.txt
|
|||||||
|
|
||||||
add_subdirectory(libshaderc_util)
|
add_subdirectory(libshaderc_util)
|
||||||
add_subdirectory(libshaderc)
|
add_subdirectory(libshaderc)
|
||||||
@@ -121,12 +120,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
|
@@ -141,7 +140,7 @@ endif()
|
||||||
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
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.sh
|
||||||
- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
|
${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).")
|
||||||
function(define_pkg_config_file NAME LIBS)
|
|
||||||
add_custom_target(${NAME}-pkg-config ALL
|
Index: shaderc-2023.2/libshaderc/CMakeLists.txt
|
||||||
COMMAND ${CMAKE_COMMAND}
|
|
||||||
Index: shaderc-2020.5/libshaderc/CMakeLists.txt
|
|
||||||
===================================================================
|
===================================================================
|
||||||
--- shaderc-2020.5.orig/libshaderc/CMakeLists.txt
|
--- shaderc-2023.2.orig/libshaderc/CMakeLists.txt
|
||||||
+++ shaderc-2020.5/libshaderc/CMakeLists.txt
|
+++ shaderc-2023.2/libshaderc/CMakeLists.txt
|
||||||
@@ -66,6 +66,8 @@ set(SHADERC_LIBS
|
@@ -67,6 +67,8 @@ set(SHADERC_LIBS
|
||||||
shaderc_util
|
shaderc_util
|
||||||
SPIRV # from glslang
|
SPIRV # from glslang
|
||||||
SPIRV-Tools
|
SPIRV-Tools
|
||||||
@ -41,3 +38,9 @@ Index: shaderc-2020.5/libshaderc/CMakeLists.txt
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
|
target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
|
||||||
|
Index: shaderc-2023.2/utils/update_build_version.sh
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null
|
||||||
|
+++ shaderc-2023.2/utils/update_build_version.sh
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+#!/bin/true
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 28 23:26:28 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Update to release 2023.2
|
||||||
|
* Fix C++20 compatibility: explicitly construct string_piece when
|
||||||
|
comparing to `char *`
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Dec 4 12:50:08 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
Sun Dec 4 12:50:08 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
15
shaderc.spec
15
shaderc.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package shaderc
|
# spec file for package shaderc
|
||||||
#
|
#
|
||||||
# Copyright (c) 2022 SUSE LLC
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -19,7 +19,7 @@
|
|||||||
# Remember to bump in baselibs.conf
|
# Remember to bump in baselibs.conf
|
||||||
%define lname libshaderc_shared1
|
%define lname libshaderc_shared1
|
||||||
Name: shaderc
|
Name: shaderc
|
||||||
Version: 2022.4
|
Version: 2023.2
|
||||||
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
|
||||||
@ -31,13 +31,9 @@ Source99: baselibs.conf
|
|||||||
Patch1: 0001-Use-system-third-party-libs.patch
|
Patch1: 0001-Use-system-third-party-libs.patch
|
||||||
BuildRequires: c++_compiler
|
BuildRequires: c++_compiler
|
||||||
BuildRequires: cmake >= 2.8.12
|
BuildRequires: cmake >= 2.8.12
|
||||||
# "DEPS" file recommends: glslang 11.12.0-24-g728c6895
|
BuildRequires: glslang-devel >= 12
|
||||||
# DEPS file: spirv-headers sdk-1.3.231.0-14-gc214f6f
|
BuildRequires: spirv-headers >= 1.6.1~sdk239
|
||||||
# DEPS file: spirv-tools v2022.4-28-gd9446130
|
BuildRequires: spirv-tools-devel >= 2023.1
|
||||||
# Slightly lower should work too
|
|
||||||
BuildRequires: glslang-devel >= 11.12.0
|
|
||||||
BuildRequires: spirv-headers >= 1.6.1~sdk231
|
|
||||||
BuildRequires: spirv-tools-devel >= 2022.4
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A collection of tools, libraries and tests for shader compilation.
|
A collection of tools, libraries and tests for shader compilation.
|
||||||
@ -69,6 +65,7 @@ Shaderc wraps around core functionality in glslang and SPIRV-Tools
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
chmod a+x utils/update_build_version.sh
|
||||||
echo "\"%version\"" >glslc/src/build-version.inc
|
echo "\"%version\"" >glslc/src/build-version.inc
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a948436f2eca403026fe2c900df0108a0f4972005230817d805c43d96554c9ea
|
|
||||||
size 223535
|
|
BIN
v2023.2.tar.gz
(Stored with Git LFS)
Normal file
BIN
v2023.2.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user