Merge pull request #433 from jcumming/rawtherapee.130331
rawtherapee-4.0.10
This commit is contained in:
commit
8b3fd09c00
|
@ -1,18 +1,18 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
|
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
|
||||||
, libXdmcp, lcms2, libiptcdata
|
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw
|
||||||
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
|
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rawtherapee-4.0.9";
|
name = "rawtherapee-4.0.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
|
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
|
||||||
sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
|
sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
|
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
|
||||||
lcms2 libiptcdata mercurial ];
|
lcms2 libiptcdata mercurial libcanberra fftw ];
|
||||||
|
|
||||||
# Disable the use of the RAWZOR propietary libraries
|
# Disable the use of the RAWZOR propietary libraries
|
||||||
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
||||||
|
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||||
meta = {
|
meta = {
|
||||||
description = "RAW converter and digital photo processing software";
|
description = "RAW converter and digital photo processing software";
|
||||||
homepage = http://www.rawtherapee.com/;
|
homepage = http://www.rawtherapee.com/;
|
||||||
license = "GPLv3+";
|
license = stdenv.lib.licenses.gpl3Plus;
|
||||||
maintainers = with stdenv.lib.maintainers; [viric];
|
maintainers = with stdenv.lib.maintainers; [viric jcumming];
|
||||||
platforms = with stdenv.lib.platforms; linux;
|
platforms = with stdenv.lib.platforms; linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}:
|
{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}:
|
||||||
let
|
let
|
||||||
version = "3.3.2";
|
version = "3.3.2";
|
||||||
localDefs = builderDefs.passthru.function {
|
localDefs = builderDefs.passthru.function {
|
||||||
|
@ -12,6 +12,7 @@ let
|
||||||
# some distros seem to be shipping both versions within the same package?
|
# some distros seem to be shipping both versions within the same package?
|
||||||
# why does --enable-float still result in ..3f.so instead of ..3.so?
|
# why does --enable-float still result in ..3f.so instead of ..3.so?
|
||||||
++ (if singlePrecision then [ "--enable-single" ] else [ ])
|
++ (if singlePrecision then [ "--enable-single" ] else [ ])
|
||||||
|
++ (if float then [ "--enable-float" ] else [ ])
|
||||||
++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
|
++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
|
||||||
++ (stdenv.lib.optional pthreads "--enable-threads")
|
++ (stdenv.lib.optional pthreads "--enable-threads")
|
||||||
# I think all i686 has sse
|
# I think all i686 has sse
|
||||||
|
|
|
@ -7680,7 +7680,9 @@ let
|
||||||
|
|
||||||
ratpoison = callPackage ../applications/window-managers/ratpoison { };
|
ratpoison = callPackage ../applications/window-managers/ratpoison { };
|
||||||
|
|
||||||
rawtherapee = callPackage ../applications/graphics/rawtherapee { };
|
rawtherapee = callPackage ../applications/graphics/rawtherapee {
|
||||||
|
fftw = fftw.override {float = true;};
|
||||||
|
};
|
||||||
|
|
||||||
rcs = callPackage ../applications/version-management/rcs { };
|
rcs = callPackage ../applications/version-management/rcs { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue