JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* ffmpeg: build with faad2 support. However, vlc still won't play

Browse Source 
mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501
This commit is contained in:
Eelco Dolstra 2009-03-10 22:45:27 +00:00
parent 44ac9e249c
commit 1485c905f7
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/video/vlc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, xlibs, libdvdnav { stdenv, fetchurl, perl, xlibs, libdvdnav
, zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa , zlib, a52dec, libmad, ffmpeg, alsa
, pkgconfig, dbus, hal, fribidi, qt4 , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -17,7 +17,13 @@ stdenv.mkDerivation {
pkgconfig dbus hal fribidi qt4 pkgconfig dbus hal fribidi qt4
]; ];
configureFlags = "--enable-alsa --disable-glx --disable-remoteosd"; configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad";
preBuild = ''
substituteInPlace modules/misc/freetype.c --replace \
/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
'';
meta = { meta = {
description = "Cross-platform media player and streaming server"; description = "Cross-platform media player and streaming server";

23
pkgs/development/libraries/faad2/default.nix
View File

@ -1,19 +1,18 @@
args: {stdenv, fetchurl}:
args.stdenv.mkDerivation {
name = "faad2-2.6.1";
src = args.fetchurl { stdenv.mkDerivation {
url = http://downloads.sourceforge.net/faac/faad2-2.6.1.tar.gz; name = "faad2-2.7";
sha256 = "0p1870qfpaadphdfphbcfalf6d25r30k3y1f7sa7ly4vq3hc5lla";
src = fetchurl {
url = mirror://sourceforge/faac/faad2-2.7.tar.bz2;
sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
}; };
preConfigure = "./bootstrap"; configureFlags = "--disable-static";
buildInputs =(with args; [autoconf automake libtool]);
meta = { meta = {
description="AAC audio decoding library"; description = "An open source MPEG-4 and MPEG-2 AAC decoder";
homepage = http://www.audiocoding.com/faad2.html; homepage = http://www.audiocoding.com/faad2.html;
license = "GPLv2"; license = "GPLv2";
}; };
} }

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

@ -1,4 +1,4 @@
{stdenv, fetchurl}: {stdenv, fetchurl, faad2}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ffmpeg-0.5"; name = "ffmpeg-0.5";
@ -19,8 +19,11 @@ stdenv.mkDerivation {
--enable-swscale --enable-swscale
--disable-ffserver --disable-ffserver
--disable-ffplay --disable-ffplay
--enable-libfaad
''; '';
buildInputs = [faad2];
meta = { meta = {
homepage = http://www.ffmpeg.org/; homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video"; description = "A complete, cross-platform solution to record, convert and stream audio and video";

8
pkgs/top-level/all-packages.nix
View File

@ -2861,7 +2861,7 @@ let
}; };
faad2 = import ../development/libraries/faad2 { faad2 = import ../development/libraries/faad2 {
inherit fetchurl stdenv autoconf automake libtool; inherit fetchurl stdenv;
}; };
fcgi = import ../development/libraries/fcgi { fcgi = import ../development/libraries/fcgi {
@ -2869,7 +2869,7 @@ let
}; };
ffmpeg = import ../development/libraries/ffmpeg { ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv; inherit fetchurl stdenv faad2;
}; };
fftw = import ../development/libraries/fftw { fftw = import ../development/libraries/fftw {
@ -8750,8 +8750,8 @@ let
virtualbox = virtualboxFun null;*/ virtualbox = virtualboxFun null;*/
vlc = import ../applications/video/vlc { vlc = import ../applications/video/vlc {
inherit fetchurl stdenv perl xlibs zlib mpeg2dec a52dec libmad inherit fetchurl stdenv perl xlibs zlib a52dec libmad
ffmpeg libdvdnav pkgconfig hal fribidi qt4; ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf;
dbus = dbus.libs; dbus = dbus.libs;
alsa = alsaLib; alsa = alsaLib;
}; };