MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ffmpeg: update to 1.2 (and patching mplayer2)

Browse source 
Simple patch required by mplayer2 to build with ffmpeg 1.2.
This commit is contained in:
Lluís Batlle i Rossell 2013-04-04 22:57:08 +02:00
parent bbbedf56c6
commit d0d4e66652
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/video/mplayer2/default.nix
View file

@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
sed -i /^_install_strip/d configure sed -i /^_install_strip/d configure
sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c
''; '';
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;

4
pkgs/development/libraries/ffmpeg/1.1.nix → pkgs/development/libraries/ffmpeg/1.x.nix
View file

@ -29,11 +29,11 @@ assert x11grabSupport -> libXext != null && libXfixes != null;
assert playSupport -> SDL != null; assert playSupport -> SDL != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-1.1.3"; name = "ffmpeg-1.2";
src = fetchurl { src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs";
}; };
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

10
pkgs/top-level/all-packages.nix
View file

@ -556,7 +556,7 @@ let
cfdg = builderDefsPackage ../tools/graphics/cfdg { cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex; inherit libpng bison flex;
ffmpeg = ffmpeg_1_1; ffmpeg = ffmpeg_1;
}; };
checkinstall = callPackage ../tools/package-management/checkinstall { }; checkinstall = callPackage ../tools/package-management/checkinstall { };
@ -3653,7 +3653,7 @@ let
vpxSupport = !stdenv.isMips; 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; vpxSupport = !stdenv.isMips;
}; };
@ -4618,7 +4618,7 @@ let
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
mlt = callPackage ../development/libraries/mlt { mlt = callPackage ../development/libraries/mlt {
ffmpeg = ffmpeg_1_1; ffmpeg = ffmpeg_1;
}; };
libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
@ -7504,7 +7504,7 @@ let
}; };
mplayer2 = callPackage ../applications/video/mplayer2 { mplayer2 = callPackage ../applications/video/mplayer2 {
ffmpeg = ffmpeg_1_1; ffmpeg = ffmpeg_1;
}; };
MPlayerPlugin = browser: MPlayerPlugin = browser:
@ -7974,7 +7974,7 @@ let
}; };
vlc = callPackage ../applications/video/vlc { vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_1_1; ffmpeg = ffmpeg_1;
}; };
vnstat = callPackage ../applications/networking/vnstat { }; vnstat = callPackage ../applications/networking/vnstat { };