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

update to 1.3.268.0 SDK

This commit is contained in:
José Expósito 2023-11-02 08:09:09 +01:00
parent 44eaf0c887
commit f237a99002
3 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
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
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.261.1/CMakeLists.txt.dma glslang-sdk-1.3.261.1/CMakeLis
if(ENABLE_CTEST)
include(CTest)
endif()
@@ -264,11 +271,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.261.1/CMakeLists.txt.dma glslang-sdk-1.3.261.1/CMakeLis
message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1)
else()
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
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,9 +58,9 @@ diff -up glslang-sdk-1.3.261.1/External/CMakeLists.txt.dma glslang-sdk-1.3.261.1
- endif()
-endif()
-
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
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.261.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.261.1/
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif()
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
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.261.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.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
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.261.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.261.1/SP
+
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif()
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
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.261.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.261.1
+ Libs: -L${libdir} -lSPIRV
+ Cflags: -I${includedir}
\ No newline at end of file
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
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,12 +165,12 @@ diff -up glslang-sdk-1.3.261.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.261.1/SPIR
namespace glslang {
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()
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})
@ -167,7 +183,7 @@ diff -up glslang-sdk-1.3.261.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.261
if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi)
elseif(UNIX)
@@ -71,9 +79,6 @@ elseif(UNIX)
@@ -72,9 +80,6 @@ elseif(UNIX)
endif()
target_link_libraries(glslang-standalone ${LIBRARIES})

8
glslang.spec
View File

@ -1,13 +1,13 @@
%global sdkver 1.3.261.1
%global sdkver 1.3.268.0
Name: glslang
Version: 11.9.0
Version: 13.1.1
Release: %autorelease
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
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

2
sources
View File

@ -1 +1 @@
SHA512 (glslang-sdk-1.3.261.1.tar.gz) = 13838ce67f151dbb27cc6809e5fcac0e4f728ac301a5cb3c624b1491180040f16487271a8e02aaf87159a8d337121af346a3d5bdc5f81e5db49a30088dd8c255
SHA512 (glslang-sdk-1.3.268.0.tar.gz) = 5d03bd192505a58bf306e36438c8d68ee71cce8464adb8b36b06d30cc20202385bc4bc919274a73b3b7a3fbe2fb5aaf6c9ea30642398608bf1254ed23851c01f