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

* ffmpeg updated to 0.8. Disable libvorbis and libxvidcore support by

Browse Source 
default because ffmpeg (libavcodec) has native support for those
  formats.

svn path=/nixpkgs/branches/kde-4.7/; revision=27943
This commit is contained in:
Eelco Dolstra 2011-07-25 14:35:54 +00:00
parent b7556bdf10
commit 2ef93dae71
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/default.nix
View File

@ -2,10 +2,10 @@
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vorbisSupport ? false, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, xvidSupport ? false, xvidcore ? null
, faacSupport ? false, faac ? null
}:
@ -17,11 +17,11 @@ assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
stdenv.mkDerivation rec {
name = "ffmpeg-0.7-rc1";
name = "ffmpeg-0.8";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "07ma2b80nslwwy4ddfrz8k575dxyc8x9mvja55ghrwxys8lkhw2m";
sha256 = "03zwwc1qs117pfjk9r071fbx4al3j0c85j97dgwqc0wp2z1zs9iy";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional faacSupport faac;
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [