rpms
/
glslang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 1.3.250.0 glslang

This commit is contained in:
Dave Airlie 2023-06-20 14:18:19 +10:00
parent adb4a641b5
commit 5d2128b4da
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-pkg-config-compatibility.patch
View File

@ -1,9 +1,9 @@
diff -up glslang-sdk-1.3.243.0/CMakeLists.txt.dma glslang-sdk-1.3.243.0/CMakeLists.txt
--- glslang-sdk-1.3.243.0/CMakeLists.txt.dma 2023-03-22 08:20:54.000000000 +1000
+++ glslang-sdk-1.3.243.0/CMakeLists.txt 2023-04-24 09:40:28.414287848 +1000
@@ -119,6 +119,13 @@ if(USE_CCACHE)
endif()
diff -up glslang-sdk-1.3.250.0/CMakeLists.txt.dma glslang-sdk-1.3.250.0/CMakeLists.txt
--- glslang-sdk-1.3.250.0/CMakeLists.txt.dma 2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/CMakeLists.txt 2023-06-20 14:19:40.290695726 +1000
@@ -104,6 +104,13 @@ else()
endif()
option(ENABLE_CTEST "Enables testing" ON)
+# using pkg-config to configure include paths and link libraries
+include(FindPkgConfig)
@ -15,7 +15,7 @@ diff -up glslang-sdk-1.3.243.0/CMakeLists.txt.dma glslang-sdk-1.3.243.0/CMakeLis
if(ENABLE_CTEST)
include(CTest)
endif()
@@ -303,11 +310,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
@@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
add_subdirectory(External)
endif()
@ -28,9 +28,9 @@ diff -up glslang-sdk-1.3.243.0/CMakeLists.txt.dma glslang-sdk-1.3.243.0/CMakeLis
message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1)
else()
diff -up glslang-sdk-1.3.243.0/External/CMakeLists.txt.dma glslang-sdk-1.3.243.0/External/CMakeLists.txt
--- glslang-sdk-1.3.243.0/External/CMakeLists.txt.dma 2023-03-22 08:20:54.000000000 +1000
+++ glslang-sdk-1.3.243.0/External/CMakeLists.txt 2023-04-24 09:40:28.416287922 +1000
diff -up glslang-sdk-1.3.250.0/External/CMakeLists.txt.dma glslang-sdk-1.3.250.0/External/CMakeLists.txt
--- glslang-sdk-1.3.250.0/External/CMakeLists.txt.dma 2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/External/CMakeLists.txt 2023-06-20 14:19:40.290695726 +1000
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
endif()
endif()
@ -42,9 +42,9 @@ diff -up glslang-sdk-1.3.243.0/External/CMakeLists.txt.dma glslang-sdk-1.3.243.0
- endif()
-endif()
-
diff -up glslang-sdk-1.3.243.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.243.0/glslang/CMakeLists.txt
--- glslang-sdk-1.3.243.0/glslang/CMakeLists.txt.dma 2023-04-24 09:39:01.976106014 +1000
+++ glslang-sdk-1.3.243.0/glslang/CMakeLists.txt 2023-04-24 09:40:28.425288253 +1000
diff -up glslang-sdk-1.3.250.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.250.0/glslang/CMakeLists.txt
--- glslang-sdk-1.3.250.0/glslang/CMakeLists.txt.dma 2023-06-20 14:19:23.329383926 +1000
+++ glslang-sdk-1.3.250.0/glslang/CMakeLists.txt 2023-06-20 14:19:40.291695745 +1000
@@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL)
add_library(GenericCodeGen ALIAS glslang::GenericCodeGen)
endif()
@ -54,9 +54,9 @@ diff -up glslang-sdk-1.3.243.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.243.0/
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif()
diff -up glslang-sdk-1.3.243.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.243.0/glslang/glslang.pc.cmake.in
--- glslang-sdk-1.3.243.0/glslang/glslang.pc.cmake.in.dma 2023-04-24 09:40:28.426288290 +1000
+++ glslang-sdk-1.3.243.0/glslang/glslang.pc.cmake.in 2023-04-24 09:40:28.426288290 +1000
diff -up glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in
--- glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in.dma 2023-06-20 14:19:40.292695763 +1000
+++ glslang-sdk-1.3.250.0/glslang/glslang.pc.cmake.in 2023-06-20 14:19:40.291695745 +1000
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -70,9 +70,9 @@ diff -up glslang-sdk-1.3.243.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.2
+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
+ Cflags: -I${includedir}
\ No newline at end of file
diff -up glslang-sdk-1.3.243.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.243.0/SPIRV/CMakeLists.txt
--- glslang-sdk-1.3.243.0/SPIRV/CMakeLists.txt.dma 2023-03-22 08:20:54.000000000 +1000
+++ glslang-sdk-1.3.243.0/SPIRV/CMakeLists.txt 2023-04-24 09:40:28.427288327 +1000
diff -up glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt
--- glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt.dma 2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt 2023-06-20 14:19:40.292695763 +1000
@@ -80,6 +80,10 @@ target_include_directories(SPIRV PUBLIC
glslang_add_build_info_dependency(SPIRV)
@ -121,9 +121,9 @@ diff -up glslang-sdk-1.3.243.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.243.0/SP
+
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif()
diff -up glslang-sdk-1.3.243.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.243.0/SPIRV/spirv.pc.cmake.in
--- glslang-sdk-1.3.243.0/SPIRV/spirv.pc.cmake.in.dma 2023-04-24 09:40:28.428288363 +1000
+++ glslang-sdk-1.3.243.0/SPIRV/spirv.pc.cmake.in 2023-04-24 09:40:28.428288363 +1000
diff -up glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in
--- glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in.dma 2023-06-20 14:19:40.293695781 +1000
+++ glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in 2023-06-20 14:19:40.293695781 +1000
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -137,9 +137,9 @@ diff -up glslang-sdk-1.3.243.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.243.0
+ Libs: -L${libdir} -lSPIRV
+ Cflags: -I${includedir}
\ No newline at end of file
diff -up glslang-sdk-1.3.243.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.243.0/SPIRV/SpvTools.cpp
--- glslang-sdk-1.3.243.0/SPIRV/SpvTools.cpp.dma 2023-03-22 08:20:54.000000000 +1000
+++ glslang-sdk-1.3.243.0/SPIRV/SpvTools.cpp 2023-04-24 09:40:28.429288400 +1000
diff -up glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp
--- glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp.dma 2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp 2023-06-20 14:19:40.293695781 +1000
@@ -43,7 +43,7 @@
#include <iostream>
@ -149,9 +149,9 @@ diff -up glslang-sdk-1.3.243.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.243.0/SPIR
namespace glslang {
diff -up glslang-sdk-1.3.243.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.243.0/StandAlone/CMakeLists.txt
--- glslang-sdk-1.3.243.0/StandAlone/CMakeLists.txt.dma 2023-03-22 08:20:54.000000000 +1000
+++ glslang-sdk-1.3.243.0/StandAlone/CMakeLists.txt 2023-04-24 09:40:28.430288437 +1000
diff -up glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt
--- glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt.dma 2023-05-18 06:47:56.000000000 +1000
+++ glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt 2023-06-20 14:19:40.294695800 +1000
@@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER)
set(LIBRARIES ${LIBRARIES} SPVRemapper)
endif()

2
glslang.spec
View File

@ -1,4 +1,4 @@
%global sdkver 1.3.243.0
%global sdkver 1.3.250.0
Name: glslang
Version: 11.9.0

2
sources
View File

@ -1 +1 @@
SHA512 (glslang-sdk-1.3.243.0.tar.gz) = 0febe5d4187970ebea3e28a323bc85da2ad24feee12390410fe817b363847409f00c1b7e8d4e88156443929eb9a616e6064bf73aa5f8914e71c01d985d6fc15c
SHA512 (glslang-sdk-1.3.250.0.tar.gz) = deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c