Merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=31225

pkgs/applications/audio/rakarrack/default.nix

@@ -10,6 +10,8 @@ stdenv.mkDerivation  rec {
     sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
   };
 
+  patches = [ ./fltk-path.patch ];
+
   buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
     libpng libsamplerate libsndfile zlib ];
 

pkgs/applications/audio/rakarrack/fltk-path.patch

@@ -0,0 +1,35 @@
+commit 47245c3fd30dc326fedd7cdae444ddcf0fd97490
+Author: holborn <holborn@users.sourceforge.net>
+Date:   Tue Apr 19 15:02:26 2011 +0100
+
+            Fix FL path
+    
+    	modified:   src/global.h
+    	modified:   src/process.C
+
+diff --git a/src/global.h b/src/global.h
+index fc74b06..3e33da9 100644
+--- a/src/global.h
++++ b/src/global.h
+@@ -176,7 +176,7 @@ return y;
+ #include <X11/xpm.h>
+ #include <jack/jack.h>
+ #include <jack/midiport.h>
+-#include <Fl/Fl_Preferences.H>
++#include <FL/Fl_Preferences.H>
+ #include "FPreset.h"
+ #include "Reverb.h"
+ #include "Chorus.h"
+diff --git a/src/process.C b/src/process.C
+index 51bbc65..c993ff8 100644
+--- a/src/process.C
++++ b/src/process.C
+@@ -28,7 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <Fl/Fl_Preferences.H>
++#include <FL/Fl_Preferences.H>
+ #include "global.h"
+ 
+ int Pexitprogram, preset;

pkgs/applications/audio/yoshimi/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, boost, cmakeCurses, fftwSinglePrec, fltk
+{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk
 , jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }:
 
 assert stdenv ? glibc;
@@ -12,12 +12,18 @@ stdenv.mkDerivation  rec {
     sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1";
   };
 
-  buildInputs = [ alsaLib boost cmakeCurses fftwSinglePrec fltk
+  buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
-    jackaudio libsndfile mesa minixml pkgconfig zlib ];
+    minixml zlib ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
-  preConfigure = ''
+  preConfigure = "cd src";
-    cd src
+
-  '';
+  patches = [
+    (fetchurl {
+      url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch;
+      sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri";
+    })
+  ];
 
   cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
 

pkgs/applications/audio/zynaddsubfx/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, fltk, minixml, zlib }:
+{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }:
 
 stdenv.mkDerivation  rec {
   name = "zynaddsubfx-${version}";
@@ -9,11 +9,17 @@ stdenv.mkDerivation  rec {
     sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg";
   };
 
-  buildInputs = [ alsaLib fftw fltk minixml zlib ];
+  buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
-  preConfigure = "cd src";
+  patches = [
+    (fetchurl {
+      url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch;
+      sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6";
+    })
+  ];
 
-  installPhase = "mkdir -p $out/bin; cp zynaddsubfx $out/bin";
+#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin";
 
   meta = with stdenv.lib; {
     description = "high quality software synthesizer";

pkgs/applications/graphics/cinepaint/default.nix

@@ -1,41 +1,32 @@
-{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
+{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms,
   flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
   perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
   glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
-  mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } :
+  mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "cinepaint-0.25.0";
+  name = "cinepaint-1.0";
 
-  # The developer told me this cvs fetch is 0.25.0
+  src = fetchurl {
-  src = fetchcvs {
+    url = "mirror://sourceforge/cinepaint/${name}.tgz";
-    cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
+    sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
-    module = "cinepaint-project";
-    date = "2008-11-06";
-    sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d";
   };
 
-  buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
+  buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
-    libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext
+    libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
-    intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu
+    gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
-    openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ];
+    libXext libXpm libXxf86vm pixman libpthreadstubs
+  ];
 
-  dontUseCmakeConfigure = 1;
+  buildNativeInputs = [ cmake pkgconfig ];
 
   NIX_CFLAGS_COMPILE = "-I.";
 
-  configurePhase = ''
-    cd cinepaint
-    chmod 0777 autogen.sh
-    ./autogen.sh
-    ./configure --prefix=$out
-  '';
-
   meta = {
     homepage = http://www.cinepaint.org/;
     license = "free";
     description = "Image editor which supports images over 8bpp and ICC profiles";
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/fltk/fltk13.nix

@@ -3,17 +3,18 @@
 
 let inherit (composableDerivation) edf; in
 
+let version = "1.3.0"; in
 composableDerivation.composableDerivation {} {
-  name = "fltk-1.1.10";
+  name = "fltk-${version}";
 
   src = fetchurl {
-    url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
+    url = "ftp://ftp.easysw.com/pub/fltk/${version}/fltk-${version}-source.tar.gz";
-    sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
+    sha256 = "075j6ljx4dfg9rnkardn24y0f26ylpakm0yylg6a9kllha07c1lr";
   };
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?

pkgs/top-level/all-packages.nix

@@ -3362,7 +3362,7 @@ let
 
   flite = callPackage ../development/libraries/flite { };
 
-  fltk11 = callPackage ../development/libraries/fltk/fltk11.nix { };
+  fltk13 = callPackage ../development/libraries/fltk/fltk13.nix { };
 
   fltk20 = callPackage ../development/libraries/fltk { };
 
@@ -6448,9 +6448,7 @@ let
 
   compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
 
-  cinepaint = callPackage ../applications/graphics/cinepaint {
+  cinepaint = callPackage ../applications/graphics/cinepaint { };
-    fltk = fltk11;
-  };
 
   codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
     inherit makeWrapper;
@@ -6874,7 +6872,7 @@ let
   homebank = callPackage ../applications/office/homebank { };
 
   htmldoc = callPackage ../applications/misc/htmldoc {
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   hugin = callPackage ../applications/graphics/hugin {
@@ -7264,7 +7262,7 @@ let
 
   rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
@@ -7690,7 +7688,7 @@ let
   qgis = callPackage ../applications/misc/qgis {};
 
   yoshimi = callPackage ../applications/audio/yoshimi {
-    fltk = fltk11;
+    fltk = fltk13;
   };
 
   zapping = callPackage ../applications/video/zapping {
@@ -7703,9 +7701,7 @@ let
 
   zathura = callPackage ../applications/misc/zathura { };
 
-  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
+  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
-    fltk = fltk11;
-  };
 
   ### GAMES