From 7ccc3609694c6f77fe39b2618aa757d25e81638a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 29 Jan 2020 10:30:50 +1000 Subject: [PATCH] Update to latest git snapshot --- 0001-pkg-config-compatibility.patch | 83 +++++++++++----------- fix_relative_header_paths.patch | 37 ---------- glslang-lib-install.patch | 105 ---------------------------- glslang.spec | 18 ++--- 4 files changed, 52 insertions(+), 191 deletions(-) delete mode 100644 fix_relative_header_paths.patch delete mode 100644 glslang-lib-install.patch diff --git a/0001-pkg-config-compatibility.patch b/0001-pkg-config-compatibility.patch index e9ab32d..f5a10c2 100644 --- a/0001-pkg-config-compatibility.patch +++ b/0001-pkg-config-compatibility.patch @@ -1,6 +1,6 @@ -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma 2019-11-02 02:51:21.000000000 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt 2019-11-13 15:06:21.418739152 +1000 +diff -up ./CMakeLists.txt.dma ./CMakeLists.txt +--- ./CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000 ++++ ./CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000 @@ -69,6 +69,13 @@ endmacro(glslang_pch) project(glslang) @@ -15,7 +15,7 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma gls if(ENABLE_CTEST) include(CTest) endif() -@@ -163,11 +170,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA +@@ -166,11 +173,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA add_subdirectory(External) endif() @@ -28,9 +28,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma gls message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt.dma 2019-11-02 02:51:21.000000000 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt 2019-11-13 15:06:21.418739152 +1000 +diff -up ./External/CMakeLists.txt.dma ./External/CMakeLists.txt +--- ./External/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000 ++++ ./External/CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000 @@ -35,10 +35,3 @@ if(BUILD_TESTING) endif() endif() @@ -42,10 +42,10 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.tx - endif() -endif() - -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt.dma 2019-11-13 15:06:05.678579864 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt 2019-11-13 15:07:16.046291974 +1000 -@@ -76,6 +76,7 @@ set(HEADERS +diff -up ./glslang/CMakeLists.txt.dma ./glslang/CMakeLists.txt +--- ./glslang/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000 ++++ ./glslang/CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000 +@@ -79,6 +79,7 @@ set(HEADERS MachineIndependent/preprocessor/PpContext.h MachineIndependent/preprocessor/PpTokens.h) @@ -53,7 +53,7 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -@@ -112,7 +113,9 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -115,7 +116,9 @@ if(ENABLE_GLSLANG_INSTALL) install(TARGETS glslang EXPORT glslangTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() @@ -64,9 +64,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt endif(ENABLE_GLSLANG_INSTALL) if(ENABLE_GLSLANG_INSTALL) -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in.dma 2019-11-13 15:06:21.419739162 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in 2019-11-13 15:06:21.419739162 +1000 +diff -up ./glslang/glslang.pc.cmake.in.dma ./glslang/glslang.pc.cmake.in +--- ./glslang/glslang.pc.cmake.in.dma 2020-01-29 10:29:25.199187348 +1000 ++++ ./glslang/glslang.pc.cmake.in 2020-01-29 10:29:25.199187348 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -80,9 +80,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cma + Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.dma 2019-11-13 15:06:05.678579864 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt 2019-11-13 15:06:21.438739355 +1000 +diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt +--- ./SPIRV/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000 ++++ ./SPIRV/CMakeLists.txt 2020-01-29 10:29:25.200187375 +1000 @@ -40,6 +40,10 @@ target_include_directories(SPIRV PUBLIC $ $) @@ -120,18 +120,19 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.d else() target_link_libraries(SPIRV glslang) endif(ENABLE_OPT) -@@ -94,5 +104,8 @@ if(ENABLE_GLSLANG_INSTALL) - install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) +@@ -97,6 +107,9 @@ if(ENABLE_GLSLANG_INSTALL) + + install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + # spirv.pc Configuration + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif(ENABLE_GLSLANG_INSTALL) -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in.dma 2019-11-13 15:06:21.438739355 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in 2019-11-13 15:06:21.438739355 +1000 +diff -up ./SPIRV/spirv.pc.cmake.in.dma ./SPIRV/spirv.pc.cmake.in +--- ./SPIRV/spirv.pc.cmake.in.dma 2020-01-29 10:29:25.200187375 +1000 ++++ ./SPIRV/spirv.pc.cmake.in 2020-01-29 10:29:25.200187375 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -145,9 +146,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.i + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma 2019-11-02 02:51:21.000000000 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp 2019-11-13 15:06:21.438739355 +1000 +diff -up ./SPIRV/SpvTools.cpp.dma ./SPIRV/SpvTools.cpp +--- ./SPIRV/SpvTools.cpp.dma 2020-01-28 05:35:25.000000000 +1000 ++++ ./SPIRV/SpvTools.cpp 2020-01-29 10:29:25.200187375 +1000 @@ -43,8 +43,8 @@ #include @@ -159,12 +160,12 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma namespace glslang { -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt.dma 2019-11-13 15:06:05.678579864 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt 2019-11-13 15:06:21.439739365 +1000 -@@ -24,6 +24,14 @@ set(LIBRARIES - SPVRemapper - glslang-default-resource-limits) +diff -up ./StandAlone/CMakeLists.txt.dma ./StandAlone/CMakeLists.txt +--- ./StandAlone/CMakeLists.txt.dma 2020-01-29 10:29:09.052755158 +1000 ++++ ./StandAlone/CMakeLists.txt 2020-01-29 10:29:25.201187402 +1000 +@@ -23,6 +23,14 @@ if(ENABLE_SPVREMAPPER) + set(LIBRARIES ${LIBRARIES} SPVRemapper) + endif() +if(BUILD_SHARED_LIBS) + set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) @@ -177,13 +178,13 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists. if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -34,9 +42,6 @@ endif(WIN32) +@@ -32,9 +40,6 @@ elseif(UNIX) + endif(WIN32) target_link_libraries(glslangValidator ${LIBRARIES}) - target_link_libraries(spirv-remap ${LIBRARIES}) --target_include_directories(glslangValidator PUBLIC -- $ -- $) +-target_include_directories(glslangValidator PUBLIC +- $ +- $) - if(WIN32) - source_group("Source" FILES ${SOURCES}) + if(ENABLE_SPVREMAPPER) + set(REMAPPER_SOURCES spirv-remap.cpp) diff --git a/fix_relative_header_paths.patch b/fix_relative_header_paths.patch deleted file mode 100644 index 0bdf438..0000000 --- a/fix_relative_header_paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b5d9dee710f2bda42afbc6f2ce84b5836908d021 Mon Sep 17 00:00:00 2001 -From: John Kessenich -Date: Mon, 9 Dec 2019 03:12:10 -0700 -Subject: [PATCH] Fix #2007: Fix a couple relative header paths in header - files. - ---- - SPIRV/GlslangToSpv.h | 2 +- - SPIRV/SpvTools.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h -index 86e1c23bf..3907be43b 100755 ---- a/SPIRV/GlslangToSpv.h -+++ b/SPIRV/GlslangToSpv.h -@@ -40,7 +40,7 @@ - #endif - - #include "SpvTools.h" --#include "../glslang/Include/intermediate.h" -+#include "glslang/Include/intermediate.h" - - #include - #include -diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h -index 7422d0126..59c914da0 100644 ---- a/SPIRV/SpvTools.h -+++ b/SPIRV/SpvTools.h -@@ -46,7 +46,7 @@ - #include - #endif - --#include "../glslang/MachineIndependent/localintermediate.h" -+#include "glslang/MachineIndependent/localintermediate.h" - #include "Logger.h" - - namespace glslang { diff --git a/glslang-lib-install.patch b/glslang-lib-install.patch deleted file mode 100644 index 8838a97..0000000 --- a/glslang-lib-install.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index af4ab587..e0096743 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -11,5 +11,5 @@ endif(WIN32) - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OGLCompiler EXPORT OGLCompilerTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT OGLCompilerTargets DESTINATION lib/cmake) -+ install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index e25ec0a1..364f04cc 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL) - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake) -- install(EXPORT SPIRVTargets DESTINATION lib/cmake) -+ install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -+ install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 0878965c..d9d71d1a 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS spirv-remap EXPORT spirv-remapTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - -- install(EXPORT glslangValidatorTargets DESTINATION lib/cmake) -- install(EXPORT spirv-remapTargets DESTINATION lib/cmake) -+ install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -+ install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - - if(BUILD_SHARED_LIBS) - install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake) -+ install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 42df1d1e..446cabb9 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslangTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- install(EXPORT glslangTargets DESTINATION lib/cmake) -+ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) - - if(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 91fb45a7..9994314f 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -22,5 +22,5 @@ endif() - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT OSDependentTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT OSDependentTargets DESTINATION lib/cmake) -+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt -index f6bd4e9d..c050ef61 100644 ---- a/glslang/OSDependent/Windows/CMakeLists.txt -+++ b/glslang/OSDependent/Windows/CMakeLists.txt -@@ -17,5 +17,5 @@ endif(WIN32) - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT OSDependentTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT OSDependentTargets DESTINATION lib/cmake) -+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt -index 77d217f1..aadf9a54 100644 ---- a/gtests/CMakeLists.txt -+++ b/gtests/CMakeLists.txt -@@ -33,7 +33,7 @@ if(BUILD_TESTING) - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslangtests EXPORT glslangtestsTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- install(EXPORT glslangtestsTargets DESTINATION lib/cmake) -+ install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) - - set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test") -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index 44f9d6a2..ae0d4d4e 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS HLSL EXPORT HLSLTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- install(EXPORT HLSLTargets DESTINATION lib/cmake) -+ install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) diff --git a/glslang.spec b/glslang.spec index e8fcfee..7fd98b0 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,21 +1,20 @@ -%global commit 7f77b2e8669ae06acbee9c9867be8b13e4054f9c +%global commit 07a55839eed550d84ef62e0c7f503e0d67692708 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20191102 +%global commit_date 20200128 %global gitrel .%{commit_date}.git%{shortcommit} Name: glslang -Version: 7.13.3496 -Release: 3%{?gitrel}%{?dist} +Version: 8.13.3559 +Release: 1%{?gitrel}%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 URL: https://github.com/KhronosGroup Source0: %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz Patch1: glslang-default-resource-limits_staticlib.patch -Patch2: glslang-lib-install.patch -# Patch to build against system spirv-tools -Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch -Patch4: %url/%{name}/commit/b5d9dee710f2bda42afbc6f2ce84b5836908d021.patch#/fix_relative_header_paths.patch +# Patch to build against system spirv-tools (rebased locally) +#Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch +Patch3: 0001-pkg-config-compatibility.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -84,6 +83,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/cmake/* %changelog +* Wed Jan 29 2020 Dave Airlie - 8.13.3559-1 +- Update to latest git snapshot + * Tue Jan 28 2020 Fedora Release Engineering - 7.13.3496-3.20191102.git7f77b2e - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild