forked from pool/shaderc
- Update to new upstream release 2019.0
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=4
This commit is contained in:
Git OBS Bridge
parent
2d0233ff67
commit
50beaf0bdd
@ -3,35 +3,39 @@ Date: Fri, 3 Nov 2017 11:58:14 +0100
|
||||
Subject: [PATCH 1/2] Use system third party libs
|
||||
|
||||
---
|
||||
CMakeLists.txt | 8 --------
|
||||
CMakeLists.txt | 6 ------
|
||||
glslc/CMakeLists.txt | 2 +-
|
||||
libshaderc/CMakeLists.txt | 2 ++
|
||||
3 files changed, 3 insertions(+), 9 deletions(-)
|
||||
3 files changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
Index: shaderc-2018.0/CMakeLists.txt
|
||||
Index: shaderc-2019.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- shaderc-2018.0.orig/CMakeLists.txt
|
||||
+++ shaderc-2018.0/CMakeLists.txt
|
||||
@@ -61,15 +61,7 @@ endif(MSVC)
|
||||
--- shaderc-2019.0.orig/CMakeLists.txt
|
||||
+++ shaderc-2019.0/CMakeLists.txt
|
||||
@@ -70,7 +70,6 @@ endif(MSVC)
|
||||
|
||||
# Configure subdirectories.
|
||||
# We depend on these for later projects, so they should come first.
|
||||
-add_subdirectory(third_party)
|
||||
-
|
||||
add_subdirectory(libshaderc_util)
|
||||
add_subdirectory(libshaderc)
|
||||
|
||||
if(SHADERC_ENABLE_SPVC)
|
||||
add_subdirectory(libshaderc_spvc)
|
||||
@@ -81,11 +80,6 @@ add_subdirectory(libshaderc)
|
||||
add_subdirectory(glslc)
|
||||
add_subdirectory(examples)
|
||||
-
|
||||
|
||||
-add_custom_target(build-version
|
||||
- ${PYTHON_EXE}
|
||||
- ${PYTHON_EXECUTABLE}
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
|
||||
- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR}
|
||||
- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
|
||||
Index: shaderc-2018.0/glslc/CMakeLists.txt
|
||||
|
||||
function(define_pkg_config_file NAME LIBS)
|
||||
add_custom_target(${NAME}-pkg-config ALL
|
||||
Index: shaderc-2019.0/glslc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- shaderc-2018.0.orig/glslc/CMakeLists.txt
|
||||
+++ shaderc-2018.0/glslc/CMakeLists.txt
|
||||
--- shaderc-2019.0.orig/glslc/CMakeLists.txt
|
||||
+++ shaderc-2019.0/glslc/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@ add_library(glslc STATIC
|
||||
shaderc_default_compile_options(glslc)
|
||||
target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
|
||||
@ -41,11 +45,11 @@ Index: shaderc-2018.0/glslc/CMakeLists.txt
|
||||
target_link_libraries(glslc PRIVATE shaderc_util shaderc)
|
||||
|
||||
add_executable(glslc_exe src/main.cc)
|
||||
Index: shaderc-2018.0/libshaderc/CMakeLists.txt
|
||||
Index: shaderc-2019.0/libshaderc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- shaderc-2018.0.orig/libshaderc/CMakeLists.txt
|
||||
+++ shaderc-2018.0/libshaderc/CMakeLists.txt
|
||||
@@ -43,6 +43,8 @@ set(SHADERC_LIBS
|
||||
--- shaderc-2019.0.orig/libshaderc/CMakeLists.txt
|
||||
+++ shaderc-2019.0/libshaderc/CMakeLists.txt
|
||||
@@ -46,6 +46,8 @@ set(SHADERC_LIBS
|
||||
shaderc_util
|
||||
SPIRV # from glslang
|
||||
SPIRV-Tools
|
||||
|
||||
6
_service
6
_service
@ -2,9 +2,9 @@
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">git://github.com/google/shaderc</param>
|
||||
<param name="revision">v2018.0</param>
|
||||
<param name="parent-tag">v2018.0</param>
|
||||
<param name="versionformat">2018.0</param>
|
||||
<param name="revision">v2019.0</param>
|
||||
<param name="parent-tag">v2019.0</param>
|
||||
<param name="versionformat">2019.0</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1af380ec0a5b442b6e8bd0e076e4d8b24ef3630f60158eba63cfe26ea1d34ba9
|
||||
size 152284
|
||||
3
shaderc-2019.0.tar.xz
Normal file
3
shaderc-2019.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c7271e00d3ebb7e4b8de56203950556294fa74bb7e25b96e046541de34840d21
|
||||
size 169476
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 11:59:17 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to new upstream release 2019.0
|
||||
* Add optional spvc, libshaderc_spvc as wrapper around
|
||||
SPIRV-Cross.
|
||||
* Support NV extensions for shader stages.
|
||||
* spvc: Added option to specify source environment. Spvc will
|
||||
transform from source to target environment if they are
|
||||
different. This only works for WebGPU0 and Vulkan 1.1.
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 14 23:08:14 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: shaderc
|
||||
%define lname libshaderc_shared1
|
||||
Version: 2018.0
|
||||
Version: 2019.0
|
||||
Release: 0
|
||||
Summary: A collection of tools, libraries and tests for shader compilation
|
||||
License: Apache-2.0
|
||||
@ -28,10 +28,10 @@ Source: %name-%version.tar.xz
|
||||
Patch1: 0001-Use-system-third-party-libs.patch
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: cmake
|
||||
BuildRequires: glslang-devel >= 3.0.g1685
|
||||
BuildRequires: glslang-devel >= 7
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: spirv-headers >= 1.2
|
||||
BuildRequires: spirv-tools-devel >= 2017.0.g103
|
||||
BuildRequires: spirv-headers >= 1.4
|
||||
BuildRequires: spirv-tools-devel > 2019.3
|
||||
|
||||
%description
|
||||
A collection of tools, libraries and tests for shader compilation.
|
||||
@ -86,5 +86,6 @@ rm %buildroot/%_libdir/*.a
|
||||
%files devel
|
||||
%_includedir/shaderc/
|
||||
%_libdir/libshaderc_shared.so
|
||||
%_libdir/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user