alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Updating ffmpeg and libvpx.

Browse source 
svn path=/nixpkgs/trunk/; revision=26938
This commit is contained in:
Lluís Batlle i Rossell 2011-04-23 20:58:52 +00:00
parent 1a83a07123
commit 3b0ea0e5d4
2 changed files with 50 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
pkgs/development/libraries/ffmpeg/default.nix
View file

@ -1,12 +1,25 @@
{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm
, vpxSupport ? false, libvpx ? null}:
{stdenv, fetchurl, pkgconfig, yasm
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null}:
stdenv.mkDerivation {
name = "ffmpeg-0.6";
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
stdenv.mkDerivation rec {
name = "ffmpeg-0.6.90-rc0";
src = fetchurl {
url = http://www.ffmpeg.org/releases/ffmpeg-0.6.tar.bz2;
sha256 = "08419kg2i8j7x4mb3vm6a73fdszivj6lzh7lypxby30gfnkblc37";
url = http://www.ffmpeg.org/releases/ffmpeg-0.6.90-rc0.tar.bz2;
sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@ -18,20 +31,35 @@ stdenv.mkDerivation {
"--enable-swscale"
"--disable-ffserver"
"--disable-ffplay"
"--enable-libfaad"
"--enable-shared"
"--enable-libtheora"
"--enable-libvorbis"
"--enable-libspeex"
"--enable-libx264"
"--enable-libxvid"
"--enable-libmp3lame"
"--enable-runtime-cpudetect"
] ++
stdenv.lib.optional vpxSupport "--enable-libvpx";
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid";
buildInputs = [ faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm ]
++ stdenv.lib.optional vpxSupport libvpx;
buildInputs = [ pkgconfig lame yasm ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
meta = {
homepage = http://www.ffmpeg.org/;

10
pkgs/development/libraries/libvpx/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, bash, yasm}:
{stdenv, fetchurl, bash, yasm, which}:
stdenv.mkDerivation rec {
name = "libvpx-0.9.1";
name = "libvpx-0.9.6";
src = fetchurl {
url = http://webm.googlecode.com/files/libvpx-0.9.1.tar.bz2;
sha256 = "0ngc8y12np2q6yhrrn6cbmlbzwbk10fnldj8d5dxxzvrw1iy9s64";
url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2;
sha256 = "0wxay9wss4lawrcmnwqkpy0rdnaih1k7ilzh284mgyqnya78mg98";
};
patchPhase = ''
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
make quiet=false DIST_DIR=$out install
'';
buildInputs = [ yasm ];
buildInputs = [ yasm which ];
meta = {
description = "VP8 video encoder";