gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for FFmpeg 7, round 1 (#340640)

Browse Source
This commit is contained in:
Emily
2024-09-16 17:56:23 +01:00
committed by GitHub
parent b45e06c521 b1a93bb5c4
commit d101d2785b
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
+13
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, pkg-config
, cmake
, ninja
@@ -42,6 +43,18 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
patches = [
# Remove usage of AVCodecContext::reordered_opaque
(fetchpatch2 {
name = "webrtc-ffmpeg-7.patch";
url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";
decode = "base64 -d";
stripLen = 1;
extraPrefix = "src/";
hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU=";
})
];
postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+13
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
pkg-config,
cmake,
crc32c,
@@ -41,6 +42,18 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
patches = [
# Remove usage of AVCodecContext::reordered_opaque
(fetchpatch2 {
name = "webrtc-ffmpeg-7.patch";
url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";
decode = "base64 -d";
stripLen = 1;
extraPrefix = "src/";
hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU=";
})
];
outputs = [
"out"
"dev"
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -9350,7 +9350,7 @@ with pkgs;
lesspipe = callPackage ../tools/misc/lesspipe { };
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg-full;
ffmpeg = ffmpeg_6-full;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
pkgs/top-level/ocaml-packages.nix
+7 -7
View File
@@ -510,31 +510,31 @@ let
ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { };
ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox;
};
ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox;
};
ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox;
};
ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix {
inherit (pkgs) ffmpeg;
ffmpeg = pkgs.ffmpeg_6;
inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox;
};