Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/glslang-07a55839eed550d84ef62e0c7f503e0d67692708.tar.gz
|
||||
SOURCES/glslang-sdk-1.4.313.0.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
a62e7be79f6d0be94c90922f839c2f01020ba9a5 SOURCES/glslang-07a55839eed550d84ef62e0c7f503e0d67692708.tar.gz
|
||||
4b7f76df0c4590a668657f3ad8e7d071d4df9dbe SOURCES/glslang-sdk-1.4.313.0.tar.gz
|
||||
|
||||
@ -1,9 +1,29 @@
|
||||
diff -up ./CMakeLists.txt.dma ./CMakeLists.txt
|
||||
--- ./CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
||||
+++ ./CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000
|
||||
@@ -69,6 +69,13 @@ endmacro(glslang_pch)
|
||||
From 011ff910c1836508d323cbe1c55cf0359eb69705 Mon Sep 17 00:00:00 2001
|
||||
From: Anusha Srivatsa <asrivats@redhat.com>
|
||||
Date: Wed, 26 Mar 2025 16:15:29 -0400
|
||||
Subject: [PATCH] Bring in the changes from upstream
|
||||
|
||||
project(glslang)
|
||||
Signed-off-by: Anusha Srivatsa <asrivats@redhat.com>
|
||||
---
|
||||
CMakeLists.txt | 32 ++++++++------------------------
|
||||
External/CMakeLists.txt | 6 ------
|
||||
SPIRV/CMakeLists.txt | 20 +++++++++++++++++---
|
||||
SPIRV/SpvTools.cpp | 2 +-
|
||||
SPIRV/spirv.pc.cmake.in | 11 +++++++++++
|
||||
StandAlone/CMakeLists.txt | 10 ++++++++--
|
||||
glslang/CMakeLists.txt | 2 ++
|
||||
glslang/glslang.pc.cmake.in | 11 +++++++++++
|
||||
8 files changed, 58 insertions(+), 36 deletions(-)
|
||||
create mode 100644 SPIRV/spirv.pc.cmake.in
|
||||
create mode 100644 glslang/glslang.pc.cmake.in
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7e78c0b5..798b3b90 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -122,6 +122,13 @@ endif()
|
||||
|
||||
option(ENABLE_PCH "Enables Precompiled header" ON)
|
||||
|
||||
+# using pkg-config to configure include paths and link libraries
|
||||
+include(FindPkgConfig)
|
||||
@ -12,89 +32,78 @@ diff -up ./CMakeLists.txt.dma ./CMakeLists.txt
|
||||
+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
|
||||
+endif(BUILD_SHARED_LIBS)
|
||||
+
|
||||
if(ENABLE_CTEST)
|
||||
include(CTest)
|
||||
if(ENABLE_SPIRV)
|
||||
add_compile_definitions(ENABLE_SPIRV)
|
||||
endif()
|
||||
@@ -166,11 +173,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
|
||||
add_subdirectory(External)
|
||||
@@ -279,27 +286,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. This is unsupported if the commit isn't the one in known_good.json")
|
||||
-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(SEND_ERROR "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)
|
||||
+if(${SPIRV_TOOLS_FOUND} EQUAL 1)
|
||||
message(STATUS "optimizer enabled")
|
||||
add_definitions(-DENABLE_OPT=1)
|
||||
add_compile_definitions(ENABLE_OPT=1)
|
||||
else()
|
||||
diff -up ./External/CMakeLists.txt.dma ./External/CMakeLists.txt
|
||||
--- ./External/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
||||
+++ ./External/CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000
|
||||
@@ -35,10 +35,3 @@ if(BUILD_TESTING)
|
||||
@@ -358,9 +345,6 @@ if (GLSLANG_ENABLE_INSTALL)
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[
|
||||
@PACKAGE_INIT@
|
||||
include(CMakeFindDependencyMacro)
|
||||
- if(@ENABLE_OPT@)
|
||||
- find_dependency(SPIRV-Tools-opt)
|
||||
- endif()
|
||||
@INSTALL_CONFIG_UNIX@
|
||||
include("@PACKAGE_PATH_EXPORT_TARGETS@")
|
||||
]=])
|
||||
diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt
|
||||
index 826b5c59..4169c6ff 100644
|
||||
--- a/External/CMakeLists.txt
|
||||
+++ b/External/CMakeLists.txt
|
||||
@@ -68,10 +68,4 @@ if(GLSLANG_TESTS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
|
||||
- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
|
||||
- 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()
|
||||
-
|
||||
diff -up ./glslang/CMakeLists.txt.dma ./glslang/CMakeLists.txt
|
||||
--- ./glslang/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
||||
+++ ./glslang/CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000
|
||||
@@ -79,6 +79,7 @@ set(HEADERS
|
||||
MachineIndependent/preprocessor/PpContext.h
|
||||
MachineIndependent/preprocessor/PpTokens.h)
|
||||
|
||||
+set(VERSION 7.11.3113)
|
||||
glslang_pch(SOURCES MachineIndependent/pch.cpp)
|
||||
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
|
||||
index 91469d4f..b0ac8268 100644
|
||||
--- a/SPIRV/CMakeLists.txt
|
||||
+++ b/SPIRV/CMakeLists.txt
|
||||
@@ -94,6 +94,9 @@ target_include_directories(SPIRV PUBLIC
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
||||
glslang_only_export_explicit_symbols(SPIRV)
|
||||
|
||||
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
|
||||
@@ -115,7 +116,9 @@ if(ENABLE_GLSLANG_INSTALL)
|
||||
install(TARGETS glslang EXPORT glslangTargets
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
endif()
|
||||
- install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
+ 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(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
endif(ENABLE_GLSLANG_INSTALL)
|
||||
|
||||
if(ENABLE_GLSLANG_INSTALL)
|
||||
diff -up ./glslang/glslang.pc.cmake.in.dma ./glslang/glslang.pc.cmake.in
|
||||
--- ./glslang/glslang.pc.cmake.in.dma 2020-01-29 10:29:25.199187348 +1000
|
||||
+++ ./glslang/glslang.pc.cmake.in 2020-01-29 10:29:25.199187348 +1000
|
||||
@@ -0,0 +1,11 @@
|
||||
+ prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+
|
||||
+ Name: @PROJECT_NAME@
|
||||
+ Description: OpenGL and OpenGL ES shader front end and validator
|
||||
+ Requires:
|
||||
+ Version: @VERSION@
|
||||
+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
|
||||
+ Cflags: -I${includedir}
|
||||
\ No newline at end of file
|
||||
diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt
|
||||
--- ./SPIRV/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
||||
+++ ./SPIRV/CMakeLists.txt 2020-01-29 10:29:25.200187375 +1000
|
||||
@@ -40,6 +40,10 @@ target_include_directories(SPIRV PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
||||
|
||||
+
|
||||
+set(SPIRV_NAME spirv)
|
||||
+set(SPIRV_VERSION 1.3)
|
||||
+set(SPIRV_VERSION 1.5.5)
|
||||
+
|
||||
if (ENABLE_SPVREMAPPER)
|
||||
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
|
||||
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
||||
@@ -53,15 +57,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
|
||||
add_library(glslang::SPVRemapper ALIAS SPVRemapper)
|
||||
@@ -112,10 +115,17 @@ if(WIN32 AND BUILD_SHARED_LIBS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -108,31 +117,41 @@ diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt
|
||||
+endif(BUILD_SHARED_LIBS)
|
||||
+
|
||||
if(ENABLE_OPT)
|
||||
target_include_directories(SPIRV
|
||||
PRIVATE ${spirv-tools_SOURCE_DIR}/include
|
||||
PRIVATE ${spirv-tools_SOURCE_DIR}/source
|
||||
)
|
||||
- target_link_libraries(SPIRV glslang SPIRV-Tools-opt)
|
||||
- target_link_libraries(SPIRV INTERFACE glslang PUBLIC SPIRV-Tools-opt)
|
||||
- target_include_directories(SPIRV PUBLIC
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
|
||||
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
|
||||
+ target_link_libraries(SPIRV glslang)
|
||||
else()
|
||||
target_link_libraries(SPIRV glslang)
|
||||
endif(ENABLE_OPT)
|
||||
@@ -97,6 +107,9 @@ if(ENABLE_GLSLANG_INSTALL)
|
||||
target_link_libraries(SPIRV INTERFACE glslang)
|
||||
endif()
|
||||
@@ -132,5 +142,9 @@ if(GLSLANG_ENABLE_INSTALL)
|
||||
|
||||
install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
install(TARGETS SPIRV EXPORT glslang-targets)
|
||||
|
||||
+ # spirv.pc Configuration
|
||||
+ 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 ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
|
||||
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
||||
endif(ENABLE_GLSLANG_INSTALL)
|
||||
diff -up ./SPIRV/spirv.pc.cmake.in.dma ./SPIRV/spirv.pc.cmake.in
|
||||
--- ./SPIRV/spirv.pc.cmake.in.dma 2020-01-29 10:29:25.200187375 +1000
|
||||
+++ ./SPIRV/spirv.pc.cmake.in 2020-01-29 10:29:25.200187375 +1000
|
||||
+
|
||||
install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
||||
endif()
|
||||
diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
|
||||
index d1b411f2..d4470676 100644
|
||||
--- a/SPIRV/SpvTools.cpp
|
||||
+++ b/SPIRV/SpvTools.cpp
|
||||
@@ -43,7 +43,7 @@
|
||||
#include <iostream>
|
||||
|
||||
#include "SpvTools.h"
|
||||
-#include "spirv-tools/optimizer.hpp"
|
||||
+#include <spirv-tools/optimizer.hpp>
|
||||
#include "glslang/MachineIndependent/localintermediate.h"
|
||||
|
||||
namespace glslang {
|
||||
diff --git a/SPIRV/spirv.pc.cmake.in b/SPIRV/spirv.pc.cmake.in
|
||||
new file mode 100644
|
||||
index 00000000..dfcad940
|
||||
--- /dev/null
|
||||
+++ b/SPIRV/spirv.pc.cmake.in
|
||||
@@ -0,0 +1,11 @@
|
||||
+ prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
|
||||
@ -146,45 +165,65 @@ diff -up ./SPIRV/spirv.pc.cmake.in.dma ./SPIRV/spirv.pc.cmake.in
|
||||
+ Libs: -L${libdir} -lSPIRV
|
||||
+ Cflags: -I${includedir}
|
||||
\ No newline at end of file
|
||||
diff -up ./SPIRV/SpvTools.cpp.dma ./SPIRV/SpvTools.cpp
|
||||
--- ./SPIRV/SpvTools.cpp.dma 2020-01-28 05:35:25.000000000 +1000
|
||||
+++ ./SPIRV/SpvTools.cpp 2020-01-29 10:29:25.200187375 +1000
|
||||
@@ -43,8 +43,8 @@
|
||||
#include <iostream>
|
||||
|
||||
#include "SpvTools.h"
|
||||
-#include "spirv-tools/optimizer.hpp"
|
||||
-#include "spirv-tools/libspirv.h"
|
||||
+#include <spirv-tools/optimizer.hpp>
|
||||
+#include <spirv-tools/libspirv.h>
|
||||
|
||||
namespace glslang {
|
||||
|
||||
diff -up ./StandAlone/CMakeLists.txt.dma ./StandAlone/CMakeLists.txt
|
||||
--- ./StandAlone/CMakeLists.txt.dma 2020-01-29 10:29:09.052755158 +1000
|
||||
+++ ./StandAlone/CMakeLists.txt 2020-01-29 10:29:25.201187402 +1000
|
||||
@@ -23,6 +23,14 @@ if(ENABLE_SPVREMAPPER)
|
||||
set(LIBRARIES ${LIBRARIES} SPVRemapper)
|
||||
endif()
|
||||
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
|
||||
index 18a24ce3..4e9e910f 100644
|
||||
--- a/StandAlone/CMakeLists.txt
|
||||
+++ b/StandAlone/CMakeLists.txt
|
||||
@@ -62,6 +62,14 @@ set(LIBRARIES
|
||||
glslang-default-resource-limits
|
||||
$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
|
||||
|
||||
+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)
|
||||
@@ -32,9 +40,6 @@ elseif(UNIX)
|
||||
endif(WIN32)
|
||||
@@ -71,8 +79,6 @@ elseif(UNIX)
|
||||
endif()
|
||||
|
||||
target_link_libraries(glslangValidator ${LIBRARIES})
|
||||
-target_include_directories(glslangValidator PUBLIC
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
|
||||
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
|
||||
target_link_libraries(glslang-standalone ${LIBRARIES})
|
||||
-target_include_directories(glslang-standalone PUBLIC
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
|
||||
|
||||
if(ENABLE_SPIRV)
|
||||
if(ENABLE_SPVREMAPPER)
|
||||
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
|
||||
index eb1dc68e..9262bc8c 100644
|
||||
--- a/glslang/CMakeLists.txt
|
||||
+++ b/glslang/CMakeLists.txt
|
||||
@@ -254,6 +254,8 @@ if(GLSLANG_ENABLE_INSTALL)
|
||||
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)
|
||||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
endif()
|
||||
|
||||
set(PUBLIC_HEADERS
|
||||
diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in
|
||||
new file mode 100644
|
||||
index 00000000..594db293
|
||||
--- /dev/null
|
||||
+++ b/glslang/glslang.pc.cmake.in
|
||||
@@ -0,0 +1,11 @@
|
||||
+ prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+
|
||||
+ Name: @PROJECT_NAME@
|
||||
+ Description: OpenGL and OpenGL ES shader front end and validator
|
||||
+ Requires:
|
||||
+ Version: @VERSION@
|
||||
+ Libs: -L${libdir} -lglslang -lOSDependent -lSPVRemapper
|
||||
+ Cflags: -I${includedir}
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.47.1
|
||||
|
||||
if(ENABLE_SPVREMAPPER)
|
||||
set(REMAPPER_SOURCES spirv-remap.cpp)
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
--- a/StandAlone/CMakeLists.txt
|
||||
+++ b/StandAlone/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_library(glslang-default-resource-limits
|
||||
+add_library(glslang-default-resource-limits STATIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp)
|
||||
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
|
||||
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
@ -1,25 +1,30 @@
|
||||
%global commit 07a55839eed550d84ef62e0c7f503e0d67692708
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date 20200128
|
||||
%global gitrel .%{commit_date}.git%{shortcommit}
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.6.5)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 1;
|
||||
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.4.313.0
|
||||
|
||||
Name: glslang
|
||||
Version: 8.13.3559
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Version: 15.3.0
|
||||
Release: %autorelease
|
||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||
|
||||
License: BSD and GPLv3+ and ASL 2.0
|
||||
URL: https://github.com/KhronosGroup
|
||||
Source0: %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
|
||||
Patch1: glslang-default-resource-limits_staticlib.patch
|
||||
# Patch to build against system spirv-tools
|
||||
License: BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-2.0
|
||||
URL: https://github.com/KhronosGroup/%{name}
|
||||
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
|
||||
|
||||
BuildRequires: cmake3
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: python3
|
||||
BuildRequires: spirv-tools-devel
|
||||
|
||||
%description
|
||||
@ -37,105 +42,292 @@ ES and OpenGL shading languages. It implements a strict
|
||||
interpretation of the specifications for these languages.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{commit}
|
||||
%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
|
||||
|
||||
%build
|
||||
%__mkdir_p build
|
||||
pushd build
|
||||
%cmake3 -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=yes \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-GNinja ..
|
||||
%{ninja_build}
|
||||
popd
|
||||
%cmake3 -DBUILD_SHARED_LIBS=OFF
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%{ninja_install} -C build
|
||||
%{cmake_install}
|
||||
|
||||
# we don't want them in here
|
||||
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
|
||||
%check
|
||||
pushd Test
|
||||
./runtests localResults ../build/StandAlone/glslangValidator ../build/StandAlone/spirv-remap
|
||||
./runtests localResults ../%{_vpath_builddir}/StandAlone/glslangValidator ../%{_vpath_builddir}/StandAlone/spirv-remap
|
||||
popd
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc README.md README-spirv-remap.txt
|
||||
%{_bindir}/glslang
|
||||
%{_bindir}/glslangValidator
|
||||
%{_bindir}/spirv-remap
|
||||
|
||||
%files devel
|
||||
%{_includedir}/glslang/
|
||||
%{_libdir}/libHLSL.a
|
||||
%{_libdir}/libOGLCompiler.a
|
||||
%{_libdir}/libOSDependent.a
|
||||
%{_libdir}/libSPIRV.a
|
||||
%{_libdir}/libSPVRemapper.a
|
||||
%{_libdir}/libglslang.a
|
||||
%{_libdir}/libGenericCodeGen.a
|
||||
%{_libdir}/libMachineIndependent.a
|
||||
%{_libdir}/libglslang-default-resource-limits.a
|
||||
%{_libdir}/pkgconfig/glslang.pc
|
||||
%{_libdir}/pkgconfig/spirv.pc
|
||||
%{_libdir}/cmake/*
|
||||
|
||||
%changelog
|
||||
## START: Generated by rpmautospec
|
||||
* Thu Jun 19 2025 Anusha Srivatsa <asrivats@redhat.com> - 15.3.0-1
|
||||
- Update to SDK v1.4.313
|
||||
|
||||
* Tue Jan 21 2025 José Expósito <jexposit@redhat.com> - 15.1.0-1
|
||||
- Update to 1.4.304.0 SDK
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 14.2.0-5
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* Sat Jan 29 2022 Jan Grulich <jgrulich@redhat.com> - 11.7.0-5
|
||||
- Fix encoding/decoding of string literals for bug-endian systems
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* Tue May 18 2021 Dave Airlie <airlied@redhat.com> - 11.4.0-1
|
||||
- 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-6
|
||||
- Latest snapshot used in 1.2.162 sdk
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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.
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-10
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
- Update glslang for 8.2.0 for vulkan 1.2
|
||||
- Update to latest git snapshot
|
||||
|
||||
* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-2
|
||||
- Update for 8.2.0
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.13.3496-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-1
|
||||
- Update to latest snapshot
|
||||
* Thu Dec 19 2019 leigh123linux <leigh123linux@googlemail.com> - 7.13.3496-5
|
||||
- Add patch for 'Fix a couple relative header paths in header'
|
||||
|
||||
* Thu Aug 15 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-4
|
||||
- Fix coverity scans (Kamil Dudka)
|
||||
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-4
|
||||
- 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
|
||||
- Latest upstream snapshot for validation layers build
|
||||
- Add patch to build against system spirv-tools
|
||||
|
||||
* Tue Feb 12 2019 Dave Airlie <airlied@redhat.com> - 3.1-0.11.20190329.gite0d59bb
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.11.3214-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jun 10 2019 Robert-André Mauchin <zebob.m@gmail.com> - 7.11.3214-1
|
||||
- Release 7.11.3214 Add patch to build against system spirv-tools
|
||||
|
||||
* Fri Mar 29 2019 Dave Airlie <airlied@redhat.com> - 3.1-14
|
||||
- update to latest glslang snapshot
|
||||
|
||||
* Tue Feb 12 2019 Dave Airlie <airlied@redhat.com> - 3.1-13
|
||||
- Update for vulkan 1.1.92.0
|
||||
- Update for vulkan 1.1.101.0
|
||||
|
||||
* Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.10.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
|
||||
|
||||
* Tue Aug 07 2018 leigh123linux <leigh123linux@googlemail.com> - 3.1-11
|
||||
- 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
- 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
|
||||
|
||||
## END: Generated by rpmautospec
|
||||
|
||||
Loading…
Reference in New Issue
Block a user