libplacebo: use upstreamed patch

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
This commit is contained in:
Arthur Gautier 2021-01-07 23:17:47 +00:00 committed by Michael Weiss
parent e597a82ae6
commit 95b754cf42
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 5 additions and 14 deletions

View File

@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
version = "2.72.2";
patches = [
./glsl-import.patch
(fetchpatch {
# support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131
url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch";
sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc";
})
];
src = fetchFromGitLab {

View File

@ -1,13 +0,0 @@
diff --git a/src/glsl/glslang.cc b/src/glsl/glslang.cc
index f701acc..c64cbf5 100644
--- a/src/glsl/glslang.cc
+++ b/src/glsl/glslang.cc
@@ -26,7 +26,7 @@ extern "C" {
#include <glslang/Include/ResourceLimits.h>
#include <glslang/Public/ShaderLang.h>
-#include <SPIRV/GlslangToSpv.h>
+#include <glslang/SPIRV/GlslangToSpv.h>
#include "glslang.h"