From 48b8f5f651f312fb0671a8e186478d55e8c091b7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 20 Jul 2024 11:42:34 +0200
Subject: [PATCH] mesa: backport upstream revert for ffmpeg compat

---
 pkgs/development/libraries/mesa/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1c4e8f7ebb02..2266716bd9da 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -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 = ''