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

Latest snapshot used in 1.3.250.1 sdk

Browse Source 
Resolves: rhbz#2178540
This commit is contained in:
Dave Airlie 2023-07-07 08:28:57 +10:00
parent 0f1bb2c365
commit 5e04bc84e9
4 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
diff -up glslang-sdk-1.3.231.1/CMakeLists.txt.dma glslang-sdk-1.3.231.1/CMakeLists.txt diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLists.txt
--- glslang-sdk-1.3.231.1/CMakeLists.txt.dma 2022-10-14 03:29:59.000000000 +1000 --- glslang-sdk-1.3.250.1/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
+++ glslang-sdk-1.3.231.1/CMakeLists.txt 2022-11-09 14:47:04.538772188 +1000 +++ glslang-sdk-1.3.250.1/CMakeLists.txt 2023-07-07 09:26:10.171395413 +1000
@@ -129,6 +129,13 @@ if(USE_CCACHE) @@ -104,6 +104,13 @@ else()
endif()
endif() endif()
option(ENABLE_CTEST "Enables testing" ON)
+# using pkg-config to configure include paths and link libraries +# using pkg-config to configure include paths and link libraries
+include(FindPkgConfig) +include(FindPkgConfig)
@ -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) if(ENABLE_CTEST)
include(CTest) include(CTest)
endif() endif()
@@ -319,11 +326,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA @@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
add_subdirectory(External) add_subdirectory(External)
endif() 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") message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1) add_definitions(-DENABLE_OPT=1)
else() else()
diff -up glslang-sdk-1.3.231.1/External/CMakeLists.txt.dma glslang-sdk-1.3.231.1/External/CMakeLists.txt 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.231.1/External/CMakeLists.txt.dma 2022-10-14 03:29:59.000000000 +1000 --- glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
+++ glslang-sdk-1.3.231.1/External/CMakeLists.txt 2022-11-09 14:47:04.539772205 +1000 +++ glslang-sdk-1.3.250.1/External/CMakeLists.txt 2023-07-07 09:26:10.172395432 +1000
@@ -68,10 +68,3 @@ if(BUILD_TESTING) @@ -68,10 +68,3 @@ if(BUILD_TESTING)
endif() endif()
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()
-endif() -endif()
- -
diff -up glslang-sdk-1.3.231.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.231.1/glslang/CMakeLists.txt 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.231.1/glslang/CMakeLists.txt.dma 2022-11-09 14:47:04.540772224 +1000 --- glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
+++ glslang-sdk-1.3.231.1/glslang/CMakeLists.txt 2022-11-09 14:48:06.844895906 +1000 +++ glslang-sdk-1.3.250.1/glslang/CMakeLists.txt 2023-07-07 09:26:10.173395450 +1000
@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) @@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL)
add_library(GenericCodeGen ALIAS glslang::GenericCodeGen) add_library(GenericCodeGen ALIAS glslang::GenericCodeGen)
endif() 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) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif() 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 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.231.1/glslang/glslang.pc.cmake.in.dma 2022-11-09 14:47:04.541772242 +1000 --- glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in.dma 2023-07-07 09:26:10.174395469 +1000
+++ glslang-sdk-1.3.231.1/glslang/glslang.pc.cmake.in 2022-11-09 14:47:04.541772242 +1000 +++ glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in 2023-07-07 09:26:10.174395469 +1000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@ + prefix=@CMAKE_INSTALL_PREFIX@
+ exec_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 + Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
+ Cflags: -I${includedir} + Cflags: -I${includedir}
\ No newline at end of file \ 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 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.231.1/SPIRV/CMakeLists.txt.dma 2022-10-14 03:29:59.000000000 +1000 --- glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
+++ glslang-sdk-1.3.231.1/SPIRV/CMakeLists.txt 2022-11-09 14:47:04.542772260 +1000 +++ glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt 2023-07-07 09:26:10.176395507 +1000
@@ -78,6 +78,10 @@ target_include_directories(SPIRV PUBLIC @@ -82,6 +82,10 @@ target_include_directories(SPIRV PUBLIC
glslang_add_build_info_dependency(SPIRV) 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) if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_target_properties(SPVRemapper PROPERTIES
@@ -91,15 +95,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) @@ -98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif() endif()
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() else()
target_link_libraries(SPIRV PRIVATE MachineIndependent) target_link_libraries(SPIRV PRIVATE MachineIndependent)
endif() endif()
@@ -140,6 +150,9 @@ if(ENABLE_GLSLANG_INSTALL) @@ -147,6 +157,9 @@ if(ENABLE_GLSLANG_INSTALL)
add_library(SPIRV ALIAS glslang::SPIRV) add_library(SPIRV ALIAS glslang::SPIRV)
") ")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) 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/) install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif() 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 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.231.1/SPIRV/spirv.pc.cmake.in.dma 2022-11-09 14:47:04.543772278 +1000 --- glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma 2023-07-07 09:26:10.177395526 +1000
+++ glslang-sdk-1.3.231.1/SPIRV/spirv.pc.cmake.in 2022-11-09 14:47:04.543772278 +1000 +++ glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in 2023-07-07 09:26:10.177395526 +1000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@ + prefix=@CMAKE_INSTALL_PREFIX@
+ exec_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 + Libs: -L${libdir} -lSPIRV
+ Cflags: -I${includedir} + Cflags: -I${includedir}
\ No newline at end of file \ 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 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.231.1/SPIRV/SpvTools.cpp.dma 2022-10-14 03:29:59.000000000 +1000 --- glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma 2023-06-28 03:49:14.000000000 +1000
+++ glslang-sdk-1.3.231.1/SPIRV/SpvTools.cpp 2022-11-09 14:47:04.544772296 +1000 +++ glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp 2023-07-07 09:26:10.178395545 +1000
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
#include <iostream> #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 { namespace glslang {
diff -up glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt 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.231.1/StandAlone/CMakeLists.txt.dma 2022-11-09 14:46:48.996491875 +1000 --- glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
+++ glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt 2022-11-09 14:47:04.545772314 +1000 +++ glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt 2023-07-07 09:26:10.179395564 +1000
@@ -72,6 +72,14 @@ if(ENABLE_SPVREMAPPER) @@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER)
set(LIBRARIES ${LIBRARIES} SPVRemapper) set(LIBRARIES ${LIBRARIES} SPVRemapper)
endif() endif()
@ -167,7 +167,7 @@ diff -up glslang-sdk-1.3.231.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.231
if(WIN32) if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi) set(LIBRARIES ${LIBRARIES} psapi)
elseif(UNIX) elseif(UNIX)
@@ -81,9 +89,6 @@ elseif(UNIX) @@ -71,9 +79,6 @@ elseif(UNIX)
endif() endif()
target_link_libraries(glslangValidator ${LIBRARIES}) target_link_libraries(glslangValidator ${LIBRARIES})

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

@ -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)

11
glslang.spec
View File

@ -1,14 +1,13 @@
%global sdkver 1.3.239.0 %global sdkver 1.3.250.1
Name: glslang Name: glslang
Version: 11.9.0 Version: 11.9.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: OpenGL and OpenGL ES shader front end and validator Summary: OpenGL and OpenGL ES shader front end and validator
License: BSD and GPLv3+ and ASL 2.0 License: BSD and GPLv3+ and ASL 2.0
URL: https://github.com/KhronosGroup/%{name} URL: https://github.com/KhronosGroup/%{name}
Source0: %url/archive/sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz 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 # Patch to build against system spirv-tools
#Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch #Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
Patch3: 0001-pkg-config-compatibility.patch Patch3: 0001-pkg-config-compatibility.patch
@ -55,9 +54,6 @@ popd
# we don't want them in here # we don't want them in here
rm -rf %{buildroot}%{_includedir}/SPIRV rm -rf %{buildroot}%{_includedir}/SPIRV
# Install libglslang-default-resource-limits.a
install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/
%ifnarch s390x ppc64 %ifnarch s390x ppc64
%check %check
pushd Test pushd Test
@ -86,6 +82,9 @@ popd
%{_libdir}/cmake/* %{_libdir}/cmake/*
%changelog %changelog
* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-5
- Latest snapshot used in 1.3.250.1 sdk
* Mon Feb 13 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-4 * Mon Feb 13 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-4
- Latest snapshot used in 1.3.239 sdk - Latest snapshot used in 1.3.239 sdk

2
sources
View File

@ -1 +1 @@
SHA512 (glslang-sdk-1.3.239.0.tar.gz) = 2502ddc48aea333d2406f4b225a74f15adb429633b4deb701737440e01e134a5eda98933156b2821ad1fa48d83f259e36061390600d6c5c9bb2edf8c18287d2b SHA512 (glslang-sdk-1.3.250.1.tar.gz) = f447c59619dd52785c32ca2b013b79e59294344c7876619b6e93bade860c2c661d2d74a16c5ac7fff448b6be176bf70e39520c40c26d37fefaf0fe578512ed57