From e3006ef1ae77a55ba06913eadcb8ccc10c2260e0 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 5 Sep 2023 13:23:46 +1000 Subject: [PATCH] update to 1.3.261.1 sdk --- 0001-pkg-config-compatibility.patch | 68 +++++++++---------- ...ng-default-resource-limits_staticlib.patch | 12 ---- glslang.spec | 3 +- sources | 2 +- 4 files changed, 36 insertions(+), 49 deletions(-) delete mode 100644 glslang-default-resource-limits_staticlib.patch diff --git a/0001-pkg-config-compatibility.patch b/0001-pkg-config-compatibility.patch index cc11dc4..b9dbbf6 100644 --- a/0001-pkg-config-compatibility.patch +++ b/0001-pkg-config-compatibility.patch @@ -1,7 +1,7 @@ -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() +diff -up glslang-sdk-1.3.261.1/CMakeLists.txt.dma glslang-sdk-1.3.261.1/CMakeLists.txt +--- glslang-sdk-1.3.261.1/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.261.1/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 +@@ -92,6 +92,13 @@ else() endif() option(ENABLE_CTEST "Enables testing" ON) @@ -15,7 +15,7 @@ diff -up glslang-sdk-1.3.250.0/CMakeLists.txt.dma glslang-sdk-1.3.250.0/CMakeLis if(ENABLE_CTEST) include(CTest) endif() -@@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA +@@ -264,11 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA add_subdirectory(External) endif() @@ -28,9 +28,9 @@ diff -up glslang-sdk-1.3.250.0/CMakeLists.txt.dma glslang-sdk-1.3.250.0/CMakeLis message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -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 +diff -up glslang-sdk-1.3.261.1/External/CMakeLists.txt.dma glslang-sdk-1.3.261.1/External/CMakeLists.txt +--- glslang-sdk-1.3.261.1/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.261.1/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 @@ -68,10 +68,3 @@ if(BUILD_TESTING) endif() endif() @@ -42,10 +42,10 @@ diff -up glslang-sdk-1.3.250.0/External/CMakeLists.txt.dma glslang-sdk-1.3.250.0 - endif() -endif() - -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) +diff -up glslang-sdk-1.3.261.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.261.1/glslang/CMakeLists.txt +--- glslang-sdk-1.3.261.1/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.261.1/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000 +@@ -244,6 +244,8 @@ if(ENABLE_GLSLANG_INSTALL) add_library(GenericCodeGen ALIAS glslang::GenericCodeGen) endif() ") @@ -54,9 +54,9 @@ diff -up glslang-sdk-1.3.250.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.250.0/ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() -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 +diff -up glslang-sdk-1.3.261.1/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.261.1/glslang/glslang.pc.cmake.in +--- glslang-sdk-1.3.261.1/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000 ++++ glslang-sdk-1.3.261.1/glslang/glslang.pc.cmake.in 2023-09-05 13:21:45.115297852 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -70,10 +70,10 @@ diff -up glslang-sdk-1.3.250.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.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 +diff -up glslang-sdk-1.3.261.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.261.1/SPIRV/CMakeLists.txt +--- glslang-sdk-1.3.261.1/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.261.1/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000 +@@ -82,6 +82,10 @@ target_include_directories(SPIRV PUBLIC glslang_add_build_info_dependency(SPIRV) @@ -83,8 +83,8 @@ diff -up glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.0/SP + if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) - set_target_properties(SPVRemapper PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") -@@ -94,15 +98,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) + set_target_properties(SPVRemapper PROPERTIES +@@ -98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) endif() endif() @@ -110,7 +110,7 @@ diff -up glslang-sdk-1.3.250.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.0/SP else() target_link_libraries(SPIRV PRIVATE MachineIndependent) endif() -@@ -143,6 +153,9 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -147,6 +157,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.250.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.0/SP + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif() -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 +diff -up glslang-sdk-1.3.261.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.261.1/SPIRV/spirv.pc.cmake.in +--- glslang-sdk-1.3.261.1/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000 ++++ glslang-sdk-1.3.261.1/SPIRV/spirv.pc.cmake.in 2023-09-05 13:21:45.116297879 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -137,9 +137,9 @@ diff -up glslang-sdk-1.3.250.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.0 + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -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 +diff -up glslang-sdk-1.3.261.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.261.1/SPIRV/SpvTools.cpp +--- glslang-sdk-1.3.261.1/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.261.1/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000 @@ -43,7 +43,7 @@ #include @@ -149,9 +149,9 @@ diff -up glslang-sdk-1.3.250.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.0/SPIR namespace glslang { -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 +diff -up glslang-sdk-1.3.261.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.261.1/StandAlone/CMakeLists.txt +--- glslang-sdk-1.3.261.1/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.261.1/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000 @@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER) set(LIBRARIES ${LIBRARIES} SPVRemapper) endif() @@ -170,10 +170,10 @@ diff -up glslang-sdk-1.3.250.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250 @@ -71,9 +79,6 @@ elseif(UNIX) endif() - target_link_libraries(glslangValidator ${LIBRARIES}) --target_include_directories(glslangValidator PUBLIC + target_link_libraries(glslang-standalone ${LIBRARIES}) +-target_include_directories(glslang-standalone PUBLIC - $ - $) if(ENABLE_OPT) - target_include_directories(glslangValidator + target_include_directories(glslang-standalone diff --git a/glslang-default-resource-limits_staticlib.patch b/glslang-default-resource-limits_staticlib.patch deleted file mode 100644 index 6e2fc69..0000000 --- a/glslang-default-resource-limits_staticlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -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_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}" diff --git a/glslang.spec b/glslang.spec index a97cec4..4ab2825 100644 --- a/glslang.spec +++ b/glslang.spec @@ -1,4 +1,4 @@ -%global sdkver 1.3.250.0 +%global sdkver 1.3.261.1 Name: glslang Version: 11.9.0 @@ -8,7 +8,6 @@ Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and Apache-2.0 URL: https://github.com/KhronosGroup/%{name} Source0: %url/archive/sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz -Patch1: glslang-default-resource-limits_staticlib.patch # Patch to build against system spirv-tools (rebased locally) #Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch Patch3: 0001-pkg-config-compatibility.patch diff --git a/sources b/sources index 04a1d2c..7c44a56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glslang-sdk-1.3.250.0.tar.gz) = deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c +SHA512 (glslang-sdk-1.3.261.1.tar.gz) = 13838ce67f151dbb27cc6809e5fcac0e4f728ac301a5cb3c624b1491180040f16487271a8e02aaf87159a8d337121af346a3d5bdc5f81e5db49a30088dd8c255