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

update to 1.0.5, add libvorbis, libtheora, speex support

Browse Source 
svn path=/nixpkgs/trunk/; revision=21068
This commit is contained in:
Armijn Hemel 2010-04-14 10:52:20 +00:00
parent fdc760a3f6
commit 0cf1045be4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,24 @@
{ stdenv, fetchurl, perl, xlibs, libdvdnav
, zlib, a52dec, libmad, faad2, ffmpeg, alsa
, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
, libvorbis, libtheora, speex
}:
stdenv.mkDerivation {
name = "vlc-1.0.4";
name = "vlc-1.0.5";
src = fetchurl {
url = http://download.videolan.org/pub/videolan/vlc/1.0.4/vlc-1.0.4.tar.bz2;
sha256 = "15lqirz99dcghqdqsqlgb8fa2xs45a7r32zxhlzk5930rnh0pzyv";
url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2;
sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp";
};
buildInputs = [
perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
libvorbis libtheora speex
];
configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad";
configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex";
preBuild = ''
substituteInPlace modules/misc/freetype.c --replace \

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

@ -8244,7 +8244,8 @@ let
vlc = import ../applications/video/vlc {
inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2
ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf;
ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf
libvorbis libtheora speex;
dbus = dbus.libs;
alsa = alsaLib;
};