From d9cd5063158ebcae919143f49ad1e13bcbb1a0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 8 Aug 2020 23:59:51 +0200 Subject: [PATCH] Update to 2020.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- ...p-third-party-code-in-CMakeLists.txt.patch | 10 +++-- ...link-order-of-libglslang-and-libHLSL.patch | 44 ------------------- shaderc.spec | 14 +++--- sources | 2 +- 4 files changed, 14 insertions(+), 56 deletions(-) delete mode 100644 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 189afe1..541bcc0 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,7 +1,7 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt --- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 +++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 -@@ -92,7 +92,6 @@ endif(MSVC) +@@ -98,7 +98,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -9,10 +9,12 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig sh if(SHADERC_ENABLE_SPVC) add_subdirectory(libshaderc_spvc) -@@ -103,11 +102,6 @@ add_subdirectory(libshaderc) +@@ -107,13 +106,6 @@ endif() + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) add_subdirectory(glslc) - add_subdirectory(examples) - +-add_subdirectory(examples) +- -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py diff --git a/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch b/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch deleted file mode 100644 index d243144..0000000 --- a/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Tue, 29 May 2018 07:34:00 +0200 -Subject: [PATCH] Fix the link order of libglslang and libHLSL - -libglslang depends on libHLSL, so the latter needs to be specified last. -This fixes an issue when trying to build shaderc against system-wide -versions of libglslang/libHLSL, rather than the in-tree versions from -third_party. - -Additionally, libshaderc_util also depends on SPIRV-Tools ---- - glslc/CMakeLists.txt | 2 +- - libshaderc_util/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index acf6fb0..0f5d888 100644 ---- a/glslc/CMakeLists.txt -+++ b/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}) -+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) - target_link_libraries(glslc PRIVATE shaderc_util shaderc) - - add_executable(glslc_exe src/main.cc) -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 873540a..6d0c465 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -32,8 +32,8 @@ add_definitions(-DENABLE_HLSL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ glslang OSDependent OGLCompiler glslang HLSL SPIRV -+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util diff --git a/shaderc.spec b/shaderc.spec index 2bfc8f2..9e50134 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2020.1 -%global commit 7c2aa93903558f017f31b35df163bce5fe849f45 +# Release 2020.2 +%global commit 4162bb13b426dab68ebe411ea7ef05f6343bea95 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global snapshotdate 20200808 @@ -10,16 +10,13 @@ %global glslang_version SDK-candidate-2-11-gc9b28b9f Name: shaderc -Version: 2020.1 +Version: 2020.2 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 URL: https://github.com/google/shaderc Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz - -# https://github.com/google/shaderc/pull/463 -Patch0: 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -103,7 +100,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %cmake3_install %check -ctest -V +%ctest3 %files -n glslc %doc glslc/README.asciidoc @@ -128,6 +125,9 @@ ctest -V %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Sat Aug 08 19:00:03 CEST 2020 Robert-André Mauchin - 2020.2-1 +- Update to 2020.2 + * Sat Aug 01 2020 Fedora Release Engineering - 2020.1-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2f94e46..b28928c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-7c2aa93.tar.gz) = 4ec9a88e3790c3d3482a35111019d12d4d15a4b77c715f0659e52d35872f4a05fbd3182dd573b0c198e483548c4b08a98da5bc28427438fc4a67942da0452702 +SHA512 (shaderc-4162bb1.tar.gz) = 30be976ed1d366428eae4592a201260e2b310350c181000c2fb2099553a7bcd4f964191973bbcbe96968fd6c37c18cc4819f642938e3d772dbffc28d0abc4fe7