From 28fffee4c1616874e313ce61cecb436cd46c7ce22ee208a6b05a3184f228a6b7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Aug 2020 11:33:39 +0000 Subject: [PATCH 1/4] Accepting request 827161 from home:malcolmlewis:branches:X11:Wayland - Updated to release 2020.2: * Remove VS2013 support. * Support both posix and non-posix MinGW toolchains. * Support optionally building Tint tooling for WGSL. * Add -h option to glslc, spvc; same as --help. * Add source file license checker. * BUILD.gn improvements. * Update to Glslang generator 9. * Add interface to support 16bit 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, (gh#google/shaderc#1041). * Added .NET bindings to README.md (gh#google/shaderc#1060). * Only add -fPIC if supported by the compiler, (gh#google/shaderc#1061). * Removed Singleton pattern around access to glslang, (gh#google/shaderc#1059). * Added concept of comparison sampler to API, (gh#google/shaderc#1036). * Added support for options.hlsl.nonwritable_uav_texture_as_srv, (gh#google/shaderc#1048). * Support forcing storage buffers to be always declared as UAV, (gh#google/shaderc#1076). - Rebase 0001-Use-system-third-party-libs.patch. OBS-URL: https://build.opensuse.org/request/show/827161 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=13 --- 0001-Use-system-third-party-libs.patch | 46 ++++++-------------------- shaderc-2020.2.tar.gz | 3 ++ shaderc.changes | 30 +++++++++++++++++ shaderc.spec | 4 +-- v2020.0.tar.gz | 3 -- 5 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 shaderc-2020.2.tar.gz delete mode 100644 v2020.0.tar.gz diff --git a/0001-Use-system-third-party-libs.patch b/0001-Use-system-third-party-libs.patch index 0d01e0a..20159cb 100644 --- a/0001-Use-system-third-party-libs.patch +++ b/0001-Use-system-third-party-libs.patch @@ -1,18 +1,7 @@ -From: Martin Herkt -Date: Fri, 3 Nov 2017 11:58:14 +0100 -Subject: [PATCH 1/2] Use system third party libs - ---- - 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) +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 @@ # 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} -Index: shaderc-2019.1/glslc/CMakeLists.txt -=================================================================== ---- shaderc-2019.1.orig/glslc/CMakeLists.txt -+++ 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 +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 @@ shaderc_util SPIRV # from glslang SPIRV-Tools diff --git a/shaderc-2020.2.tar.gz b/shaderc-2020.2.tar.gz new file mode 100644 index 0000000..7fb2ce3 --- /dev/null +++ b/shaderc-2020.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4d5680d4f0199e29ab77b357c88c147c5704f9ee2ac0a2d117e640e6f87d030 +size 278161 diff --git a/shaderc.changes b/shaderc.changes index 6aee63d..adab9e1 100644 --- a/shaderc.changes +++ b/shaderc.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Aug 17 01:07:43 UTC 2020 - malcolmlewis@opensuse.org + +- Updated to release 2020.2: + * Remove VS2013 support. + * Support both posix and non-posix MinGW toolchains. + * Support optionally building Tint tooling for WGSL. + * Add -h option to glslc, spvc; same as --help. + * Add source file license checker. + * BUILD.gn improvements. + * Update to Glslang generator 9. + * Add interface to support 16bit 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, + (gh#google/shaderc#1041). + * Added .NET bindings to README.md (gh#google/shaderc#1060). + * Only add -fPIC if supported by the compiler, + (gh#google/shaderc#1061). + * Removed Singleton pattern around access to glslang, + (gh#google/shaderc#1059). + * Added concept of comparison sampler to API, + (gh#google/shaderc#1036). + * Added support for options.hlsl.nonwritable_uav_texture_as_srv, + (gh#google/shaderc#1048). + * Support forcing storage buffers to be always declared as UAV, + (gh#google/shaderc#1076). +- Rebase 0001-Use-system-third-party-libs.patch. + ------------------------------------------------------------------- Wed Apr 8 11:59:02 UTC 2020 - Jan Engelhardt diff --git a/shaderc.spec b/shaderc.spec index a263315..de83404 100644 --- a/shaderc.spec +++ b/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 @@ -26,7 +26,7 @@ Group: Development/Tools/Other URL: https://github.com/google/shaderc #Git-Clone: https://github.com/google/shaderc -Source: https://github.com/google/shaderc/archive/v%version.tar.gz +Source: https://github.com/google/shaderc/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake diff --git a/v2020.0.tar.gz b/v2020.0.tar.gz deleted file mode 100644 index f170ec8..0000000 --- a/v2020.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec -size 274371 From 1d0508a3f255439320ef6d196920fbc428140467f41720dea949e59b7dd09d9b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Aug 2020 11:50:09 +0000 Subject: [PATCH 2/4] trim silly source URL OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=14 --- shaderc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shaderc.spec b/shaderc.spec index de83404..71301d1 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -26,7 +26,7 @@ Group: Development/Tools/Other URL: https://github.com/google/shaderc #Git-Clone: https://github.com/google/shaderc -Source: https://github.com/google/shaderc/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://github.com/google/shaderc/archive/%name-%version.tar.gz Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake @@ -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 From 4e56055d83799810ff4345a57c45bcca8c17856649ca28e3617dc26693167219 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Aug 2020 12:04:26 +0000 Subject: [PATCH 3/4] trim user-irrelevant log entries OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=15 --- shaderc.changes | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/shaderc.changes b/shaderc.changes index adab9e1..b1b08e3 100644 --- a/shaderc.changes +++ b/shaderc.changes @@ -2,30 +2,19 @@ Mon Aug 17 01:07:43 UTC 2020 - malcolmlewis@opensuse.org - Updated to release 2020.2: - * Remove VS2013 support. * Support both posix and non-posix MinGW toolchains. * Support optionally building Tint tooling for WGSL. * Add -h option to glslc, spvc; same as --help. - * Add source file license checker. - * BUILD.gn improvements. * Update to Glslang generator 9. - * Add interface to support 16bit types in HLSL + * 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, - (gh#google/shaderc#1041). - * Added .NET bindings to README.md (gh#google/shaderc#1060). - * Only add -fPIC if supported by the compiler, - (gh#google/shaderc#1061). - * Removed Singleton pattern around access to glslang, - (gh#google/shaderc#1059). - * Added concept of comparison sampler to API, - (gh#google/shaderc#1036). - * Added support for options.hlsl.nonwritable_uav_texture_as_srv, - (gh#google/shaderc#1048). - * Support forcing storage buffers to be always declared as UAV, - (gh#google/shaderc#1076). + * 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. ------------------------------------------------------------------- From 14d1bf6ae4d5e8c106bc8df55e2600b322655fabf009cc42924c4b333eb2966b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Aug 2020 13:17:28 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/shaderc?expand=0&rev=16 --- shaderc.spec | 2 +- shaderc-2020.2.tar.gz => v2020.2.tar.gz | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename shaderc-2020.2.tar.gz => v2020.2.tar.gz (100%) diff --git a/shaderc.spec b/shaderc.spec index 71301d1..7a56ba7 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -26,7 +26,7 @@ Group: Development/Tools/Other URL: https://github.com/google/shaderc #Git-Clone: https://github.com/google/shaderc -Source: https://github.com/google/shaderc/archive/%name-%version.tar.gz +Source: https://github.com/google/shaderc/archive/v%version.tar.gz Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake diff --git a/shaderc-2020.2.tar.gz b/v2020.2.tar.gz similarity index 100% rename from shaderc-2020.2.tar.gz rename to v2020.2.tar.gz