Author: eelco
Date: Mon Jul 25 14:35:54 2011
New Revision: 27943
URL: https://svn.nixos.org/websvn/nix/?rev=27943&sc=1
Log:
* ffmpeg updated to 0.8. Disable libvorbis and libxvidcore support by
default because ffmpeg (libavcodec) has native support for those
formats.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/ffmpeg/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/ffmpeg/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/ffmpeg/default.nix
Mon Jul 25 14:34:05 2011 (r27942)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/ffmpeg/default.nix
Mon Jul 25 14:35:54 2011 (r27943)
@@ -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 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.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional faacSupport faac;
+ enableParallelBuilding = true;
+
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
