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

ffmpeg: enable libvpx on Darwin

Browse Source
This commit is contained in:
Andrew Childs 2018-07-16 13:15:42 +09:00
parent e8b29688c8
commit 2d9cc7a3bf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -26,7 +26,7 @@
* see `ffmpeg-full' for an ffmpeg build with all features included. * see `ffmpeg-full' for an ffmpeg build with all features included.
* *
* Need fixes to support Darwin: * Need fixes to support Darwin:
* libvpx pulseaudio * pulseaudio
* *
* Known issues: * Known issues:
* 0.6 - fails to compile (unresolved) (so far, only disabling a number of * 0.6 - fails to compile (unresolved) (so far, only disabling a number of
@ -58,6 +58,8 @@ let
disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg; disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg;
vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32); vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32);
vpxSupport = reqMin "0.6" && !isAarch32;
in in
assert openglSupport -> libGLU_combined != null; assert openglSupport -> libGLU_combined != null;
@ -130,7 +132,7 @@ stdenv.mkDerivation rec {
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
"--enable-vdpau" "--enable-vdpau"
"--enable-libvorbis" "--enable-libvorbis"
(disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx") (ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
(ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.4" "--enable-lzma")
(ifMinVer "2.2" (enableFeature openglSupport "opengl")) (ifMinVer "2.2" (enableFeature openglSupport "opengl"))
(disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse")
@ -159,7 +161,8 @@ stdenv.mkDerivation rec {
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
] ++ optional openglSupport libGLU_combined ] ++ optional openglSupport libGLU_combined
++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
++ optional isLinux alsaLib ++ optional isLinux alsaLib
++ optionals isDarwin darwinFrameworks ++ optionals isDarwin darwinFrameworks