Author: eelco
Date: Fri Jul 15 12:20:34 2011
New Revision: 27797
URL: https://svn.nixos.org/websvn/nix/?rev=27797&sc=1
Log:
* Added libav, a fork of ffmpeg.
Added:
nixpkgs/trunk/pkgs/development/libraries/libav/
nixpkgs/trunk/pkgs/development/libraries/libav/default.nix
- copied, changed from r27796,
nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/libav/default.nix
(from r27796, nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Fri Jul 15
10:02:22 2011 (r27796, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/libav/default.nix Fri Jul 15
12:20:34 2011 (r27797)
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, yasm
+{ stdenv, fetchurl, pkgconfig, yasm, xz
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
-, x264Support ? true, x264 ? null
+, x264Support ? false, x264 ? null
, xvidSupport ? true, xvidcore ? null
, faacSupport ? false, faac ? null
}:
@@ -17,13 +17,13 @@
assert xvidSupport -> xvidcore != null;
stdenv.mkDerivation rec {
- name = "ffmpeg-0.7-rc1";
+ name = "libav-0.7";
src = fetchurl {
- url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";;
- sha256 = "07ma2b80nslwwy4ddfrz8k575dxyc8x9mvja55ghrwxys8lkhw2m";
+ url = "http://libav.org/releases/${name}.tar.xz";;
+ sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz";
};
-
+
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
@@ -45,7 +45,7 @@
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
- buildInputs = [ pkgconfig lame yasm ]
+ buildInputs = [ pkgconfig lame yasm xz ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
@@ -66,7 +66,7 @@
};
meta = {
- homepage = http://www.ffmpeg.org/;
- description = "A complete, cross-platform solution to record, convert and
stream audio and video";
+ homepage = http://libav.org/;
+ description = "A complete, cross-platform solution to record, convert and
stream audio and video (fork of ffmpeg)";
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 15 10:02:22
2011 (r27796)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 15 12:20:34
2011 (r27797)
@@ -3554,6 +3554,8 @@
libassuan = callPackage ../development/libraries/libassuan { };
+ libav = callPackage ../development/libraries/libav { };
+
libavc1394 = callPackage ../development/libraries/libavc1394 { };
libbluedevil = callPackage ../development/libraries/libbluedevil { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
