diff --git a/.gitignore b/.gitignore index 8170a0a..95de845 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glslang-sdk-1.3.250.1.tar.gz +SOURCES/glslang-sdk-1.3.268.0.tar.gz diff --git a/.glslang.metadata b/.glslang.metadata index 0d52b91..9fe9877 100644 --- a/.glslang.metadata +++ b/.glslang.metadata @@ -1 +1 @@ -bdfbf90e9aeebfd61cbd6a1e0320fadbe43e08ec SOURCES/glslang-sdk-1.3.250.1.tar.gz +0bd4ea342d0dec026c42499c224bfc4264e094db SOURCES/glslang-sdk-1.3.268.0.tar.gz diff --git a/SOURCES/0001-pkg-config-compatibility.patch b/SOURCES/0001-pkg-config-compatibility.patch index d3a10dd..c8a9742 100644 --- a/SOURCES/0001-pkg-config-compatibility.patch +++ b/SOURCES/0001-pkg-config-compatibility.patch @@ -1,7 +1,7 @@ -diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLists.txt ---- glslang-sdk-1.3.250.1/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 -+++ glslang-sdk-1.3.250.1/CMakeLists.txt 2023-07-07 09:26:10.171395413 +1000 -@@ -104,6 +104,13 @@ else() +diff -up glslang-sdk-1.3.268.0/CMakeLists.txt.dma glslang-sdk-1.3.268.0/CMakeLists.txt +--- glslang-sdk-1.3.268.0/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.268.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 +@@ -92,6 +92,13 @@ else() endif() option(ENABLE_CTEST "Enables testing" ON) @@ -15,12 +15,28 @@ diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLis if(ENABLE_CTEST) include(CTest) endif() -@@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA +@@ -263,27 +270,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) add_subdirectory(External) endif() +-option(ALLOW_EXTERNAL_SPIRV_TOOLS "Allows to build against installed SPIRV-Tools-opt" OFF) -if(NOT TARGET SPIRV-Tools-opt) -- set(ENABLE_OPT OFF) +- if(ALLOW_EXTERNAL_SPIRV_TOOLS) +- # Look for external SPIR-V Tools build, if not building in-tree +- message(STATUS "Trying to find local SPIR-V tools") +- find_package(SPIRV-Tools-opt) +- if(NOT TARGET SPIRV-Tools-opt) +- if(ENABLE_OPT) +- message(WARNING "ENABLE_OPT set but SPIR-V tools not found! Disabling SPIR-V optimization.") +- endif() +- set(ENABLE_OPT OFF) +- endif() +- else() +- if(ENABLE_OPT) +- message(SEND_ERROR "ENABLE_OPT set but SPIR-V tools not found. Please run update_glslang_sources.py, " +- "set the ALLOW_EXTERNAL_SPIRV_TOOLS option to use a local install of SPIRV-Tools, or set ENABLE_OPT=0.") +- endif() +- endif() -endif() - -if(ENABLE_OPT) @@ -28,9 +44,9 @@ diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLis message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -diff -up glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma glslang-sdk-1.3.250.1/External/CMakeLists.txt ---- glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 -+++ glslang-sdk-1.3.250.1/External/CMakeLists.txt 2023-07-07 09:26:10.172395432 +1000 +diff -up glslang-sdk-1.3.268.0/External/CMakeLists.txt.dma glslang-sdk-1.3.268.0/External/CMakeLists.txt +--- glslang-sdk-1.3.268.0/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.268.0/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000 @@ -68,10 +68,3 @@ if(BUILD_TESTING) endif() endif() @@ -42,10 +58,10 @@ diff -up glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma glslang-sdk-1.3.250.1 - endif() -endif() - -diff -up glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.250.1/glslang/CMakeLists.txt ---- glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 -+++ glslang-sdk-1.3.250.1/glslang/CMakeLists.txt 2023-07-07 09:26:10.173395450 +1000 -@@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL) +diff -up glslang-sdk-1.3.268.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.268.0/glslang/CMakeLists.txt +--- glslang-sdk-1.3.268.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.268.0/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 +70,9 @@ diff -up glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.250.1/ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() -diff -up glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in ---- glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in.dma 2023-07-07 09:26:10.174395469 +1000 -+++ glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in 2023-07-07 09:26:10.174395469 +1000 +diff -up glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in +--- glslang-sdk-1.3.268.0/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000 ++++ glslang-sdk-1.3.268.0/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,9 +86,9 @@ diff -up glslang-sdk-1.3.250.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.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt ---- glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 -+++ glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt 2023-07-07 09:26:10.176395507 +1000 +diff -up glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt +--- glslang-sdk-1.3.268.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.268.0/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) @@ -121,9 +137,9 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SP + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif() -diff -up glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in ---- glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma 2023-07-07 09:26:10.177395526 +1000 -+++ glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in 2023-07-07 09:26:10.177395526 +1000 +diff -up glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in +--- glslang-sdk-1.3.268.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000 ++++ glslang-sdk-1.3.268.0/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 +153,9 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.1 + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp ---- glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma 2023-06-28 03:49:14.000000000 +1000 -+++ glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp 2023-07-07 09:26:10.178395545 +1000 +diff -up glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp +--- glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.268.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000 @@ -43,7 +43,7 @@ #include @@ -149,31 +165,31 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1/SPIR namespace glslang { -diff -up glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt ---- glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 -+++ glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt 2023-07-07 09:26:10.179395564 +1000 -@@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER) - set(LIBRARIES ${LIBRARIES} SPVRemapper) - endif() +diff -up glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt +--- glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000 ++++ glslang-sdk-1.3.268.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000 +@@ -63,6 +63,14 @@ set(LIBRARIES + SPIRV + glslang-default-resource-limits) +if(BUILD_SHARED_LIBS) + set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) -+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) ++ target_include_directories(glslang-standalone PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) +else() + set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES}) -+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) ++ target_include_directories(glslang-standalone PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) +endif(BUILD_SHARED_LIBS) + if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -71,9 +79,6 @@ elseif(UNIX) +@@ -72,9 +80,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/SPECS/glslang.spec b/SPECS/glslang.spec index 47251a7..5552789 100644 --- a/SPECS/glslang.spec +++ b/SPECS/glslang.spec @@ -1,13 +1,13 @@ -%global sdkver 1.3.250.1 +%global sdkver 1.3.268.0 Name: glslang -Version: 11.9.0 -Release: 5%{?dist} +Version: 13.1.1 +Release: 1%{?dist} Summary: OpenGL and OpenGL ES shader front end and validator License: BSD and GPLv3+ and ASL 2.0 URL: https://github.com/KhronosGroup/%{name} -Source0: %url/archive/sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz +Source0: %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz # 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 @@ -32,7 +32,7 @@ ES and OpenGL shading languages. It implements a strict interpretation of the specifications for these languages. %prep -%autosetup -p1 -n %{name}-sdk-%{sdkver} +%autosetup -p1 -n %{name}-vulkan-sdk-%{sdkver} # Fix rpmlint warning on debuginfo find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x @@ -55,6 +55,7 @@ popd %files %doc README.md README-spirv-remap.txt +%{_bindir}/glslang %{_bindir}/glslangValidator %{_bindir}/spirv-remap @@ -74,6 +75,9 @@ popd %{_libdir}/cmake/* %changelog +* Wed Jan 17 2024 José Expósito - 13.1.1-1 +- Update to 1.3.268.0 SDK + * Fri Jul 07 2023 Dave Airlie - 11.9.0-5 - Latest snapshot used in 1.3.250.1 sdk