Accepting request 827352 from X11:Wayland

OBS-URL: https://build.opensuse.org/request/show/827352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shaderc?expand=0&rev=6

0001-Use-system-third-party-libs.patch

@@ -1,18 +1,7 @@
-From: Martin Herkt <lachs0r@srsfckn.biz>
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
-Date: Fri, 3 Nov 2017 11:58:14 +0100
+--- a/CMakeLists.txt	2020-07-23 16:43:08.000000000 -0500
-Subject: [PATCH 1/2] Use system third party libs
++++ b/CMakeLists.txt	2020-08-16 20:18:41.235394189 -0500
-
+@@ -113,7 +113,6 @@
----
- CMakeLists.txt            |    7 -------
- glslc/CMakeLists.txt      |    2 +-
- libshaderc/CMakeLists.txt |    2 ++
- 3 files changed, 3 insertions(+), 8 deletions(-)
-
-Index: shaderc-2019.1/CMakeLists.txt
-===================================================================
---- shaderc-2019.1.orig/CMakeLists.txt
-+++ shaderc-2019.1/CMakeLists.txt
-@@ -92,7 +92,6 @@ endif(MSVC)
  
  # Configure subdirectories.
  # We depend on these for later projects, so they should come first.
@@ -20,7 +9,7 @@ Index: shaderc-2019.1/CMakeLists.txt
  
  if(SHADERC_ENABLE_SPVC)
  add_subdirectory(libshaderc_spvc)
-@@ -103,12 +102,6 @@ add_subdirectory(libshaderc)
+@@ -124,11 +123,6 @@
  add_subdirectory(glslc)
  add_subdirectory(examples)
  
@@ -29,28 +18,13 @@ Index: shaderc-2019.1/CMakeLists.txt
 -  ${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
 -  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
-     COMMAND ${CMAKE_COMMAND}
+diff -Naur a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
-Index: shaderc-2019.1/glslc/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
---- shaderc-2019.1.orig/glslc/CMakeLists.txt
+@@ -66,6 +66,8 @@
-+++ shaderc-2019.1/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  HLSL glslang SPIRV SPVRemapper ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-Index: shaderc-2019.1/libshaderc/CMakeLists.txt
-===================================================================
---- shaderc-2019.1.orig/libshaderc/CMakeLists.txt
-+++ shaderc-2019.1/libshaderc/CMakeLists.txt
-@@ -46,6 +46,8 @@ set(SHADERC_LIBS
    shaderc_util
    SPIRV # from glslang
    SPIRV-Tools

shaderc.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Aug 17 01:07:43 UTC 2020 - malcolmlewis@opensuse.org
+
+- Updated to release 2020.2:
+  * Support both posix and non-posix MinGW toolchains.
+  * Support optionally building Tint tooling for WGSL.
+  * Add -h option to glslc, spvc; same as --help.
+  * Update to Glslang generator 9.
+  * Add interface to support 16-bit types in HLSL
+  * Add glslc hidden experimental option -mfmt=wgsl; requires Tint.
+  * Add minimum buffer size for Dawn reflection.
+- Changes from release 2020.1:
+  * Added warning signs about unsupported downloads.
+  * Removed Singleton pattern around access to glslang.
+  * Added concept of comparison sampler to API.
+  * Added support for options.hlsl.nonwritable_uav_texture_as_srv.
+  * Support forcing storage buffers to be always declared as UAV.
+- Rebase 0001-Use-system-third-party-libs.patch.
+
 -------------------------------------------------------------------
 Wed Apr  8 11:59:02 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 

shaderc.spec

@@ -18,7 +18,7 @@
 
 Name:           shaderc
 %define lname libshaderc_shared1
-Version:        2020.0
+Version:        2020.2
 Release:        0
 Summary:        A collection of tools, libraries and tests for shader compilation
 License:        Apache-2.0
@@ -65,7 +65,7 @@ Shaderc wraps around core functionality in glslang and SPIRV-Tools
 
 %prep
 %autosetup -p1
-echo "\"%{version}\"" > glslc/src/build-version.inc
+echo "\"%version\"" >glslc/src/build-version.inc
 
 %build
 %cmake -DSHADERC_SKIP_TESTS=ON

v2020.0.tar.gz

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

v2020.2.tar.gz

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