rpms
/
glslang
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rpms:c9
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i9c-beta
rpms:c9-beta
rpms:i8
rpms:i9c
rpms:c9
..
compare: rpms:i10cs
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i9c-beta
rpms:c9-beta
rpms:i8
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

4 changed files with 285 additions and 122 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/glslang-sdk-1.3.250.1.tar.gz SOURCES/glslang-sdk-1.3.283.0.tar.gz

2
.glslang.metadata
Unescape View File

@ -1 +1 @@
bdfbf90e9aeebfd61cbd6a1e0320fadbe43e08ec SOURCES/glslang-sdk-1.3.250.1.tar.gz 81a49d22188b587a92658adc7ad713852ff1460c SOURCES/glslang-sdk-1.3.283.0.tar.gz

153
SOURCES/0001-pkg-config-compatibility.patch
Unescape View File

@ -1,9 +1,9 @@
diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLists.txt diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLists.txt
--- glslang-sdk-1.3.250.1/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 --- glslang-sdk-1.3.275.0/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
+++ glslang-sdk-1.3.250.1/CMakeLists.txt 2023-07-07 09:26:10.171395413 +1000 +++ glslang-sdk-1.3.275.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000
@@ -104,6 +104,13 @@ else() @@ -106,6 +106,13 @@ endif()
endif()
option(ENABLE_CTEST "Enables testing" ON) option(ENABLE_PCH "Enables Precompiled header" 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)
@ -12,51 +12,79 @@ diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLis
+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1) + pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
+endif(BUILD_SHARED_LIBS) +endif(BUILD_SHARED_LIBS)
+ +
if(ENABLE_CTEST) if(ENABLE_HLSL)
include(CTest) add_compile_definitions(ENABLE_HLSL)
endif() endif()
@@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA @@ -264,27 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
add_subdirectory(External) add_subdirectory(External)
endif() endif()
-option(ALLOW_EXTERNAL_SPIRV_TOOLS "Allows to build against installed SPIRV-Tools-opt. This is unsupported if the commit isn't the one in known_good.json")
-if(NOT TARGET SPIRV-Tools-opt)
- 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(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) - set(ENABLE_OPT OFF)
- endif() - 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) -if(ENABLE_OPT)
+if(${SPIRV_TOOLS_FOUND} EQUAL 1) +if(${SPIRV_TOOLS_FOUND} EQUAL 1)
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.250.1/External/CMakeLists.txt.dma glslang-sdk-1.3.250.1/External/CMakeLists.txt @@ -349,9 +336,6 @@ if (GLSLANG_ENABLE_INSTALL)
--- glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[
+++ glslang-sdk-1.3.250.1/External/CMakeLists.txt 2023-07-07 09:26:10.172395432 +1000 @PACKAGE_INIT@
@@ -68,10 +68,3 @@ if(BUILD_TESTING) include(CMakeFindDependencyMacro)
- if(@ENABLE_OPT@)
- find_dependency(SPIRV-Tools-opt)
- endif()
@INSTALL_CONFIG_UNIX@
include("@PACKAGE_PATH_EXPORT_TARGETS@")
]=])
diff -up glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma glslang-sdk-1.3.275.0/External/CMakeLists.txt
--- glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
+++ glslang-sdk-1.3.275.0/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000
@@ -68,10 +68,4 @@ if(GLSLANG_TESTS)
endif() endif()
endif() endif()
-if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) -if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) - if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") - set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) - add_subdirectory(spirv-tools)
- endif() - endif()
-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 diff -up glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.275.0/glslang/CMakeLists.txt
+++ glslang-sdk-1.3.250.1/glslang/CMakeLists.txt 2023-07-07 09:26:10.173395450 +1000 --- glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
@@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL) +++ glslang-sdk-1.3.275.0/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000
add_library(GenericCodeGen ALIAS glslang::GenericCodeGen) @@ -232,6 +232,8 @@ if(GLSLANG_ENABLE_INSTALL)
endif() if(NOT BUILD_SHARED_LIBS)
") install(TARGETS MachineIndependent EXPORT glslang-targets)
install(TARGETS GenericCodeGen EXPORT glslang-targets)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif() 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 set(PUBLIC_HEADERS
--- 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.275.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in
--- glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000
+++ glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in 2023-09-05 13:21:45.115297852 +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,21 +98,21 @@ 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 + 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.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/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.275.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
+++ glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt 2023-07-07 09:26:10.176395507 +1000 +++ glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000
@@ -82,6 +82,10 @@ target_include_directories(SPIRV PUBLIC @@ -89,6 +89,10 @@ target_include_directories(SPIRV PUBLIC
glslang_add_build_info_dependency(SPIRV) glslang_add_build_info_dependency(SPIRV)
+ +
+set(SPIRV_NAME spirv) +set(SPIRV_NAME spirv)
+set(SPIRV_VERSION 1.3) +set(SPIRV_VERSION 1.5.5)
+ +
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_target_properties(SPVRemapper PROPERTIES set_target_properties(SPVRemapper PROPERTIES
@@ -98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) @@ -105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif() endif()
endif() endif()
@ -98,32 +126,26 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SP
+endif(BUILD_SHARED_LIBS) +endif(BUILD_SHARED_LIBS)
+ +
if(ENABLE_OPT) if(ENABLE_OPT)
target_include_directories(SPIRV - target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
PRIVATE ${spirv-tools_SOURCE_DIR}/include
PRIVATE ${spirv-tools_SOURCE_DIR}/source
)
- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
- target_include_directories(SPIRV PUBLIC - target_include_directories(SPIRV PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+ target_link_libraries(SPIRV glslang) + target_link_libraries(SPIRV glslang)
else() else()
target_link_libraries(SPIRV PRIVATE MachineIndependent) target_link_libraries(SPIRV PRIVATE MachineIndependent)
endif() endif()
@@ -147,6 +157,9 @@ if(ENABLE_GLSLANG_INSTALL) @@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL)
add_library(SPIRV ALIAS glslang::SPIRV)
") install(TARGETS SPIRV EXPORT glslang-targets)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
+ # spirv.pc Configuration + # spirv.pc Configuration
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ +
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif() 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 diff -up glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.275.0/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.275.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000
+++ glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in 2023-07-07 09:26:10.177395526 +1000 +++ glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in 2023-09-05 13:21:45.116297879 +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 +159,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 + 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.250.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp diff -up glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0/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.275.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000
+++ glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp 2023-07-07 09:26:10.178395545 +1000 +++ glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
#include <iostream> #include <iostream>
@ -149,31 +171,30 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1/SPIR
namespace glslang { namespace glslang {
diff -up glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt diff -up glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275.0/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.275.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
+++ glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt 2023-07-07 09:26:10.179395564 +1000 +++ glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000
@@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER) @@ -63,6 +63,14 @@ set(LIBRARIES
set(LIBRARIES ${LIBRARIES} SPVRemapper) SPIRV
endif() glslang-default-resource-limits)
+if(BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS)
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) + 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() +else()
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES}) + 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) +endif(BUILD_SHARED_LIBS)
+ +
if(WIN32) if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi) set(LIBRARIES ${LIBRARIES} psapi)
elseif(UNIX) elseif(UNIX)
@@ -71,9 +79,6 @@ elseif(UNIX) @@ -72,8 +80,6 @@ elseif(UNIX)
endif() endif()
target_link_libraries(glslangValidator ${LIBRARIES}) target_link_libraries(glslang-standalone ${LIBRARIES})
-target_include_directories(glslangValidator PUBLIC -target_include_directories(glslang-standalone PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
if(ENABLE_OPT) if(ENABLE_SPVREMAPPER)
target_include_directories(glslangValidator set(REMAPPER_SOURCES spirv-remap.cpp)

244
SPECS/glslang.spec
Unescape View File

@ -1,13 +1,23 @@
%global sdkver 1.3.250.1 ## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 5;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%global sdkver 1.3.283.0
Name: glslang Name: glslang
Version: 11.9.0 Version: 14.2.0
Release: 5%{?dist} Release: %autorelease
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-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-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/vulkan-sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz
# Patch to build against system spirv-tools (rebased locally) # 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: 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
@ -32,7 +42,7 @@ ES and OpenGL shading languages. It implements a strict
interpretation of the specifications for these languages. interpretation of the specifications for these languages.
%prep %prep
%autosetup -p1 -n %{name}-sdk-%{sdkver} %autosetup -p1 -n %{name}-vulkan-sdk-%{sdkver}
# Fix rpmlint warning on debuginfo # Fix rpmlint warning on debuginfo
find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
@ -55,13 +65,12 @@ popd
%files %files
%doc README.md README-spirv-remap.txt %doc README.md README-spirv-remap.txt
%{_bindir}/glslang
%{_bindir}/glslangValidator %{_bindir}/glslangValidator
%{_bindir}/spirv-remap %{_bindir}/spirv-remap
%files devel %files devel
%{_includedir}/glslang/ %{_includedir}/glslang/
%{_libdir}/libHLSL.a
%{_libdir}/libOGLCompiler.a
%{_libdir}/libOSDependent.a %{_libdir}/libOSDependent.a
%{_libdir}/libSPIRV.a %{_libdir}/libSPIRV.a
%{_libdir}/libSPVRemapper.a %{_libdir}/libSPVRemapper.a
@ -74,115 +83,248 @@ popd
%{_libdir}/cmake/* %{_libdir}/cmake/*
%changelog %changelog
* Fri Jul 07 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-5 ## START: Generated by rpmautospec
- Latest snapshot used in 1.3.250.1 sdk * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 14.2.0-5
- Bump release for October 2024 mass rebuild:
* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-4 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 14.2.0-4
- Latest snapshot used in 1.3.239 sdk - Rebuilt for MSVSphere 10
* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-3 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 14.2.0-4
- Bump release for June 2024 mass rebuild
* Thu May 30 2024 José Expósito <jexposit@redhat.com> - 14.2.0-3
- License: AND must be all capital letters
* Thu May 30 2024 José Expósito <jexposit@redhat.com> - 14.2.0-2
- Update license identifiers
* Tue May 28 2024 José Expósito <jexposit@redhat.com> - 14.2.0-1
- Update to 1.3.283.0 SDK
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 13.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 13.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Nov 02 2023 José Expósito <jexposit@redhat.com> - 13.1.1-1
- update to 1.3.268.0 SDK
* Tue Sep 05 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-21
- readd old name
* Tue Sep 05 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-20
- new filename for main executable
* Tue Sep 05 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-19
- update pkg config patch
* Tue Sep 05 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-18
- update to 1.3.261.1 sdk
* Mon Sep 04 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-17
- update ASL to Apache, need to recheck others
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.9.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 20 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-15
- update to 1.3.250.0 glslang
* Mon Apr 24 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-14
- update to 1.3.243.0 sdk
* Sun Apr 23 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-13
- update to 1.3.243.0 sdk
* Tue Jan 31 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-12
- update to 1.3.239.0 sdk
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.9.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 09 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-10
- glslang doesn't seem to use datadir anymore
* Wed Nov 09 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-9
- add update patch file
* Wed Nov 09 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-8
- update to 1.3.231.1 sdk
* Wed Aug 31 2022 Lukáš Zaoral <lzaoral@redhat.com> - 11.9.0-7
- spec: do not install files in %%check section
* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-6
- Latest snapshot used in 1.3.224 sdk - Latest snapshot used in 1.3.224 sdk
* Wed Jun 22 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-2 * Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-5
- Latest snapshot used in 1.3.224 sdk
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jun 17 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-3
- Latest snapshot used in 1.3.216 sdk - Latest snapshot used in 1.3.216 sdk
* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-1.20220202.git2742e95 * Wed Apr 27 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-2
- Latest snapshot used in 1.3.211 sdk
* Tue Feb 15 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-1
- Latest snapshot used in 1.3.204 sdk - Latest snapshot used in 1.3.204 sdk
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.5.0-2.20210623.gitae2a562 * Sat Jan 29 2022 Jan Grulich <jgrulich@redhat.com> - 11.7.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Fix encoding/decoding of string literals for bug-endian systems
Related: rhbz#1991688
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.7.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 06 2021 Dave Airlie <airlied@redhat.com> - 11.7.0-3
- Fix for spirv-tools ABI
* Tue Nov 23 2021 Dave Airlie <airlied@redhat.com> - 11.7.0-2
- update patch
* Tue Nov 23 2021 Dave Airlie <airlied@redhat.com> - 11.7.0-1
- Latest snapshot used in 1.2.198 sdk
* Tue Sep 07 2021 Dave Airlie <airlied@redhat.com> - 11.6.0-1
- Latest snapshot used in 1.2.189 sdk
* Fri Jul 30 2021 Dave Airlie <airlied@redhat.com> - 11.5.0-1 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jul 06 2021 Dave Airlie <airlied@redhat.com> - 11.5.0-1
- Latest snapshot used in 1.2.182 sdk - Latest snapshot used in 1.2.182 sdk
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 11.0.0-5.20201208.gitc594de2 * Tue May 18 2021 Dave Airlie <airlied@redhat.com> - 11.4.0-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Latest snapshot used in 1.2.176 sdk
* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 11.0.0-7
- add sources
* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 11.0.0-4.20201208.gitc594de2 * Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 11.0.0-6
- Latest snapshot used in 1.2.162 sdk - Latest snapshot used in 1.2.162 sdk
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-3.20201104.gitd550beb * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 04 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-2 * Tue Nov 03 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-4
- Latest upstream snapshot
* Tue Nov 03 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-3
- Latest upstream snapshot - Latest upstream snapshot
* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-1 * Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-2
- glslang: fix build
* Tue Aug 04 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-1
- Latest upstream snapshot - Latest upstream snapshot
* Tue Aug 04 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-5 * Mon Aug 03 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-12
- fix cmake_install
* Mon Aug 03 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-11
- Use cmake macros. - Use cmake macros.
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-4.2020421.gitc9b28b9 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-10
- Second attempt - Rebuilt for - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-3.2020421.gitc9b28b9 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Apr 22 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-2 * Wed Apr 22 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-8
- glslang: fix pkg-config patch more
* Wed Apr 22 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-7
- fixup patch
* Wed Apr 22 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-6
- Update to latest git snapshot - Update to latest git snapshot
* Sun Feb 02 2020 Robert-André Mauchin <zebob.m@gmail.com> - 8.13.3559-5
- Revert "Revert "rm unneeded include files""
* Sun Feb 02 2020 Robert-André Mauchin <zebob.m@gmail.com> - 8.13.3559-4
- Revert "rm unneeded include files"
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-3
- rm unneeded include files
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-2
- update to latest sources
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-1 * Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-1
- Update to latest git snapshot - Update to latest git snapshot
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.13.3496-3.20191102.git7f77b2e * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.13.3496-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Dec 19 2019 Leigh Scott <leigh123linux@googlemail.com> - 7.13.3496-2.20191102.git7f77b2e * Thu Dec 19 2019 leigh123linux <leigh123linux@googlemail.com> - 7.13.3496-5
- Add patch for 'Fix a couple relative header paths in header' - Add patch for 'Fix a couple relative header paths in header'
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-1 * Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-4
- Latest upstream snapshot for validation layers build - Latest upstream snapshot for validation layers build
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-3
- glslang: pkg-config/cmake fixes
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-2
- Fixup test running
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-1
- rebase to newer master
* Sat Aug 03 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-3 * Sat Aug 03 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-3
- Latest upstream snapshot for validation layers build - Latest upstream snapshot for validation layers build
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.11.3214-2 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.11.3214-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jun 10 01:27:27 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 7.11.3214-1 * Mon Jun 10 2019 Robert-André Mauchin <zebob.m@gmail.com> - 7.11.3214-1
- Release 7.11.3214 - Release 7.11.3214 Add patch to build against system spirv-tools
- Add patch to build against system spirv-tools
* Fri Mar 29 2019 Dave Airlie <airlied@redhat.com> - 3.1-0.13.20190329.gite0d59bb * Fri Mar 29 2019 Dave Airlie <airlied@redhat.com> - 3.1-14
- Update for vulkan 1.1.101.0 - update to latest glslang snapshot
* Tue Feb 12 2019 Dave Airlie <airlied@redhat.com> - 3.1-0.12.20190212.git05d12a9 * Tue Feb 12 2019 Dave Airlie <airlied@redhat.com> - 3.1-13
- Update for vulkan 1.1.92.0 - Update for vulkan 1.1.92.0
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-0.11.20180727.gite99a268 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.10.20180727.gite99a268 * Tue Aug 07 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-11
- Update for vulkan 1.1.82.0 - Update for vulkan 1.1.82.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-0.9.20180416.git3bb4c48 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.8.20180416.git3bb4c48 * Tue Apr 24 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-9
- fix build
* Mon Apr 23 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-8
- Update for vulkan 1.1.73.0 - Update for vulkan 1.1.73.0
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 3.1-0.7.20180205.git2651cca * Thu Mar 08 2018 Adam Williamson <awilliam@redhat.com> - 3.1-7
- Rebuild to fix GCC 8 mis-compilation - Rebuild to fix GCC 8 mis-compilation
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
* Fri Feb 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.6.20180205.git2651cca * Fri Feb 09 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-6
- Update for vulkan 1.0.68.0 - Update for vulkan 1.0.68.0
* Fri Feb 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.5.20171028.git715c353 * Fri Feb 09 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-5
- Use ninja to build - Use ninja to build
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-0.4.20171028.git715c353 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 03 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.3.20171028.git715c353 * Wed Jan 03 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-3
- Exclude s390x and ppc64 from check section - Exclude s390x and ppc64 from check section
* Wed Jan 03 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.2.20171028.git715c353 * Wed Jan 03 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-2
- Add check section to run tests - Add check section to run tests
- Split binaries into main package
* Thu Jul 13 2017 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.1.20171028.git715c353 * Tue Jan 02 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-1
- First build - First build
## END: Generated by rpmautospec

Write Preview
Loading…
Cancel
Save