Author: NicolasPierron
Date: Wed Jul 27 21:00:09 2011
New Revision: 27980
URL: https://svn.nixos.org/websvn/nix/?rev=27980&sc=1
Log:
ffmpeg: Add previous version to fix fuppes.
Added:
nixpkgs/trunk/pkgs/development/libraries/ffmpeg/0.6.90.nix
- copied, changed from r27976,
nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/ffmpeg/0.6.90.nix
(from r27976, nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Wed Jul 27
16:42:00 2011 (r27976, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/ffmpeg/0.6.90.nix Wed Jul 27
21:00:09 2011 (r27980)
@@ -15,15 +15,16 @@
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
+assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
- name = "ffmpeg-0.7-rc1";
-
+ name = "ffmpeg-0.6.90-rc0";
+
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";;
- sha256 = "07ma2b80nslwwy4ddfrz8k575dxyc8x9mvja55ghrwxys8lkhw2m";
+ sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f";
};
-
+
# `--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.
Modified: nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Wed Jul 27
20:55:39 2011 (r27979)
+++ nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Wed Jul 27
21:00:09 2011 (r27980)
@@ -15,6 +15,7 @@
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
+assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
name = "ffmpeg-0.7-rc1";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 27 20:55:39
2011 (r27979)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 27 21:00:09
2011 (r27980)
@@ -657,7 +657,9 @@
ftgl = callPackage ../development/libraries/ftgl { };
- fuppes = callPackage ../tools/networking/fuppes {};
+ fuppes = callPackage ../tools/networking/fuppes {
+ ffmpeg = ffmpeg_0_6_90;
+ };
fsfs = callPackage ../tools/filesystems/fsfs { };
@@ -3100,6 +3102,10 @@
vpxSupport = if !stdenv.isMips then true else false;
};
+ ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
+ vpxSupport = if !stdenv.isMips then true else false;
+ };
+
fftw = callPackage ../development/libraries/fftw {
singlePrecision = false;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
