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

update to 1.3.243.0 sdk

This commit is contained in:
Dave Airlie 2023-04-24 09:46:02 +10:00
parent 81c7f69499
commit bde19dc2a2
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
diff -up glslang-sdk-1.3.231.1/CMakeLists.txt.dma glslang-sdk-1.3.231.1/CMakeLists.txt
--- glslang-sdk-1.3.231.1/CMakeLists.txt.dma 2022-10-14 03:29:59.000000000 +1000
+++ glslang-sdk-1.3.231.1/CMakeLists.txt 2022-11-09 14:47:04.538772188 +1000
@@ -129,6 +129,13 @@ if(USE_CCACHE)
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()
endif()
@ -15,7 +15,7 @@ diff -up glslang-sdk-1.3.231.1/CMakeLists.txt.dma glslang-sdk-1.3.231.1/CMakeLis
if(ENABLE_CTEST)
include(CTest)
endif()
@@ -319,11 +326,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
@@ -303,11 +310,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
add_subdirectory(External)
endif()
@ -28,9 +28,9 @@ diff -up glslang-sdk-1.3.231.1/CMakeLists.txt.dma glslang-sdk-1.3.231.1/CMakeLis
message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1)
else()
diff -up glslang-sdk-1.3.231.1/External/CMakeLists.txt.dma glslang-sdk-1.3.231.1/External/CMakeLists.txt
--- glslang-sdk-1.3.231.1/External/CMakeLists.txt.dma 2022-10-14 03:29:59.000000000 +1000
+++ glslang-sdk-1.3.231.1/External/CMakeLists.txt 2022-11-09 14:47:04.539772205 +1000
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
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
endif()
endif()
@ -42,10 +42,10 @@ diff -up glslang-sdk-1.3.231.1/External/CMakeLists.txt.dma glslang-sdk-1.3.231.1
- endif()
-endif()
-
diff -up glslang-sdk-1.3.231.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.231.1/glslang/CMakeLists.txt
--- glslang-sdk-1.3.231.1/glslang/CMakeLists.txt.dma 2022-11-09 14:47:04.540772224 +1000
+++ glslang-sdk-1.3.231.1/glslang/CMakeLists.txt 2022-11-09 14:48:06.844895906 +1000
@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL)
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
@@ -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.231.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.231.1/
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif()
diff -up glslang-sdk-1.3.231.1/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.231.1/glslang/glslang.pc.cmake.in
--- glslang-sdk-1.3.231.1/glslang/glslang.pc.cmake.in.dma 2022-11-09 14:47:04.541772242 +1000
+++ glslang-sdk-1.3.231.1/glslang/glslang.pc.cmake.in 2022-11-09 14:47:04.541772242 +1000
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
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -70,10 +70,10 @@ diff -up glslang-sdk-1.3.231.1/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.231.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt
--- glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt.dma 2022-10-14 03:29:59.000000000 +1000
+++ glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt 2022-11-09 14:47:04.542772260 +1000
@@ -78,6 +78,10 @@ target_include_directories(SPIRV PUBLIC
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
@@ -80,6 +80,10 @@ target_include_directories(SPIRV PUBLIC
glslang_add_build_info_dependency(SPIRV)
@ -83,8 +83,8 @@ diff -up glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.231.1/SP
+
if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
@@ -91,15 +95,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}")
@@ -94,15 +98,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif()
endif()
@ -110,7 +110,7 @@ diff -up glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.231.1/SP
else()
target_link_libraries(SPIRV PRIVATE MachineIndependent)
endif()
@@ -140,6 +150,9 @@ if(ENABLE_GLSLANG_INSTALL)
@@ -143,6 +153,9 @@ if(ENABLE_GLSLANG_INSTALL)
add_library(SPIRV ALIAS glslang::SPIRV)
")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
@ -121,9 +121,9 @@ diff -up glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.231.1/SP
+
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif()
diff -up glslang-sdk-1.3.231.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.231.1/SPIRV/spirv.pc.cmake.in
--- glslang-sdk-1.3.231.1/SPIRV/spirv.pc.cmake.in.dma 2022-11-09 14:47:04.543772278 +1000
+++ glslang-sdk-1.3.231.1/SPIRV/spirv.pc.cmake.in 2022-11-09 14:47:04.543772278 +1000
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
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -137,9 +137,9 @@ diff -up glslang-sdk-1.3.231.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.231.1
+ Libs: -L${libdir} -lSPIRV
+ Cflags: -I${includedir}
\ No newline at end of file
diff -up glslang-sdk-1.3.231.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.231.1/SPIRV/SpvTools.cpp
--- glslang-sdk-1.3.231.1/SPIRV/SpvTools.cpp.dma 2022-10-14 03:29:59.000000000 +1000
+++ glslang-sdk-1.3.231.1/SPIRV/SpvTools.cpp 2022-11-09 14:47:04.544772296 +1000
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
@@ -43,7 +43,7 @@
#include <iostream>
@ -149,10 +149,10 @@ diff -up glslang-sdk-1.3.231.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.231.1/SPIR
namespace glslang {
diff -up glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt
--- glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt.dma 2022-11-09 14:46:48.996491875 +1000
+++ glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt 2022-11-09 14:47:04.545772314 +1000
@@ -72,6 +72,14 @@ if(ENABLE_SPVREMAPPER)
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
@@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER)
set(LIBRARIES ${LIBRARIES} SPVRemapper)
endif()
@ -167,7 +167,7 @@ diff -up glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.231
if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi)
elseif(UNIX)
@@ -81,9 +89,6 @@ elseif(UNIX)
@@ -71,9 +79,6 @@ elseif(UNIX)
endif()
target_link_libraries(glslangValidator ${LIBRARIES})

22
glslang-default-resource-limits_staticlib.patch
View File

@ -1,12 +1,12 @@
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(
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-20 17:33:10.410926416 +1000
+++ glslang-sdk-1.3.243.0/glslang/CMakeLists.txt 2023-03-22 08:20:54.000000000 +1000
@@ -196,7 +196,7 @@ set(RESOURCELIMITS_HEADERS
Public/resource_limits_c.h
)
#add_custom_target(glslangValidator DEPENDS ${GLSLANG_INTRINSIC_H})
-add_library(glslang-default-resource-limits
+add_library(glslang-default-resource-limits STATIC
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp)
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
-add_library(glslang-default-resource-limits ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS})
+add_library(glslang-default-resource-limits STATIC ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS})
set_target_properties(glslang-default-resource-limits PROPERTIES
VERSION "${GLSLANG_VERSION}"
SOVERSION "${GLSLANG_VERSION_MAJOR}"

2
glslang.spec
View File

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

2
sources
View File

@ -1 +1 @@
SHA512 (glslang-sdk-1.3.239.0.tar.gz) = 2502ddc48aea333d2406f4b225a74f15adb429633b4deb701737440e01e134a5eda98933156b2821ad1fa48d83f259e36061390600d6c5c9bb2edf8c18287d2b
SHA512 (glslang-sdk-1.3.243.0.tar.gz) = 0febe5d4187970ebea3e28a323bc85da2ad24feee12390410fe817b363847409f00c1b7e8d4e88156443929eb9a616e6064bf73aa5f8914e71c01d985d6fc15c