diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-01-30 21:02:08 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-01-30 21:02:08 +0000 |
| commit | d341b2537c4a11a6b05e4ee27a55d611aa11c44c (patch) | |
| tree | b0d7255d4c04c3ecdb180b45b3f93ab1fdfb203f /pkgs/development | |
| parent | 37b404816a45bd66e37617e198d20c2dd0653465 (diff) | |
| download | nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.tar nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.tar.gz nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.tar.bz2 nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.tar.lz nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.tar.xz nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.tar.zst nixpkgs-d341b2537c4a11a6b05e4ee27a55d611aa11c44c.zip | |
Updating ffmpeg/x264/vpx
svn path=/nixpkgs/trunk/; revision=31937
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libvpx/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/x264/default.nix | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index b77b52a5e65..38f12f779b6 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -18,11 +18,11 @@ assert xvidSupport -> xvidcore != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.8.1"; + name = "ffmpeg-0.10"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v"; + sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 2bbd4d89c3b..0d1a2cacc46 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, bash, yasm, which}: +{stdenv, fetchurl, bash, yasm, which, perl}: stdenv.mkDerivation rec { - name = "libvpx-0.9.6"; + name = "libvpx-1.0.0"; src = fetchurl { - url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2; - sha256 = "0wxay9wss4lawrcmnwqkpy0rdnaih1k7ilzh284mgyqnya78mg98"; + url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2; + sha256 = "08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7"; }; patchPhase = '' sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \ - examples/gen_example_code.sh + examples/gen_example_code.sh build/make/gen_asm_deps.sh sed -e '/enable linux/d' -i configure ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { make quiet=false DIST_DIR=$out install ''; - buildInputs = [ yasm which ]; + buildInputs = [ yasm which perl ]; meta = { description = "VP8 video encoder"; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 0bba7af5c3d..a5e045d27d6 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { - version = "snapshot-20110724-2245-stable"; + version = "snapshot-20120129-2245-stable"; name = "x264-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "07bylkh8cwcmj01sr41hhrvfbciyixhw1irdpj01kz9d0h8dhhpz"; + sha256 = "1i63xsa46a5l0ys3mqbcqr4gr5kpaf9fs05cbf0782iir5k07pcr"; }; patchPhase = '' |