upgraded vlc to 2.0 - with bluray support
svn path=/nixpkgs/trunk/; revision=32487
This commit is contained in:
parent
383ec69fb6
commit
e91b090577
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, perl, xlibs, libdvdnav
|
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
|
||||||
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
|
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
|
||||||
, pkgconfig, dbus, fribidi, qt4, freefont_ttf
|
, pkgconfig, dbus, fribidi, qt4, freefont_ttf
|
||||||
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
|
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
|
||||||
|
@ -10,18 +10,18 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vlc-${version}";
|
name = "vlc-${version}";
|
||||||
version = "1.1.13";
|
version = "2.0.0";
|
||||||
|
|
||||||
patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
|
patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2";
|
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
|
||||||
sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
|
sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
|
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
|
||||||
dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
|
libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
|
||||||
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
||||||
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
|
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
|
||||||
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
|
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
|
||||||
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
substituteInPlace modules/misc/freetype.c --replace \
|
substituteInPlace modules/text_renderer/freetype.c --replace \
|
||||||
/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
|
/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
|
||||||
${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
|
${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in New Issue