Latest upstream snapshot for validation layers build

This commit is contained in:
Dave Airlie 2019-08-04 07:20:19 +10:00
parent 96e53fc51f
commit 2c9e7cf77d
3 changed files with 11 additions and 29 deletions

View File

@ -1,17 +1,16 @@
# %%global commit e0d59bbe1857e75134989eddb7437e9c068ec915 %global commit 3cea2e5882e3455731a8b6657fb06db913eb3aa1
# %%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) %global shortcommit %%(c=%%{commit}; echo ${c:0:7})
# %%global commit_date 20190610 %global commit_date 20190803
# %%global gitrel .%%{commit_date}.git%%{shortcommit} %global gitrel .%%{commit_date}.git%%{shortcommit}
Name: glslang Name: glslang
Version: 7.11.3214 Version: 7.11.3214
Release: 2%{?dist} Release: 3%{?gitrel}%{?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 URL: https://github.com/KhronosGroup
Source0: %url/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Patch0: nodate.patch
Patch1: glslang-default-resource-limits_staticlib.patch Patch1: glslang-default-resource-limits_staticlib.patch
Patch2: glslang_tests.patch Patch2: glslang_tests.patch
# Patch to build against system spirv-tools # Patch to build against system spirv-tools
@ -37,7 +36,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}-%{version} %autosetup -p1 -n %{name}-%{commit}
# 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
@ -84,6 +83,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro
%{_libdir}/pkgconfig/spirv.pc %{_libdir}/pkgconfig/spirv.pc
%changelog %changelog
* Sat Aug 03 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-3
- 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

View File

@ -1,20 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2017-08-07 20:22:29.456870387 +0200
---
StandAlone/spirv-remap.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: glslang/StandAlone/spirv-remap.cpp
===================================================================
--- a/StandAlone/spirv-remap.cpp
+++ b/StandAlone/spirv-remap.cpp
@@ -227,7 +227,7 @@ namespace {
}
}
else if (arg == "--version" || arg == "-V") {
- std::cout << basename(argv[0]) << " version 0.97 " << __DATE__ << " " << __TIME__ << std::endl;
+ std::cout << basename(argv[0]) << " version 0.97 " << std::endl;
exit(0);
} else if (arg == "--input" || arg == "-i") {
// Collect input files

View File

@ -1 +1 @@
SHA512 (glslang-7.11.3214.tar.gz) = 5e7f8c063b30fc5edf65898b2371f4128aead05008865d065de9d3a94354de787035067ec908651c7e88bf294251d1410929d2b1c19e03d9b51476ea8a7eae96 SHA512 (glslang-3cea2e5882e3455731a8b6657fb06db913eb3aa1.tar.gz) = 068154d530618a6e1dcdca75448d8dc9f5e3fc0a8b2a02e874417a22c3c907fe3ce3b8c444e944bece9ecf4e193f76d1c0b7040445ac0b224357988a4cf8cfdd