diff options
| author | wiz <wiz@pkgsrc.org> | 2014-01-27 20:25:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-01-27 20:25:17 +0000 |
| commit | 7e58680cd537a0710c601345bfbda578ccec646b (patch) | |
| tree | 2833b0565e9a1400bf7e683156e4bcc4d274062d | |
| parent | e2f854e3e0b353371a9c6ff14a21bbc695291d53 (diff) | |
| download | pkgsrc-7e58680cd537a0710c601345bfbda578ccec646b.tar.gz | |
Update to 9.20. Move options handling into options.mk.
Changes:
Use lcms2 instead of lcms.
Can now use "-M" with a DNG file that embeds a bad color matrix.
Improved support for Nokia cameraphones.
Support the Alcatel 5235D, Powershot G16 and S120, Pentax K-3, etc.
Added tone curve for Canon RMF files.
Copied color matrices from DNG Converter 8.3.
Support blacklevel patterns up to 64x64.
Support the Kodak 12-megapixel camera(s).
| -rw-r--r-- | graphics/dcraw/Makefile | 17 | ||||
| -rw-r--r-- | graphics/dcraw/distinfo | 10 | ||||
| -rw-r--r-- | graphics/dcraw/options.mk | 14 | ||||
| -rw-r--r-- | graphics/dcraw/patches/patch-aa | 8 |
4 files changed, 26 insertions, 23 deletions
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index 9a5f7a5065f..97c030a6801 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.40 2014/01/05 15:12:11 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2014/01/27 20:25:17 wiz Exp $ # # Changes can be found in the RCS file at # http://www.cybercom.net/~dcoffin/dcraw/RCS/dcraw.c,v -DISTNAME= dcraw-9.19 +DISTNAME= dcraw-9.20 CATEGORIES= graphics MASTER_SITES= http://www.cybercom.net/~dcoffin/dcraw/archive/ @@ -32,18 +32,7 @@ INSTALLATION_DIRS+= ${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES BROKEN_GETTEXT_DETECTION= yes -PKG_OPTIONS_VAR= PKG_OPTIONS.dcraw -PKG_SUPPORTED_OPTIONS= lcms -PKG_SUGGESTED_OPTIONS= lcms - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mlcms) -LIBS+= -llcms -.include "../../graphics/lcms/buildlink3.mk" -.else -CFLAGS+= -DNO_LCMS -.endif +.include "options.mk" do-build: set -e; cd ${WRKSRC}; \ diff --git a/graphics/dcraw/distinfo b/graphics/dcraw/distinfo index 7028bca75db..321a1b7d4a8 100644 --- a/graphics/dcraw/distinfo +++ b/graphics/dcraw/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.26 2013/11/03 16:02:26 wiz Exp $ +$NetBSD: distinfo,v 1.27 2014/01/27 20:25:17 wiz Exp $ -SHA1 (dcraw-9.19.tar.gz) = 83a85200b0f105a40d23e885f5108bc3b53bdbe4 -RMD160 (dcraw-9.19.tar.gz) = 37503356e813ef2e2201637c6018402ffbf20294 -Size (dcraw-9.19.tar.gz) = 170000 bytes -SHA1 (patch-aa) = 4ee1a2ec5bdb4b13b47d5c8968ded9e86605d5d0 +SHA1 (dcraw-9.20.tar.gz) = a01cbd8232796815830a5843ee373dd9849f3d41 +RMD160 (dcraw-9.20.tar.gz) = 6e78554ebf43894cb2434e8c7b33395ce7301d2b +Size (dcraw-9.20.tar.gz) = 171274 bytes +SHA1 (patch-aa) = 3191ee51355a17f4d17a1b43fb1ad99918861935 diff --git a/graphics/dcraw/options.mk b/graphics/dcraw/options.mk new file mode 100644 index 00000000000..ba6b3159d2a --- /dev/null +++ b/graphics/dcraw/options.mk @@ -0,0 +1,14 @@ +# $NetBSD: options.mk,v 1.1 2014/01/27 20:25:17 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.dcraw +PKG_SUPPORTED_OPTIONS= lcms +PKG_SUGGESTED_OPTIONS= lcms + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mlcms) +LIBS+= -llcms2 +.include "../../graphics/lcms2/buildlink3.mk" +.else +CFLAGS+= -DNO_LCMS +.endif diff --git a/graphics/dcraw/patches/patch-aa b/graphics/dcraw/patches/patch-aa index e38df3b6125..aa6983eeba3 100644 --- a/graphics/dcraw/patches/patch-aa +++ b/graphics/dcraw/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.5 2012/08/11 09:45:11 obache Exp $ +$NetBSD: patch-aa,v 1.6 2014/01/27 20:25:18 wiz Exp $ ---- dcraw.c.orig 2012-07-05 04:40:56.000000000 +0000 +--- dcraw.c.orig 2014-01-27 00:00:04.000000000 +0000 +++ dcraw.c -@@ -57,6 +57,7 @@ - #include <lcms.h> /* Support color profiles */ +@@ -83,6 +83,7 @@ typedef unsigned long long UINT64; + #include <lcms2.h> /* Support color profiles */ #endif #ifdef LOCALEDIR +#include <locale.h> |