Add mpg321, libao and libid3tag; upgrade libmad.

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

5 files changed, 74 insertions, 2 deletions

diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
new file mode 100644
index 000000000000..23cc92132b95
--- /dev/null
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libao, libmad, libid3tag, zlib}:
+
+stdenv.mkDerivation {
+  name = "mpg321-0.2.10";
+  src = fetchurl {
+    url = mirror://sourceforge/mpg321/mpg321-0.2.10.tar.gz;
+    sha256 = "db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4";
+  };
+
+  buildInputs = [libao libid3tag libmad zlib];
+
+  meta = {
+    description = "Command-line MP3 player.";
+    homepage = http://mpg321.sourceforge.net/;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
new file mode 100644
index 000000000000..cb42848585bc
--- /dev/null
+++ b/pkgs/development/libraries/libao/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "libao-0.8.8";
+  src = fetchurl {
+    url = http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz;
+    sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954";
+  };
+
+  buildInputs = [pkgconfig];
+
+  meta = {
+    description = ''Libao is Xiph.org's cross-platform audio
+                    library that allows programs to output audio
+		    using a simple API on a wide variety of platforms.'';
+    homepage = http://xiph.org/ao/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
new file mode 100644
index 000000000000..c29d3d29558b
--- /dev/null
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, zlib}:
+
+stdenv.mkDerivation {
+  name = "libid3tag-0.15.1b";
+  src = fetchurl {
+    url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz;
+    sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151";
+  };
+
+  buildInputs = [zlib];
+
+  meta = {
+    description = "An ID3 tag manipulation library.";
+    homepage = http://mad.sourceforge.net/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 6db5bf798d94..458945e102dd 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -3,7 +3,14 @@
 stdenv.mkDerivation {
   name = "libmad-0.15.1b";
   src = fetchurl {
-    url = ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz;
-    md5 = "1be543bc30c56fb6bea1d7bf6a64e66c";
+    url = mirror://sourceforge/mad/libmad-0.15.1b.tar.gz;
+    sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
+  };
+
+  buildInputs = [];
+
+  meta = {
+    description = "MAD, a high-quality, fixed-point, MPEG audio decoder
+                   supporting MPEG-1 and MPEG-2.";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc3049799bba..e9d8d5d32022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2390,6 +2390,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  libao = import ../development/libraries/libao {
+    inherit stdenv fetchurl pkgconfig;
+  };
+
   libarchive = import ../development/libraries/libarchive {
     inherit fetchurl stdenv zlib;
   };
@@ -2497,6 +2501,10 @@ rec {
     inherit (gnome) glib gnomevfs libbonobo;
   };
 
+  libid3tag = import ../development/libraries/libid3tag {
+    inherit fetchurl stdenv zlib;
+  };
+
   libidn = import ../development/libraries/libidn {
 	  inherit fetchurl stdenv;
   };
@@ -4840,6 +4848,10 @@ rec {
     inherit (xlibs) libXi;
   };
 
+  mpg321 = import ../applications/audio/mpg321 {
+    inherit stdenv fetchurl libao libmad libid3tag zlib;
+  };
+
   MPlayer = import ../applications/video/MPlayer {
     inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav;
     inherit (xlibs) libX11 libXv libXinerama libXrandr;