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

Adding xvid, to ffmpeg and mplayer.

Browse source 
svn path=/nixpkgs/trunk/; revision=21469
This commit is contained in:
Lluís Batlle i Rossell 2010-04-30 21:47:09 +00:00
parent fe7945b7fb
commit b3870f0148
4 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/MPlayer/default.nix
View file

@ -7,6 +7,7 @@
, amrnb ? null, amrwb ? null, amrSupport ? false
, jackaudioSupport ? false, jackaudio ? null
, x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null
, mesa, pkgconfig, unzip
}:
@ -63,7 +64,8 @@ stdenv.mkDerivation {
++ stdenv.lib.optional cddaSupport cdparanoia
++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]
++ stdenv.lib.optional x264Support x264;
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore;
configureFlags = ''
${if cacaSupport then "--enable-caca" else "--disable-caca"}

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig}:
{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore}:
stdenv.mkDerivation {
name = "ffmpeg-0.5.1";
@ -23,9 +23,10 @@ stdenv.mkDerivation {
--enable-libvorbis
--enable-libspeex
--enable-libx264
--enable-libxvid
'';
buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig];
buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore];
meta = {
homepage = http://www.ffmpeg.org/;

21
pkgs/development/libraries/xvidcore/default.nix Normal file
View file

@ -0,0 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "xvidcore-1.2.2";
src = fetchurl {
url = http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.bz2;
sha256 = "04bd1clv90i5pdwh6mz3mskyzmxyx5l2nx7lyyb8nhw9whnn0ap4";
};
preConfigure = ''
cd build/generic
'';
meta = {
description = "MPEG-4 video codec for PC";
homepage = http://www.xvid.org/;
license = "GPLv2+";
};
}

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

@ -3670,7 +3670,7 @@ let
};
ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig;
inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore;
};
fftw = import ../development/libraries/fftw {
@ -5247,6 +5247,10 @@ let
];
};
xvidcore = import ../development/libraries/xvidcore {
inherit fetchurl stdenv;
};
zangband = builderDefsPackage (import ../games/zangband) {
inherit ncurses flex bison autoconf automake m4 coreutils;
};
@ -7914,7 +7918,7 @@ let
MPlayer = import ../applications/video/MPlayer {
inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav
cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264;
cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264 xvidcore;
inherit (xlibs) libX11 libXv libXinerama libXrandr;
alsaSupport = true;
alsa = alsaLib;
@ -7925,6 +7929,7 @@ let
cddaSupport = true;
amrSupport = getConfig [ "MPlayer" "amr" ] false;
x264Support = true;
xvidSupport = true;
};
MPlayerPlugin = browser: