* Play DVDs again with vlc.

svn path=/nixpkgs/trunk/; revision=5543
This commit is contained in:
Eelco Dolstra 2006-06-29 23:48:19 +00:00
parent 186c269c70
commit 3f45f2fe82
5 changed files with 22 additions and 20 deletions

View file

@ -1,10 +1,10 @@
{ xvSupport ? true
, stdenv, fetchurl, perl, x11, libXv, wxGTK
#libdvdcss, libdvdplay
, libdvdread, libdvdnav, libdvdcss
, zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa
}:
#assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
assert libdvdread.libdvdcss == libdvdcss;
assert xvSupport -> libXv != null;
stdenv.mkDerivation {
@ -16,10 +16,15 @@ stdenv.mkDerivation {
};
buildInputs = [
perl x11 wxGTK /* libdvdcss libdvdplay libdvdplay.libdvdread */
perl x11 wxGTK
zlib mpeg2dec a52dec libmad ffmpeg alsa
libdvdread # <- for "simple" DVD playback
libdvdnav libdvdcss # <- for DVD playback with menus
(if xvSupport then libXv else null)
];
# Ensure that libdvdcss will be found without having to set LD_LIBRARY_PATH.
NIX_LDFLAGS = "-ldvdcss";
configureFlags = "--enable-alsa";
}

View file

@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libdvdnav-20050211";
src = fetchurl {
url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/libdvdnav-20050211.tar.bz2;
md5 = "e1b1d45c8fdaf6a2dce3078bd3d7047d";
};
}

View file

@ -1,13 +0,0 @@
{stdenv, fetchurl, libdvdread}:
assert libdvdread != null;
stdenv.mkDerivation {
name = "libdvdplay-1.0.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libdvdplay-1.0.1.tar.bz2;
md5 = "602bca4ef78d79aa87e5e8920d958a78";
};
buildInputs = [libdvdread];
inherit libdvdread;
}

View file

@ -1312,8 +1312,8 @@ rec {
inherit fetchurl stdenv libdvdcss;
};
libdvdplay = (import ../development/libraries/libdvdplay) {
inherit fetchurl stdenv libdvdread;
libdvdnav = import ../development/libraries/libdvdnav {
inherit fetchurl stdenv;
};
mpeg2dec = (import ../development/libraries/mpeg2dec) {
@ -2208,7 +2208,8 @@ rec {
vlc = (import ../applications/video/vlc) {
inherit fetchurl stdenv perl x11 wxGTK
zlib mpeg2dec a52dec libmad ffmpeg;
zlib mpeg2dec a52dec libmad ffmpeg
libdvdread libdvdnav libdvdcss;
inherit (xlibs) libXv;
alsa = alsaLib;
};

View file

@ -110,7 +110,7 @@ let {
uulib
valgrind
vim
# vlc
vlc
wget
xchm
xineUI