Import from AlmaLinux stable repository

2024-05-15 07:23:09 +00:00 · 2024-05-15 07:23:09 +00:00 · 31e0fc3289
commit 31e0fc3289
parent 51c6423c17
5 changed files with 72 additions and 65 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/glslang-sdk-1.3.239.0.tar.gz
+SOURCES/glslang-sdk-1.3.268.0.tar.gz
--- a/.glslang.metadata
+++ b/.glslang.metadata
@ -1 +1 @@
-4ab92394dd4785e3a382d3920d4ab9312274189d SOURCES/glslang-sdk-1.3.239.0.tar.gz
+0bd4ea342d0dec026c42499c224bfc4264e094db SOURCES/glslang-sdk-1.3.268.0.tar.gz
--- a/SOURCES/0001-pkg-config-compatibility.patch
+++ b/SOURCES/0001-pkg-config-compatibility.patch
@ -1,9 +1,9 @@
-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)
-     endif()
+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)
 
 +# using pkg-config to configure include paths and link libraries
 +include(FindPkgConfig)
@ -15,12 +15,28 @@ 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
+@@ -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.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.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.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.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.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.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,10 +86,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.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)
 
@ -83,8 +99,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
+@@ -98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
     endif()
 endif()
 
@ -110,7 +126,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)
+@@ -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 +137,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.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.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.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 <iostream>
 
@ -149,31 +165,31 @@ 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)
-     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)
-@@ -81,9 +89,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
 -    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
 -    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
 
 if(ENABLE_OPT)
-     target_include_directories(glslangValidator
+     target_include_directories(glslang-standalone
--- a/SOURCES/glslang-default-resource-limits_staticlib.patch
+++ b/SOURCES/glslang-default-resource-limits_staticlib.patch
@ -1,12 +0,0 @@
-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
-             ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp
-             ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp)
- set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
--- a/SPECS/glslang.spec
+++ b/SPECS/glslang.spec
@ -1,14 +1,13 @@
-%global sdkver 1.3.239.0
+%global sdkver 1.3.268.0

 Name:           glslang
-Version:        11.9.0
-Release:        4%{?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
-Patch1:         glslang-default-resource-limits_staticlib.patch
+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
@ -33,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

@ -44,9 +43,6 @@ find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
 %install
 %{cmake_install}

-# Install libglslang-default-resource-limits.a
-install -pm 0644 %{_vpath_builddir}/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/
-
 # we don't want them in here
 rm -rf %{buildroot}%{_includedir}/SPIRV

@ -59,6 +55,7 @@ popd

 %files
 %doc README.md README-spirv-remap.txt
+%{_bindir}/glslang
 %{_bindir}/glslangValidator
 %{_bindir}/spirv-remap

@ -78,6 +75,12 @@ popd
 %{_libdir}/cmake/*

 %changelog
+* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 13.1.1-1
+- Update to 1.3.268.0 SDK
+
+* Fri Jul 07 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-5
+- Latest snapshot used in 1.3.250.1 sdk
+
 * Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-4
 - Latest snapshot used in 1.3.239 sdk