Author: urkud
Date: Mon Jan 9 17:55:31 2012
New Revision: 31458
URL: https://nixos.org/websvn/nix/?rev=31458&sc=1
Log:
update darktable, apply upstream libpng-15 patch
Added:
nixpkgs/trunk/pkgs/applications/graphics/darktable/libpng-15.patch
Modified:
nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix Mon Jan
9 16:03:43 2012 (r31457)
+++ nixpkgs/trunk/pkgs/applications/graphics/darktable/default.nix Mon Jan
9 17:55:31 2012 (r31458)
@@ -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 =
Added: nixpkgs/trunk/pkgs/applications/graphics/darktable/libpng-15.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/graphics/darktable/libpng-15.patch Mon Jan
9 17:55:31 2012 (r31458)
@@ -0,0 +1,22 @@
+commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
+Author: Tim Harder <[email protected]>
+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)
+
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
