Merge pull request #328628 from alyssais/mesa-ffmpeg

mesa: backport upstream revert for ffmpeg compat
2024-07-20 13:28:15 +03:00
parent e5ccc40ecd 48b8f5f651
commit 78a2b3855a
1 changed files with 8 additions and 0 deletions
@@ -6,6 +6,7 @@
 , expat
 , fetchCrate
 , fetchurl
+, fetchpatch
 , file
 , flex
 , glslang
@@ -137,6 +138,13 @@ in stdenv.mkDerivation {

  patches = [
    ./opencl.patch
+
+    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533
+    (fetchpatch {
+      name = "ffmpeg.patch";
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/241f70e5a13bb9c13a168282446ad074e16c3d74.patch";
+      hash = "sha256-Cx7OL8iXGAOuDbCQReCCxSrWYvfZVrGoP0txIKSLTvs=";
+    })
  ];

  postPatch = ''