diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-09 17:55:31 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-09 17:55:31 +0000 |
| commit | 4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc (patch) | |
| tree | a4a4d8e730cac219df477cbd840cd9d76ae49e01 /pkgs/applications | |
| parent | 83ed01cc123c3b050a54271750d476e5cfb3491e (diff) | |
| download | nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.tar nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.tar.gz nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.tar.bz2 nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.tar.lz nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.tar.xz nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.tar.zst nixlib-4a11f058e4fa6f07ce9ea122aead4ac0a6c6eedc.zip | |
update darktable, apply upstream libpng-15 patch
svn path=/nixpkgs/trunk/; revision=31458
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/darktable/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/darktable/libpng-15.patch | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index b0452bba115d..c47ed07a48d3 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.3"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e"; + sha256 = "0al9fxifqv9vg8rj6vybjsn6f25pq5ij9367imlhpmsv6m9m5mqw"; }; buildInputs = diff --git a/pkgs/applications/graphics/darktable/libpng-15.patch b/pkgs/applications/graphics/darktable/libpng-15.patch new file mode 100644 index 000000000000..f817a3264488 --- /dev/null +++ b/pkgs/applications/graphics/darktable/libpng-15.patch @@ -0,0 +1,22 @@ +commit 5803d31ae7704e0349821dcc20a94a1cddda69f1 +Author: Tim Harder <radhermit@gmail.com> +Date: Wed Sep 21 14:13:55 2011 -0700 + + Fix build with libpng-1.5 + + Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and + Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore + via the png.h header. + +diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c +index 40c7d48..c7be566 100644 +--- a/src/imageio/format/png.c ++++ b/src/imageio/format/png.c +@@ -28,6 +28,7 @@ + #include <stdio.h> + #include <png.h> + #include <inttypes.h> ++#include <zlib.h> + + DT_MODULE(1) + |