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

ffmpeg-full: Disable libmfx and nvenc on AArch64 to fix the build

Browse Source 
The AArch64 build was failing since 2019-03-26:
https://hydra.nixos.org/build/98821440
This commit is contained in:
Michael Weiss 2019-08-23 11:01:47 +02:00
parent 1537ce23b1
commit 4469c2333c
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@
, libXv ? null # Xlib support , libXv ? null # Xlib support
, libXext ? null # Xlib support , libXext ? null # Xlib support
, lzma ? null # xz-utils , lzma ? null # xz-utils
, nvenc ? !stdenv.isDarwin, nv-codec-headers ? null # NVIDIA NVENC support , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support , openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
@ -164,6 +164,9 @@
* libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab
* wavpack x265 xavs * wavpack x265 xavs
* *
* Need fixes to support AArch64:
* libmfx(intel-media-sdk) nvenc
*
* Not supported: * Not supported:
* stagefright-h264(android only) * stagefright-h264(android only)
* *
@ -176,7 +179,7 @@
*/ */
let let
inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux; inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64;
inherit (stdenv.lib) optional optionals optionalString enableFeature; inherit (stdenv.lib) optional optionals optionalString enableFeature;
in in
@ -350,7 +353,7 @@ stdenv.mkDerivation rec {
(enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394")
(enableFeature (libiconv != null) "iconv") (enableFeature (libiconv != null) "iconv")
#(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
(enableFeature (if isLinux then libmfx != null else false) "libmfx") (enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx")
(enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmodplug != null) "libmodplug")
(enableFeature (libmysofa != null) "libmysofa") (enableFeature (libmysofa != null) "libmysofa")
#(enableFeature (libnut != null) "libnut") #(enableFeature (libnut != null) "libnut")
@ -423,7 +426,7 @@ stdenv.mkDerivation rec {
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optional (isLinux && libmfx != null) libmfx ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
++ optional nvenc nv-codec-headers ++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration MediaToolbox VideoDecodeAcceleration