* Added the ALSA library.

* Optional ALSA support in MPlayer.

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

pkgs-ng/applications/video/MPlayer/builder.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-buildinputs="$freetype $x11"
+buildinputs="$freetype $x11 $alsa"
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1

pkgs-ng/applications/video/MPlayer/default.fix

@@ -1,6 +1,8 @@
-{stdenv, fetchurl, x11, freetype}:
+{ alsaSupport ? false
+, stdenv, fetchurl, x11, freetype, alsa ? null}:
 
 assert !isNull x11 && !isNull freetype;
+assert alsaSupport -> !isNull alsa;
 
 derivation {
   name = "MPlayer-1.0pre2";
@@ -16,9 +18,12 @@ derivation {
     md5 = "1ecd31d17b51f16332b1fcc7da36b312";
   };
 
+  alsaSupport = alsaSupport;
+
   stdenv = stdenv;
   x11 = x11;
   freetype = freetype;
+  alsa = if alsaSupport then alsa else null;
   win32codecs = (import ./win32codecs) {
     stdenv = stdenv;
     fetchurl = fetchurl;

pkgs-ng/os-specific/linux/alsa/library/builder.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd alsa-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/os-specific/linux/alsa/library/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "alsa-lib-0.9.8";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-0.9.8.tar.bz2;
+    md5 = "c9f163fb0623de1b92bf287712641f6e";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/system/all-packages-generic.fix

@@ -323,6 +323,11 @@
     stdenv = stdenv;
   };
 
+  alsaLib = (import ../os-specific/linux/alsa/library) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
 
   ### APPLICATIONS
 
@@ -371,10 +376,12 @@
   };
 
   MPlayer = (import ../applications/video/MPlayer) {
+    alsaSupport = true;
     fetchurl = fetchurl;
     stdenv = stdenv;
     x11 = xfree86;
     freetype = freetype;
+    alsa = alsaLib;
   };
 
 }