* vlc and required packages. Finally a good DVD player :-)

svn path=/nixpkgs/trunk/; revision=574

17 files changed, 264 insertions, 0 deletions

diff --git a/pkgs/applications/video/vlc/builder.sh b/pkgs/applications/video/vlc/builder.sh
new file mode 100755
index 00000000000..a07a6b73412
--- /dev/null
+++ b/pkgs/applications/video/vlc/builder.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$x11 $wxGTK $libdvdcss $libdvdread $libdvdplay $mpeg2dec $a52dec $libmad $alsa"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd vlc-* || exit 1
+./configure --prefix=$out \
+ --disable-ffmpeg \
+ --enable-alsa \
+ || exit 1
+make || exit 1
+make install || exit 1
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
new file mode 100644
index 00000000000..b860ca8c904
--- /dev/null
+++ b/pkgs/applications/video/vlc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
+, mpeg2dec, a52dec, libmad, alsa}:
+
+assert !isNull x11 && !isNull wxGTK && !isNull libdvdcss
+  && !isNull libdvdplay && !isNull mpeg2dec && !isNull a52dec
+  && !isNull libmad && !isNull alsa;
+assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+
+derivation {
+  name = "vlc-0.6.2";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/vlc-0.6.2.tar.gz;
+    md5 = "619a45ca360d4a7bf935cb5ffd69989d";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+  wxGTK = wxGTK;
+  libdvdcss = libdvdcss;
+  libdvdplay = libdvdplay;
+  libdvdread = libdvdplay.libdvdread;
+  mpeg2dec = mpeg2dec;
+  a52dec = a52dec;
+  libmad = libmad;
+  alsa = alsa;
+}
diff --git a/pkgs/development/libraries/a52dec/builder.sh b/pkgs/development/libraries/a52dec/builder.sh
new file mode 100755
index 00000000000..55367c159e3
--- /dev/null
+++ b/pkgs/development/libraries/a52dec/builder.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd a52dec-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
new file mode 100644
index 00000000000..5dbd14fb64f
--- /dev/null
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "a52dec-0.7.4";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz;
+    md5 = "caa9f5bc44232dc8aeea773fea56be80";
+  };
+  stdenv = stdenv;
+}
diff --git a/pkgs/development/libraries/libdvdcss/builder.sh b/pkgs/development/libraries/libdvdcss/builder.sh
new file mode 100755
index 00000000000..6d7015b1054
--- /dev/null
+++ b/pkgs/development/libraries/libdvdcss/builder.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd libdvdcss-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
new file mode 100644
index 00000000000..8745bd54686
--- /dev/null
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "libdvdcss-1.2.8";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdcss-1.2.8.tar.gz;
+    md5 = "e35e4240b6ca0b66a0218065dffe6adb";
+  };
+  stdenv = stdenv;
+}
diff --git a/pkgs/development/libraries/libdvdplay/builder.sh b/pkgs/development/libraries/libdvdplay/builder.sh
new file mode 100755
index 00000000000..6b2b5132304
--- /dev/null
+++ b/pkgs/development/libraries/libdvdplay/builder.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$libdvdread"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libdvdplay-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/libdvdplay/default.nix b/pkgs/development/libraries/libdvdplay/default.nix
new file mode 100644
index 00000000000..b038d0e77db
--- /dev/null
+++ b/pkgs/development/libraries/libdvdplay/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, libdvdread}:
+
+assert !isNull libdvdread;
+
+derivation {
+  name = "libdvdplay-1.0.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.videolan.org/pub/libdvdplay/1.0.1/libdvdplay-1.0.1.tar.bz2;
+    md5 = "602bca4ef78d79aa87e5e8920d958a78";
+  };
+  stdenv = stdenv;
+  libdvdread = libdvdread;
+}
diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh
new file mode 100755
index 00000000000..4ecafb3a069
--- /dev/null
+++ b/pkgs/development/libraries/libdvdread/builder.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$libdvdcss"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libdvdread-* || exit 1
+./configure --prefix=$out --with-libdvdcss="$libdvdcss" || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
new file mode 100644
index 00000000000..6c4f782d237
--- /dev/null
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, libdvdcss}:
+
+assert !isNull libdvdcss;
+
+derivation {
+  name = "libdvdread-20030812";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdread-20030812.tar.bz2;
+    md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
+  };
+  stdenv = stdenv;
+  libdvdcss = libdvdcss;
+}
diff --git a/pkgs/development/libraries/libmad/builder.sh b/pkgs/development/libraries/libmad/builder.sh
new file mode 100755
index 00000000000..27e135bf7ee
--- /dev/null
+++ b/pkgs/development/libraries/libmad/builder.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd libmad-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
new file mode 100644
index 00000000000..38f229e44e5
--- /dev/null
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "libmad-0.15.0b";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/mad/libmad-0.15.0b.tar.gz;
+    md5 = "2e4487cdf922a6da2546bad74f643205";
+  };
+  stdenv = stdenv;
+}
diff --git a/pkgs/development/libraries/mpeg2dec/builder.sh b/pkgs/development/libraries/mpeg2dec/builder.sh
new file mode 100755
index 00000000000..feda6f3ee57
--- /dev/null
+++ b/pkgs/development/libraries/mpeg2dec/builder.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd mpeg2dec-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
new file mode 100644
index 00000000000..fb76ac97bf8
--- /dev/null
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "mpeg2dec-20030612";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/mpeg2dec-20030612.tar.bz2;
+    md5 = "17b880eb8766a2e46834d2274882d284";
+  };
+  stdenv = stdenv;
+}
diff --git a/pkgs/development/libraries/wxGTK/builder.sh b/pkgs/development/libraries/wxGTK/builder.sh
new file mode 100755
index 00000000000..786ebef59a7
--- /dev/null
+++ b/pkgs/development/libraries/wxGTK/builder.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd wxGTK-* || exit 1
+./configure --prefix=$out --enable-gtk2 \
+ --disable-compat22 \
+ || exit 1
+make || exit 1
+make install || exit 1
diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix
new file mode 100644
index 00000000000..a80824514ec
--- /dev/null
+++ b/pkgs/development/libraries/wxGTK/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, pkgconfig, gtk}:
+
+assert !isNull pkgconfig && !isNull gtk;
+assert !isNull gtk.libtiff;
+assert !isNull gtk.libjpeg;
+assert !isNull gtk.libpng;
+assert !isNull gtk.libpng.zlib;
+
+derivation {
+  name = "wxGTK-2.4.2";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.4.2.tar.bz2;
+    md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  libtiff = gtk.libtiff;
+  libjpeg = gtk.libjpeg;
+  libpng = gtk.libpng;
+  zlib = gtk.libpng.zlib;
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 88fd86e413b..dc94fcace70 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -315,6 +315,13 @@
     libpng = libpng;
   };
 
+  wxGTK = (import ../development/libraries/wxGTK) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    gtk = gtk;
+  };
+
   gnet = (import ../development/libraries/gnet) {
     fetchurl = fetchurl;
     stdenv = stdenv;
@@ -331,6 +338,38 @@
     yacc = bison;
   };
 
+  libdvdcss = (import ../development/libraries/libdvdcss) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
+  libdvdread = (import ../development/libraries/libdvdread) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    libdvdcss = libdvdcss;
+  };
+
+  libdvdplay = (import ../development/libraries/libdvdplay) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    libdvdread = libdvdread;
+  };
+
+  mpeg2dec = (import ../development/libraries/mpeg2dec) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
+  a52dec = (import ../development/libraries/a52dec) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
+  libmad = (import ../development/libraries/libmad) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
 
   ### SERVERS
 
@@ -444,6 +483,19 @@
     x11 = xfree86;
   };
 
+  vlc = (import ../applications/video/vlc) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    x11 = xfree86;
+    wxGTK = wxGTK;
+    libdvdcss = libdvdcss;
+    libdvdplay = libdvdplay;
+    mpeg2dec = mpeg2dec;
+    a52dec = a52dec;
+    libmad = libmad;
+    alsa = alsaLib;
+  };
+
   gqview = (import ../applications/graphics/gqview) {
     fetchurl = fetchurl;
     stdenv = stdenv;