mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

* Some VLC-related updates.

Browse source 
* Variability :-)  Provide both Autoconf 2.59 and 2.60 (the former
  being the default for now).

svn path=/nixpkgs/trunk/; revision=5539
This commit is contained in:
Eelco Dolstra 2006-06-29 12:41:25 +00:00
parent a96763545d
commit d97fa85adf
10 changed files with 61 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/video/vlc/default.nix
View file

@ -1,23 +1,25 @@
{ xvSupport ? true
, stdenv, fetchurl, x11, libXv, wxGTK, libdvdcss, libdvdplay
, mpeg2dec, a52dec, libmad, alsa}:
, stdenv, fetchurl, perl, x11, libXv, wxGTK
#libdvdcss, libdvdplay
, zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa
}:
assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
#assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
assert xvSupport -> libXv != null;
stdenv.mkDerivation {
name = "vlc-0.8.5";
src = fetchurl {
url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.gz;
md5 = "90d19a5ba2ef2e03e6062fadc2e810d2";
url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.bz2;
md5 = "16bb5bf87ed94879a8eb7b0ff9b4f16f";
};
buildInputs = [
x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread
mpeg2dec a52dec libmad alsa
perl x11 wxGTK /* libdvdcss libdvdplay libdvdplay.libdvdread */
zlib mpeg2dec a52dec libmad ffmpeg alsa
(if xvSupport then libXv else null)
];
configureFlags = "--disable-ffmpeg --enable-alsa";
configureFlags = "--enable-alsa";
}

11
pkgs/development/libraries/ffmpeg/default.nix Normal file
View file

@ -0,0 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "ffmpeg-20051126";
src = fetchurl {
url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/ffmpeg-20051126.tar.bz2;
md5 = "f9e50bf9ee1dd248a276bf9bd4d606e0";
};
# !!! Hm, what are the legal consequences of --enable-gpl?
configureFlags = "--enable-shared --enable-pp --enable-shared-pp --enable-gpl --disable-ffserver --disable-ffplay";
}

6
pkgs/development/libraries/libdvdcss/default.nix
View file

@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libdvdcss-1.2.8";
name = "libdvdcss-1.2.9";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libdvdcss-1.2.8.tar.gz;
md5 = "e35e4240b6ca0b66a0218065dffe6adb";
url = http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.bz2;
md5 = "553383d898826c285afb2ee453b07868";
};
}

5
pkgs/development/libraries/libdvdread/builder.sh
View file

@ -1,5 +0,0 @@
source $stdenv/setup
configureFlags="--with-libdvdcss=$libdvdcss"
genericBuild

11
pkgs/development/libraries/libdvdread/default.nix
View file

@ -1,14 +1,11 @@
{stdenv, fetchurl, libdvdcss}:
assert libdvdcss != null;
stdenv.mkDerivation {
name = "libdvdread-20030812";
builder = ./builder.sh;
name = "libdvdread-0.9.6";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libdvdread-20030812.tar.bz2;
md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
url = http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.6.tar.gz;
md5 = "329401b84ad0b00aaccaad58f2fc393c";
};
buildInputs = libdvdcss;
configureFlags = "--with-libdvdcss=${libdvdcss}";
inherit libdvdcss;
}

6
pkgs/development/libraries/libmad/default.nix
View file

@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libmad-0.15.0b";
name = "libmad-0.15.1b";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libmad-0.15.0b.tar.gz;
md5 = "2e4487cdf922a6da2546bad74f643205";
url = ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz;
md5 = "1be543bc30c56fb6bea1d7bf6a64e66c";
};
}

6
pkgs/development/libraries/mpeg2dec/default.nix
View file

@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "mpeg2dec-0.4.0b";
name = "mpeg2dec-20050802";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/mpeg2dec-0.4.0b.tar.gz;
md5 = "52d10ea80595ec83d8557ba7ac6dc8e6";
url = ftp://ftp.u-strasbg.fr/pub/videolan/vlc/0.8.4a/contrib/mpeg2dec-20050802.tar.gz;
md5 = "79b3559a9354085fcebb1460dd93d237";
};
}

10
pkgs/development/tools/misc/autoconf-2.60/default.nix Normal file
View file

@ -0,0 +1,10 @@
{stdenv, fetchurl, m4, perl}:
stdenv.mkDerivation {
name = "autoconf-2.60";
src = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.60.tar.bz2;
md5 = "019609c29d0cbd9110c38480304aafc8";
};
buildInputs = [m4 perl];
}

6
pkgs/development/tools/misc/autoconf/default.nix
View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, m4, perl}:
stdenv.mkDerivation {
name = "autoconf-2.60";
name = "autoconf-2.59";
src = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.60.tar.bz2;
md5 = "019609c29d0cbd9110c38480304aafc8";
url = http://nix.cs.uu.nl/dist/tarballs/autoconf-2.59.tar.bz2;
md5 = "1ee40f7a676b3cfdc0e3f7cd81551b5f";
};
buildInputs = [m4 perl];
}

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

@ -426,11 +426,18 @@ rec {
inherit fetchurl stdenv;
};
autoconf = (import ../development/tools/misc/autoconf) {
autoconf259 = (import ../development/tools/misc/autoconf) {
inherit fetchurl stdenv perl;
m4 = gnum4;
};
autoconf260 = (import ../development/tools/misc/autoconf-2.60) {
inherit fetchurl stdenv perl;
m4 = gnum4;
};
autoconf = autocon259;
automake17x = (import ../development/tools/misc/automake/automake-1.7.x.nix) {
inherit fetchurl stdenv perl autoconf;
};
@ -1321,6 +1328,10 @@ rec {
inherit fetchurl stdenv;
};
ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv;
};
zvbi = (import ../development/libraries/zvbi) {
inherit fetchurl stdenv libpng x11;
pngSupport = true;
@ -2196,8 +2207,8 @@ rec {
};
vlc = (import ../applications/video/vlc) {
inherit fetchurl stdenv libdvdcss wxGTK libdvdplay
mpeg2dec a52dec libmad x11;
inherit fetchurl stdenv perl x11 wxGTK
zlib mpeg2dec a52dec libmad ffmpeg;
inherit (xlibs) libXv;
alsa = alsaLib;
};