From 743d69628a00c682b52afba4f712596591cbca7d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 22 Apr 2020 11:15:06 +1000 Subject: [PATCH] Update to latest git snapshot --- 0001-pkg-config-compatibility.patch | 75 +++++++++---------- ...ng-default-resource-limits_staticlib.patch | 10 +-- glslang.spec | 9 ++- sources | 2 +- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/0001-pkg-config-compatibility.patch b/0001-pkg-config-compatibility.patch index f5a10c2..880e7e5 100644 --- a/0001-pkg-config-compatibility.patch +++ b/0001-pkg-config-compatibility.patch @@ -1,7 +1,7 @@ -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) +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt 2020-04-22 11:13:26.268442569 +1000 +@@ -87,6 +87,13 @@ endmacro(glslang_pch) project(glslang) @@ -15,7 +15,7 @@ diff -up ./CMakeLists.txt.dma ./CMakeLists.txt if(ENABLE_CTEST) include(CTest) endif() -@@ -166,11 +173,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA +@@ -178,11 +185,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA add_subdirectory(External) endif() @@ -28,9 +28,9 @@ diff -up ./CMakeLists.txt.dma ./CMakeLists.txt message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -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 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt 2020-04-22 11:13:26.268442569 +1000 @@ -35,10 +35,3 @@ if(BUILD_TESTING) endif() endif() @@ -42,10 +42,10 @@ diff -up ./External/CMakeLists.txt.dma ./External/CMakeLists.txt - endif() -endif() - -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 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt 2020-04-22 11:14:08.973598984 +1000 +@@ -80,6 +80,7 @@ set(HEADERS MachineIndependent/preprocessor/PpContext.h MachineIndependent/preprocessor/PpTokens.h) @@ -53,20 +53,19 @@ diff -up ./glslang/CMakeLists.txt.dma ./glslang/CMakeLists.txt glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -@@ -115,7 +116,9 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslangTargets +@@ -117,6 +118,9 @@ if(ENABLE_GLSLANG_INSTALL) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -- install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif(ENABLE_GLSLANG_INSTALL) if(ENABLE_GLSLANG_INSTALL) -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 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in.dma 2020-04-22 11:13:26.269442596 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in 2020-04-22 11:13:26.269442596 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -80,10 +79,10 @@ diff -up ./glslang/glslang.pc.cmake.in.dma ./glslang/glslang.pc.cmake.in + Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper + Cflags: -I${includedir} \ No newline at end of file -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 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt 2020-04-22 11:13:26.269442596 +1000 +@@ -41,6 +41,10 @@ target_include_directories(SPIRV PUBLIC $ $) @@ -94,7 +93,7 @@ diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) -@@ -53,15 +57,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) +@@ -54,15 +58,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) endif() endif() @@ -120,7 +119,7 @@ diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt else() target_link_libraries(SPIRV glslang) endif(ENABLE_OPT) -@@ -97,6 +107,9 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -98,6 +108,9 @@ if(ENABLE_GLSLANG_INSTALL) install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) @@ -130,9 +129,9 @@ diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt 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 ./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 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in.dma 2020-04-22 11:13:26.269442596 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in 2020-04-22 11:13:26.269442596 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -146,9 +145,9 @@ diff -up ./SPIRV/spirv.pc.cmake.in.dma ./SPIRV/spirv.pc.cmake.in + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -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 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp 2020-04-22 11:13:26.269442596 +1000 @@ -43,8 +43,8 @@ #include @@ -160,10 +159,10 @@ diff -up ./SPIRV/SpvTools.cpp.dma ./SPIRV/SpvTools.cpp namespace glslang { -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) +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma 2020-04-22 11:13:13.219089205 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt 2020-04-22 11:13:26.270442623 +1000 +@@ -24,6 +24,14 @@ if(ENABLE_SPVREMAPPER) set(LIBRARIES ${LIBRARIES} SPVRemapper) endif() @@ -178,7 +177,7 @@ diff -up ./StandAlone/CMakeLists.txt.dma ./StandAlone/CMakeLists.txt if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -32,9 +40,6 @@ elseif(UNIX) +@@ -33,9 +41,6 @@ elseif(UNIX) endif(WIN32) target_link_libraries(glslangValidator ${LIBRARIES}) diff --git a/glslang-default-resource-limits_staticlib.patch b/glslang-default-resource-limits_staticlib.patch index a04c2aa..c5a0013 100644 --- a/glslang-default-resource-limits_staticlib.patch +++ b/glslang-default-resource-limits_staticlib.patch @@ -1,9 +1,9 @@ ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma 2020-04-22 11:00:58.685198803 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt 2020-04-22 11:01:12.559574492 +1000 @@ -1,4 +1,4 @@ -add_library(glslang-default-resource-limits +add_library(glslang-default-resource-limits STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) - set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) - diff --git a/glslang.spec b/glslang.spec index 89b8f16..91a23c3 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,11 +1,11 @@ -%global commit 07a55839eed550d84ef62e0c7f503e0d67692708 +%global commit c9b28b9f3388c607ea5506f5e6197b7150238ad3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20200128 +%global commit_date 2020421 %global gitrel .%{commit_date}.git%{shortcommit} Name: glslang Version: 8.13.3559 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 @@ -86,6 +86,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/cmake/* %changelog +* Wed Apr 22 2020 Dave Airlie - 8.13.3559-2 +- Update to latest git snapshot + * Wed Jan 29 2020 Dave Airlie - 8.13.3559-1 - Update to latest git snapshot diff --git a/sources b/sources index ca5696d..452e9f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glslang-07a55839eed550d84ef62e0c7f503e0d67692708.tar.gz) = f56ccbee63dcf4033d2e2b85ee616b22ea5c61fd2d9e3ad97a74bc94ee8a4f25758c2149f89ea872811f3a64a02657e06320b6d5155e1e55934bfe28ca3f7afe +SHA512 (glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3.tar.gz) = 07f0f038e62f2b145fc6c39f604cb5208d4e46c7c770d0ae69e816dfc5cbc4de62cee7cccf0eb2c4241cb375d1618f8952d9d29b946f1f4ca5435d7061a2afcd