Adding amr support in mplayer. That should be enabled by the user, because those libraries are not redistributable.

I don't know if the 'unfree' in the amr libraries will stop mplayer being built without its support. We would have to write the all-packages MPlayer expression different, in this case.

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

1 files changed, 20 insertions, 2 deletions

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 415769cc9ce8..0c1e9548c8dd 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -4,7 +4,8 @@
 , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
 , libXinerama ? null, libXrandr ? null, libdvdnav ? null
 , cdparanoia ? null, cddaSupport ? true
-, mesa, pkgconfig
+, amrnb ? null, amrwb ? null, amrSupport ? false
+, mesa, pkgconfig, unzip
 }:
 
 assert alsaSupport -> alsa != null;
@@ -15,6 +16,7 @@ assert xineramaSupport -> libXinerama != null;
 assert randrSupport -> libXrandr != null;
 assert dvdnavSupport -> libdvdnav != null;
 assert cddaSupport -> cdparanoia != null;
+assert amrSupport -> (amrnb != null && amrwb != null);
 
 let
 
@@ -26,6 +28,21 @@ let
     inherit stdenv fetchurl;
   };
 
+  srcAmr = fetchurl {
+    url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-530.zip;
+    sha256 = "1qyla52jjymhcnbidhwc6a1vm4v1wl27mj4ygp3cpn33swcmkgd0";
+  };
+
+  srcAmrFloat = fetchurl {
+    url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip;
+    sha256 = "1d337h3051w7azipsq7nzf4d25csia2snq3qlhw2sj7282ab042z";
+  };
+
+  srcAmrWBFloat = fetchurl {
+    url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-540.zip;
+    sha256 = "1mb7g3fy5faz26jjbibxvlbb5b81vwmdsldl3kl8hzg14vcrv1q9";
+  };
+
 in
 
 stdenv.mkDerivation {
@@ -46,7 +63,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional xineramaSupport libXinerama
     ++ stdenv.lib.optional randrSupport libXrandr
     ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
-    ++ stdenv.lib.optional cddaSupport cdparanoia;
+    ++ stdenv.lib.optional cddaSupport cdparanoia
+    ++ stdenv.lib.optionals amrSupport [amrnb amrwb];
 
   configureFlags = ''
     ${if cacaSupport then "--enable-caca" else "--disable-caca"}