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

Merge pull request #105999 from midchildan/feat/ffmpeg-darwin-x265

Browse Source 
ffmpeg-full: re-enable encoders on macOS
This commit is contained in:
Mario Rodas 2020-12-05 18:23:58 -05:00 committed by GitHub
commit 30fbc30610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -164,9 +164,8 @@
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
*
* Need fixes to support Darwin:
* frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh
* libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab
* wavpack x265 xavs
* gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba
* vid-stab
*
* Need fixes to support AArch64:
* libmfx(intel-media-sdk) nvenc

6
pkgs/top-level/all-packages.nix
View File

@ -12784,18 +12784,12 @@ in
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
# The following need to be fixed on Darwin
frei0r = if stdenv.isDarwin then null else frei0r;
game-music-emu = if stdenv.isDarwin then null else game-music-emu;
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;
openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
rav1e = if stdenv.isDarwin then null else rav1e;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265;
xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;