[pkgsrc/trunk]: pkgsrc/graphics/dcraw Update to 9.20. Move options handling i...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19e7922c199c
branches:  trunk
changeset: 629804:19e7922c199c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 27 20:25:17 2014 +0000

description:
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).

diffstat:

 graphics/dcraw/Makefile         |  17 +++--------------
 graphics/dcraw/distinfo         |  10 +++++-----
 graphics/dcraw/options.mk       |  14 ++++++++++++++
 graphics/dcraw/patches/patch-aa |   8 ++++----
 4 files changed, 26 insertions(+), 23 deletions(-)

diffs (85 lines):

diff -r 0ea7b85f29b7 -r 19e7922c199c graphics/dcraw/Makefile
--- a/graphics/dcraw/Makefile   Mon Jan 27 20:20:10 2014 +0000
+++ b/graphics/dcraw/Makefile   Mon Jan 27 20:25:17 2014 +0000
@@ -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 @@
 
 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 -r 0ea7b85f29b7 -r 19e7922c199c graphics/dcraw/distinfo
--- a/graphics/dcraw/distinfo   Mon Jan 27 20:20:10 2014 +0000
+++ b/graphics/dcraw/distinfo   Mon Jan 27 20:25:17 2014 +0000
@@ -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 -r 0ea7b85f29b7 -r 19e7922c199c graphics/dcraw/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dcraw/options.mk Mon Jan 27 20:25:17 2014 +0000
@@ -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 -r 0ea7b85f29b7 -r 19e7922c199c graphics/dcraw/patches/patch-aa
--- a/graphics/dcraw/patches/patch-aa   Mon Jan 27 20:20:10 2014 +0000
+++ b/graphics/dcraw/patches/patch-aa   Mon Jan 27 20:25:17 2014 +0000
@@ -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>