movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #336177 from emilazy/push-pymyuwlmlqkl

Browse source 
mediastreamer: add Debian patch for FFmpeg ≥ 5
This commit is contained in:
Johannes Jöns 2024-08-24 19:24:22 +00:00 • committed by GitHub
commit c4f90a2c2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/mediastreamer/default.nix
View file

@ -2,7 +2,8 @@
, bzrtp , bzrtp
, cmake , cmake
, fetchFromGitLab , fetchFromGitLab
, ffmpeg_4 , fetchpatch2
, ffmpeg_7
, glew , glew
, gsm , gsm
, lib , lib
@ -43,6 +44,12 @@ stdenv.mkDerivation rec {
# plugin directory with desired plugins and wrap executables so that the # plugin directory with desired plugins and wrap executables so that the
# environment variable points to that directory. # environment variable points to that directory.
./plugins_dir.patch ./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 = [ nativeBuildInputs = [
@ -58,7 +65,7 @@ stdenv.mkDerivation rec {
bzrtp bzrtp
ortp ortp
ffmpeg_4 ffmpeg_7
glew glew
libX11 libX11
libXext libXext