* Latest ALSA, SDL.

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

pkgs/development/libraries/SDL/default.nix

@@ -1,18 +1,24 @@
-{stdenv, fetchurl, x11, openglSupport ? false, mesa ? null}:
+{ stdenv, fetchurl, x11, libXrandr, openglSupport ? false, mesa ? null
+, alsaSupport ? true, alsaLib ? null
+}:
 
 assert openglSupport -> mesa != null;
+assert alsaSupport -> alsaLib != null;
 
 stdenv.mkDerivation {
-  name = "SDL-1.2.9";
+  name = "SDL-1.2.11";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/SDL-1.2.9.tar.gz;
-    md5 = "80919ef556425ff82a8555ff40a579a0";
+    url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz;
+    md5 = "418b42956b7cd103bfab1b9077ccc149";
   };
-  buildInputs = [
-    x11
-    (if openglSupport then mesa else null)
-  ];
-  patches = [./no-cxx.patch];
-  NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
+  buildInputs = [x11 libXrandr]
+    ++ (if openglSupport then [mesa] else [])
+    ++ (if alsaSupport then [alsaLib] else []);
+  configureFlags = "
+    --disable-x11-shared --disable-alsa-shared --enable-rpath
+    ${if alsaSupport then "--with-alsa-prefix=${alsaLib}" else ""}
+  ";
+#  patches = [./no-cxx.patch];
+#  NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
   inherit openglSupport;
 }

pkgs/os-specific/linux/alsa/library/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "alsa-lib-1.0.10";
+  name = "alsa-lib-1.0.12";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/alsa-lib-1.0.10.tar.bz2;
-    md5 = "b1a4e15c9ff81798507de470a92fcc43";
+    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.12.tar.bz2;
+    md5 = "d351d46c5e415d4c8448487737939c72";
   };
 }

pkgs/top-level/all-packages.nix

@@ -1818,8 +1818,10 @@ rec {
   readline = readline5;
 
   SDL = (import ../development/libraries/SDL) {
-    inherit fetchurl stdenv x11 mesa;
+    inherit fetchurl stdenv x11 mesa alsaLib;
+    inherit (xlibs) libXrandr;
     openglSupport = true;
+    alsaSupport = true;
   };
 
   boehmgc = (import ../development/libraries/boehm-gc) {
@@ -2626,6 +2628,10 @@ rec {
     inherit fetchurl stdenv xlibs mesa;
   };
 
+  exult = import ../games/exult {
+    inherit fetchurl stdenv SDL;
+  };
+
 
   ### MISC