import glslang-11.9.0-1.20220202.git2742e95.el9

2022-04-05 06:11:25 -04:00 · 2022-04-05 06:11:25 -04:00 · 803ac59409
commit 803ac59409
parent ed65c127d8
5 changed files with 48 additions and 45 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/glslang-ae2a562936cc8504c9ef2757cceaff163147834f.tar.gz
+SOURCES/glslang-2742e959347ae2fac58acd0d022c92a0ff1f24bf.tar.gz
--- a/.glslang.metadata
+++ b/.glslang.metadata
@ -1 +1 @@
-7f29b659f2e00fa0ade7d98d1683f3dd447fdc89 SOURCES/glslang-ae2a562936cc8504c9ef2757cceaff163147834f.tar.gz
+53d23bfd3b5684b0736342d06d8bbb0b23f5c2e5 SOURCES/glslang-2742e959347ae2fac58acd0d022c92a0ff1f24bf.tar.gz
--- a/SOURCES/0001-pkg-config-compatibility.patch
+++ b/SOURCES/0001-pkg-config-compatibility.patch
@ -1,8 +1,8 @@
-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)
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/CMakeLists.txt	2021-11-23 17:40:46.511754273 +1000
+@@ -121,6 +121,13 @@ if(USE_CCACHE)
+     endif()
 endif()
 
 +# using pkg-config to configure include paths and link libraries
@ -15,7 +15,7 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma gls
 if(ENABLE_CTEST)
     include(CTest)
 endif()
-@@ -320,11 +327,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
+@@ -307,11 +314,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
     add_subdirectory(External)
 endif()
 
@ -28,9 +28,9 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma gls
     message(STATUS "optimizer enabled")
     add_definitions(-DENABLE_OPT=1)
 else()
-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
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/External/CMakeLists.txt	2021-11-23 17:40:46.512754300 +1000
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
     endif()
 endif()
@ -42,10 +42,10 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.tx
 -    endif()
 -endif()
 -
-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)
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/CMakeLists.txt	2021-11-23 17:40:46.513754326 +1000
+@@ -211,6 +211,8 @@ if(ENABLE_GLSLANG_INSTALL)
                 EXPORT  glslangTargets
                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
@ -54,9 +54,9 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt
 
     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
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in.dma	2021-11-23 17:40:46.513754326 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/glslang/glslang.pc.cmake.in	2021-11-23 17:40:46.513754326 +1000
@@ -0,0 +1,11 @@
 +    prefix=@CMAKE_INSTALL_PREFIX@
 +    exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -70,9 +70,9 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cma
 +    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
 +    Cflags: -I${includedir}
 \ No newline at end of file
-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
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt.dma	2021-11-13 00:42:16.000000000 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/CMakeLists.txt	2021-11-23 17:40:46.514754353 +1000
@@ -77,6 +77,10 @@ target_include_directories(SPIRV PUBLIC
 
 glslang_add_build_info_dependency(SPIRV)
@ -109,7 +109,7 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.d
 +    target_link_libraries(SPIRV glslang)
 else()
     target_link_libraries(SPIRV PRIVATE MachineIndependent)
- endif(ENABLE_OPT)
+ endif()
@@ -133,6 +143,9 @@ if(ENABLE_GLSLANG_INSTALL)
     endif()
 
@ -119,10 +119,10 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.d
 +    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
-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
+ endif()
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in.dma	2021-11-23 17:40:46.514754353 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/spirv.pc.cmake.in	2021-11-23 17:40:46.514754353 +1000
@@ -0,0 +1,11 @@
 +    prefix=@CMAKE_INSTALL_PREFIX@
 +    exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -136,9 +136,9 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.i
 +    Libs: -L${libdir} -lSPIRV
 +    Cflags: -I${includedir}
 \ No newline at end of file
-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
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp.dma	2021-11-13 00:42:16.000000000 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/SPIRV/SpvTools.cpp	2021-11-23 17:40:46.515754380 +1000
@@ -43,7 +43,7 @@
 #include <iostream>
 
@ -148,10 +148,10 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma
 
 namespace glslang {
 
-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)
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma	2021-11-23 17:40:36.884497081 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt	2021-11-23 17:40:46.515754380 +1000
+@@ -72,6 +72,14 @@ if(ENABLE_SPVREMAPPER)
     set(LIBRARIES ${LIBRARIES} SPVRemapper)
 endif()
 
@ -166,8 +166,8 @@ diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.
 if(WIN32)
     set(LIBRARIES ${LIBRARIES} psapi)
 elseif(UNIX)
-@@ -65,9 +73,6 @@ elseif(UNIX)
- endif(WIN32)
+@@ -81,9 +89,6 @@ elseif(UNIX)
+ endif()
 
 target_link_libraries(glslangValidator ${LIBRARIES})
 -target_include_directories(glslangValidator PUBLIC
--- a/SOURCES/glslang-default-resource-limits_staticlib.patch
+++ b/SOURCES/glslang-default-resource-limits_staticlib.patch
@ -1,9 +1,9 @@
-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.
+diff -up glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt
+--- glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt.dma	2021-11-23 17:38:10.022569320 +1000
+++ glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5/StandAlone/CMakeLists.txt	2021-11-23 17:38:19.087812070 +1000
+@@ -47,7 +47,7 @@ add_custom_command(
+ 
+ #add_custom_target(glslangValidator DEPENDS ${GLSLANG_INTRINSIC_H})
 
 -add_library(glslang-default-resource-limits
 +add_library(glslang-default-resource-limits STATIC
--- a/SPECS/glslang.spec
+++ b/SPECS/glslang.spec
@ -1,11 +1,11 @@
-%global commit ae2a562936cc8504c9ef2757cceaff163147834f
+%global commit 2742e959347ae2fac58acd0d022c92a0ff1f24bf
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20210623
+%global commit_date 20220202
 %global gitrel .%{commit_date}.git%{shortcommit}

 Name:           glslang
-Version:        11.5.0
-Release:        2%{?gitrel}%{?dist}
+Version:        11.9.0
+Release:        1%{?gitrel}%{?dist}
 Summary:        OpenGL and OpenGL ES shader front end and validator

 License:        BSD and GPLv3+ and ASL 2.0
@ -81,6 +81,9 @@ install -pm 0644 %{_vpath_builddir}/StandAlone/libglslang-default-resource-limit
 %{_libdir}/cmake/*

 %changelog
+* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-1.20220202.git2742e95
+- Latest snapshot used in 1.3.204 sdk
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.5.0-2.20210623.gitae2a562
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
  Related: rhbz#1991688