diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-06-29 12:41:25 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-06-29 12:41:25 +0000 |
commit | d97fa85adf35642c6119123d4f8c1919ea2cbd1f (patch) | |
tree | a3c0e3a67fedf365a0bd2002720801bcd42ac84b | |
parent | a96763545d29ad4b97209566034c817f3e848c0c (diff) |
* Some VLC-related updates.
* Variability :-) Provide both Autoconf 2.59 and 2.60 (the former being the default for now). svn path=/nixpkgs/trunk/; revision=5539
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdcss/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdread/builder.sh | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdread/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/libmad/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/mpeg2dec/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/misc/autoconf-2.60/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/tools/misc/autoconf/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
10 files changed, 61 insertions, 35 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b926d1295f89e..de455639e6289 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -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"; } diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix new file mode 100644 index 0000000000000..6aec8ecbb063b --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -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"; +} diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 3af3399ea2f73..e8e9da175447c 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -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"; }; } diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh deleted file mode 100644 index 9b655cc0319a3..0000000000000 --- a/pkgs/development/libraries/libdvdread/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-libdvdcss=$libdvdcss" - -genericBuild diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 674db2480e2ef..fd0eee12ae40a 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -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; } diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 1d6ab57c26b84..6db5bf798d943 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -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"; }; } diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix index a22cd500896ee..7ee4236296d83 100644 --- a/pkgs/development/libraries/mpeg2dec/default.nix +++ b/pkgs/development/libraries/mpeg2dec/default.nix @@ -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"; }; } diff --git a/pkgs/development/tools/misc/autoconf-2.60/default.nix b/pkgs/development/tools/misc/autoconf-2.60/default.nix new file mode 100644 index 0000000000000..8fdccdec7ac1e --- /dev/null +++ b/pkgs/development/tools/misc/autoconf-2.60/default.nix @@ -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]; +} diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 8fdccdec7ac1e..9902c3c5dd79a 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -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]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1fcb7cd4ab27..f1fc88926c18e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |