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

Merge pull request #8038 from codyopel/ffmpeg-networking

Browse Source 
ffmpeg: include networking support
This commit is contained in:
William A. Kennington III 2015-05-29 00:54:15 -07:00
commit de6f236bbb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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, libiconv, lame, libass, libogg, libtheora , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264 , libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr
, xvidcore, zlib , x264, xvidcore, zlib
, openglSupport ? false, mesa ? null , openglSupport ? false, mesa ? null
# Build options # Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@ -85,6 +85,7 @@ stdenv.mkDerivation rec {
else else
"--disable-pthreads --disable-w32threads") "--disable-pthreads --disable-w32threads")
(ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2 (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2
"--enable-network"
(ifMinVer "2.4" "--enable-pixelutils") (ifMinVer "2.4" "--enable-pixelutils")
# Executables # Executables
"--enable-ffmpeg" "--enable-ffmpeg"
@ -105,6 +106,7 @@ stdenv.mkDerivation rec {
(ifMinVer "0.6" "--disable-doc") (ifMinVer "0.6" "--disable-doc")
# External Libraries # External Libraries
"--enable-bzlib" "--enable-bzlib"
"--enable-gnutls"
(ifMinVer "1.0" "--enable-fontconfig") (ifMinVer "1.0" "--enable-fontconfig")
(ifMinVer "0.7" "--enable-libfreetype") (ifMinVer "0.7" "--enable-libfreetype")
"--enable-libmp3lame" "--enable-libmp3lame"
@ -134,8 +136,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
libvorbis lzma SDL soxr x264 xvidcore zlib libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
] ++ optional openglSupport mesa ] ++ optional openglSupport mesa
++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
++ optional (isLinux || isFreeBSD) libva ++ optional (isLinux || isFreeBSD) libva