Add patch for 'Fix a couple relative header paths in header'

This commit is contained in:
leigh123linux 2019-12-19 12:11:03 +00:00
parent 41facc4a37
commit 00e26530c6
2 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,37 @@
From b5d9dee710f2bda42afbc6f2ce84b5836908d021 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Mon, 9 Dec 2019 03:12:10 -0700
Subject: [PATCH] Fix #2007: Fix a couple relative header paths in header
files.
---
SPIRV/GlslangToSpv.h | 2 +-
SPIRV/SpvTools.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
index 86e1c23bf..3907be43b 100755
--- a/SPIRV/GlslangToSpv.h
+++ b/SPIRV/GlslangToSpv.h
@@ -40,7 +40,7 @@
#endif
#include "SpvTools.h"
-#include "../glslang/Include/intermediate.h"
+#include "glslang/Include/intermediate.h"
#include <string>
#include <vector>
diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h
index 7422d0126..59c914da0 100644
--- a/SPIRV/SpvTools.h
+++ b/SPIRV/SpvTools.h
@@ -46,7 +46,7 @@
#include <ostream>
#endif
-#include "../glslang/MachineIndependent/localintermediate.h"
+#include "glslang/MachineIndependent/localintermediate.h"
#include "Logger.h"
namespace glslang {

View File

@ -5,7 +5,7 @@
Name: glslang Name: glslang
Version: 7.13.3496 Version: 7.13.3496
Release: 1%{?gitrel}%{?dist} Release: 2%{?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
@ -15,6 +15,7 @@ Patch1: glslang-default-resource-limits_staticlib.patch
Patch2: glslang-lib-install.patch Patch2: glslang-lib-install.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
Patch4: %url/%{name}/commit/b5d9dee710f2bda42afbc6f2ce84b5836908d021.patch#/fix_relative_header_paths.patch
BuildRequires: cmake3 BuildRequires: cmake3
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -83,6 +84,9 @@ install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildro
%{_libdir}/cmake/* %{_libdir}/cmake/*
%changelog %changelog
* Thu Dec 19 2019 Leigh Scott <leigh123linux@googlemail.com> - 7.13.3496-2.20191102.git7f77b2e
- 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-1
- Latest upstream snapshot for validation layers build - Latest upstream snapshot for validation layers build