Merge pull request #108730 from baloo/baloo/libplacebo/path-upsteam-patch

libplacebo: use upstreamed patch

pkgs/development/libraries/libplacebo/default.nix

@@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
   version = "3.104.0";
 
   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 {

pkgs/development/libraries/libplacebo/glsl-import.patch

@@ -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"
-