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

ffmpeg: add support for libssh and speex (#46078)

Browse Source
This commit is contained in:
Jan Malakhovski 2018-09-05 15:17:01 +00:00 committed by xeji
parent 7fac51740a
commit 6abd75067a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus , x264, x265, xvidcore, zlib, libopus, speex
, openglSupport ? false, libGLU_combined ? null , openglSupport ? false, libGLU_combined ? null
# Build options # Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
"--enable-libmp3lame" "--enable-libmp3lame"
(ifMinVer "1.2" "--enable-iconv") (ifMinVer "1.2" "--enable-iconv")
"--enable-libtheora" "--enable-libtheora"
"--enable-libssh"
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
"--enable-vdpau" "--enable-vdpau"
"--enable-libvorbis" "--enable-libvorbis"
@ -141,6 +142,7 @@ stdenv.mkDerivation rec {
"--enable-libxvid" "--enable-libxvid"
"--enable-zlib" "--enable-zlib"
(ifMinVer "2.8" "--enable-libopus") (ifMinVer "2.8" "--enable-libopus")
"--enable-libspeex"
(ifMinVer "2.8" "--enable-libx265") (ifMinVer "2.8" "--enable-libx265")
# Developer flags # Developer flags
(enableFeature debugDeveloper "debug") (enableFeature debugDeveloper "debug")
@ -157,8 +159,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
] ++ optional openglSupport libGLU_combined ] ++ optional openglSupport libGLU_combined
++ optional vpxSupport libvpx ++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM