diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-04-04 22:57:08 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-04-04 23:07:23 +0200 |
| commit | d0d4e66652bc48b561138d6588525f9af3f0acea (patch) | |
| tree | 2e28602d6973932d9e7d981d2caf4f45ff38062d | |
| parent | bbbedf56c6c4aa36606f54389e28e996d4e28cb0 (diff) | |
| download | nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.tar nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.tar.gz nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.tar.bz2 nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.tar.lz nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.tar.xz nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.tar.zst nixpkgs-d0d4e66652bc48b561138d6588525f9af3f0acea.zip | |
ffmpeg: update to 1.2 (and patching mplayer2)
Simple patch required by mplayer2 to build with ffmpeg 1.2.
| -rw-r--r-- | pkgs/applications/video/mplayer2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/1.x.nix (renamed from pkgs/development/libraries/ffmpeg/1.1.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 79c25d65c05..2f35d02eb90 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -74,6 +74,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i /^_install_strip/d configure + + sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c ''; buildInputs = with stdenv.lib; diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 31a163922d8..119e785ea4f 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -29,11 +29,11 @@ assert x11grabSupport -> libXext != null && libXfixes != null; assert playSupport -> SDL != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.1.3"; + name = "ffmpeg-1.2"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; + sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b3fc7cbd52..beb1bfcf726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -556,7 +556,7 @@ let cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex; - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -3653,7 +3653,7 @@ let vpxSupport = !stdenv.isMips; }; - ffmpeg_1_1 = callPackage ../development/libraries/ffmpeg/1.1.nix { + ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { vpxSupport = !stdenv.isMips; }; @@ -4618,7 +4618,7 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mlt = callPackage ../development/libraries/mlt { - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -7504,7 +7504,7 @@ let }; mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; MPlayerPlugin = browser: @@ -7974,7 +7974,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1_1; + ffmpeg = ffmpeg_1; }; vnstat = callPackage ../applications/networking/vnstat { }; |