diff --git a/.gitignore b/.gitignore index 2a4298b..9442b32 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3.tar.gz +SOURCES/glslang-ae2a562936cc8504c9ef2757cceaff163147834f.tar.gz diff --git a/.glslang.metadata b/.glslang.metadata index a58de4a..046c741 100644 --- a/.glslang.metadata +++ b/.glslang.metadata @@ -1 +1 @@ -9263f19a98515db7596e00a53e2cf436984214e4 SOURCES/glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3.tar.gz +7f29b659f2e00fa0ade7d98d1683f3dd447fdc89 SOURCES/glslang-ae2a562936cc8504c9ef2757cceaff163147834f.tar.gz diff --git a/SOURCES/0001-pkg-config-compatibility.patch b/SOURCES/0001-pkg-config-compatibility.patch index 87433b6..e09de4c 100644 --- a/SOURCES/0001-pkg-config-compatibility.patch +++ b/SOURCES/0001-pkg-config-compatibility.patch @@ -1,9 +1,9 @@ -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 12:26:12.717875341 +1000 -@@ -87,6 +87,13 @@ endmacro(glslang_pch) - - project(glslang) +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000 +@@ -118,6 +118,13 @@ if(USE_CCACHE) + endif(CCACHE_FOUND) + endif() +# using pkg-config to configure include paths and link libraries +include(FindPkgConfig) @@ -15,8 +15,8 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma gls if(ENABLE_CTEST) include(CTest) endif() -@@ -178,11 +185,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA - add_subdirectory(External) +@@ -320,11 +327,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA + add_subdirectory(External) endif() -if(NOT TARGET SPIRV-Tools-opt) @@ -28,10 +28,10 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma gls message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -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 12:26:12.718875368 +1000 -@@ -35,10 +35,3 @@ if(BUILD_TESTING) +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000 +@@ -68,10 +68,3 @@ if(BUILD_TESTING) endif() endif() @@ -42,29 +42,21 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.tx - endif() -endif() - -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 12:26:38.647579382 +1000 -@@ -80,6 +80,7 @@ set(HEADERS - MachineIndependent/preprocessor/PpContext.h - MachineIndependent/preprocessor/PpTokens.h) - -+set(VERSION 7.11.3113) - glslang_pch(SOURCES MachineIndependent/pch.cpp) - - add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -@@ -116,6 +117,8 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslangTargets +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000 +@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) + EXPORT glslangTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() + 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) -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 12:26:12.718875368 +1000 -+++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in 2020-04-22 12:26:12.718875368 +1000 + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma 2020-11-04 06:32:09.031326265 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in 2020-11-04 06:32:09.031326265 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -78,12 +70,12 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cma + Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper + Cflags: -I${includedir} \ No newline at end of file -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 12:26:12.719875396 +1000 -@@ -41,6 +41,10 @@ target_include_directories(SPIRV PUBLIC - $ - $) +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000 +@@ -77,6 +77,10 @@ target_include_directories(SPIRV PUBLIC + + glslang_add_build_info_dependency(SPIRV) + +set(SPIRV_NAME spirv) @@ -92,7 +84,7 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.d if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) -@@ -54,15 +58,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) +@@ -90,15 +94,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) endif() endif() @@ -104,33 +96,33 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.d + target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER}) + target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES}) +endif(BUILD_SHARED_LIBS) -+ ++ if(ENABLE_OPT) target_include_directories(SPIRV PRIVATE ${spirv-tools_SOURCE_DIR}/include PRIVATE ${spirv-tools_SOURCE_DIR}/source ) -- target_link_libraries(SPIRV glslang SPIRV-Tools-opt) +- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC -- $ -- $) +- $ +- $) + target_link_libraries(SPIRV glslang) else() - target_link_libraries(SPIRV glslang) + target_link_libraries(SPIRV PRIVATE MachineIndependent) endif(ENABLE_OPT) -@@ -98,6 +108,9 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -133,6 +143,9 @@ if(ENABLE_GLSLANG_INSTALL) + endif() 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 ${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-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 12:26:12.719875396 +1000 -+++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in 2020-04-22 12:26:12.719875396 +1000 +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma 2020-11-04 06:32:09.032326292 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in 2020-11-04 06:32:09.031326265 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -144,24 +136,22 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.i + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -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 12:26:12.719875396 +1000 -@@ -43,8 +43,8 @@ +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma 2020-11-04 06:32:09.032326292 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp 2020-11-04 06:33:06.481878394 +1000 +@@ -43,7 +43,7 @@ #include #include "SpvTools.h" -#include "spirv-tools/optimizer.hpp" --#include "spirv-tools/libspirv.h" +#include -+#include namespace glslang { -diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt ---- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma 2020-04-22 12:26:04.596654834 +1000 -+++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt 2020-04-22 12:26:12.719875396 +1000 -@@ -24,6 +24,14 @@ if(ENABLE_SPVREMAPPER) +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma 2020-11-04 06:31:49.139788864 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt 2020-11-04 06:32:09.032326292 +1000 +@@ -56,6 +56,14 @@ if(ENABLE_SPVREMAPPER) set(LIBRARIES ${LIBRARIES} SPVRemapper) endif() @@ -176,7 +166,7 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists. if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -33,9 +41,6 @@ elseif(UNIX) +@@ -65,9 +73,6 @@ elseif(UNIX) endif(WIN32) target_link_libraries(glslangValidator ${LIBRARIES}) @@ -184,5 +174,5 @@ diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists. - $ - $) - if(ENABLE_SPVREMAPPER) - set(REMAPPER_SOURCES spirv-remap.cpp) + if(ENABLE_OPT) + target_include_directories(glslangValidator diff --git a/SOURCES/glslang-default-resource-limits_staticlib.patch b/SOURCES/glslang-default-resource-limits_staticlib.patch index c5a0013..9469329 100644 --- a/SOURCES/glslang-default-resource-limits_staticlib.patch +++ b/SOURCES/glslang-default-resource-limits_staticlib.patch @@ -1,7 +1,10 @@ -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 @@ +diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt +--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma 2020-08-04 13:49:34.201893471 +1000 ++++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt 2020-08-04 13:49:40.622063592 +1000 +@@ -31,7 +31,7 @@ + # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + -add_library(glslang-default-resource-limits +add_library(glslang-default-resource-limits STATIC ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp diff --git a/SPECS/glslang.spec b/SPECS/glslang.spec index dc593f7..0d35b1d 100644 --- a/SPECS/glslang.spec +++ b/SPECS/glslang.spec @@ -1,25 +1,25 @@ -%global commit c9b28b9f3388c607ea5506f5e6197b7150238ad3 +%global commit ae2a562936cc8504c9ef2757cceaff163147834f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 2020421 +%global commit_date 20210623 %global gitrel .%{commit_date}.git%{shortcommit} Name: glslang -Version: 8.13.3559 -Release: 2%{?gitrel}%{?dist} +Version: 11.5.0 +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 -# Patch to build against system spirv-tools (rebased locally) +# Patch to build against system spirv-tools #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: cmake BuildRequires: gcc-c++ -BuildRequires: python3 BuildRequires: ninja-build +BuildRequires: python3 BuildRequires: spirv-tools-devel %description @@ -44,7 +44,7 @@ find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x %build %__mkdir_p build pushd build -%cmake3 -DCMAKE_BUILD_TYPE=Release \ +%cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ -DCMAKE_SKIP_RPATH:BOOL=yes \ -DBUILD_SHARED_LIBS=OFF \ @@ -58,6 +58,9 @@ popd # we don't want them in here rm -rf %{buildroot}%{_includedir}/SPIRV +# Install libglslang-default-resource-limits.a +install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/ + %ifnarch s390x ppc64 %check pushd Test @@ -65,9 +68,6 @@ pushd Test popd %endif -# Install libglslang-default-resource-limits.a -install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/ - %files %doc README.md README-spirv-remap.txt %{_bindir}/glslangValidator @@ -78,6 +78,8 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/libHLSL.a %{_libdir}/libOGLCompiler.a %{_libdir}/libOSDependent.a +%{_libdir}/libGenericCodeGen.a +%{_libdir}/libMachineIndependent.a %{_libdir}/libSPIRV.a %{_libdir}/libSPVRemapper.a %{_libdir}/libglslang.a @@ -87,8 +89,14 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro %{_libdir}/cmake/* %changelog -* Wed May 20 2020 Dave Airlie - 8.13.3559-2 -- Update glslang for 8.2.1 +* Thu Jul 08 2021 Dave Airlie - 11.5.0-1 +- Update glslang for 1.2.182.0 SDK + +* Wed Nov 04 2020 Dave Airlie - 11.0.0-3 +- Update glslang for 8.4.0 + +* Wed Aug 05 2020 Dave Airlie - 11.0.0-1 +- Update glslang for 8.3.0 * Wed Jan 29 2020 Dave Airlie - 8.13.3559-1 - Update glslang for 8.2.0 for vulkan 1.2