Author: viric
Date: Mon Jan 30 21:02:08 2012
New Revision: 31937
URL: https://nixos.org/websvn/nix/?rev=31937&sc=1
Log:
Updating ffmpeg/x264/vpx
Modified:
nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix
nixpkgs/trunk/pkgs/development/libraries/x264/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Mon Jan 30
19:05:24 2012 (r31936)
+++ nixpkgs/trunk/pkgs/development/libraries/ffmpeg/default.nix Mon Jan 30
21:02:08 2012 (r31937)
@@ -18,11 +18,11 @@
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
Modified: nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix Mon Jan 30
19:05:24 2012 (r31936)
+++ nixpkgs/trunk/pkgs/development/libraries/libvpx/default.nix Mon Jan 30
21:02:08 2012 (r31937)
@@ -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 @@
make quiet=false DIST_DIR=$out install
'';
- buildInputs = [ yasm which ];
+ buildInputs = [ yasm which perl ];
meta = {
description = "VP8 video encoder";
Modified: nixpkgs/trunk/pkgs/development/libraries/x264/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/x264/default.nix Mon Jan 30
19:05:24 2012 (r31936)
+++ nixpkgs/trunk/pkgs/development/libraries/x264/default.nix Mon Jan 30
21:02:08 2012 (r31937)
@@ -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 = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
