From 76ea10b4a20e7ef68197b3fc302af460067dce95 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 00:35:15 +0100 Subject: [PATCH] =?UTF-8?q?mediastreamer:=20add=20Debian=20patch=20for=20F?= =?UTF-8?q?Fmpeg=20=E2=89=A5=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/mediastreamer/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index f7549376d0bdd..cdd1eb3bdbf7c 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -2,7 +2,8 @@ , bzrtp , cmake , fetchFromGitLab -, ffmpeg_4 +, fetchpatch2 +, ffmpeg_7 , glew , gsm , lib @@ -43,6 +44,12 @@ stdenv.mkDerivation rec { # plugin directory with desired plugins and wrap executables so that the # environment variable points to that directory. ./plugins_dir.patch + + # Port to ffmpeg 5.0 API + (fetchpatch2 { + url = "https://salsa.debian.org/pkg-voip-team/linphone-stack/mediastreamer2/-/raw/4e7784802d2eac57dffe210c8c23e696f40ac6ec/debian/patches/ffmpeg_5_0_fixes.patch"; + hash = "sha256-5ay4iVbx8IOX952HEFaKLBGKLRYUWRntufciApUVhh0="; + }) ]; nativeBuildInputs = [ @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg_4 + ffmpeg_7 glew libX11 libXext