CVS commit: pkgsrc/graphics/dcraw

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 16 22:50:24 UTC 2019

Modified Files:
        pkgsrc/graphics/dcraw: Makefile options.mk

Log Message:
dcraw: Disable jp2 support by default

Re-enable it with the 'jasper' option.

Part of the process of trying to minimize the potential impact of a
vulnerable jasper.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/dcraw/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/dcraw/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/dcraw/Makefile
diff -u pkgsrc/graphics/dcraw/Makefile:1.45 pkgsrc/graphics/dcraw/Makefile:1.46
--- pkgsrc/graphics/dcraw/Makefile:1.45 Wed Jul 10 17:53:39 2019
+++ pkgsrc/graphics/dcraw/Makefile      Tue Jul 16 22:50:24 2019
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2019/07/10 17:53:39 sevan Exp $
+# $NetBSD: Makefile,v 1.46 2019/07/16 22:50:24 nia Exp $
 #
 # Changes can be found in the RCS file at
 # http://www.cybercom.net/~dcoffin/dcraw/RCS/dcraw.c,v
 
 DISTNAME=      dcraw-9.27.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.cybercom.net/~dcoffin/dcraw/archive/
 
@@ -18,8 +19,8 @@ USE_PKGLOCALEDIR=     yes
 USE_TOOLS+=            msgfmt
 USE_FEATURES+=         strnlen
 
-LIBS+=         -lm -ljasper -ljpeg
-CFLAGS+=       -DLOCALEDIR=\"${PREFIX}/${PKGLOCALEDIR}/locale\"
+LIBS+=         -lm -ljpeg
+CPPFLAGS+=     -DLOCALEDIR=\"${PREFIX}/${PKGLOCALEDIR}/locale\"
 
 DCRAW_LOCALES=         ca cs da de eo es fr hu it ja nl pl pt ro ru sv zh_CN zh_TW
 
@@ -37,7 +38,7 @@ BROKEN_GETTEXT_DETECTION=     yes
 
 do-build:
        set -e; cd ${WRKSRC};                                   \
-       ${CC} ${CFLAGS} dcraw.c -o dcraw ${LDFLAGS} ${LIBS};    \
+       ${CC} ${CFLAGS} ${CPPFLAGS} dcraw.c -o dcraw ${LDFLAGS} ${LIBS};        \
        for l in ${DCRAW_LOCALES}; do                           \
                msgfmt -o dcraw_$${l}.mo dcraw_$${l}.po;        \
        done;
@@ -55,6 +56,5 @@ do-install:
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/dcraw/options.mk
diff -u pkgsrc/graphics/dcraw/options.mk:1.1 pkgsrc/graphics/dcraw/options.mk:1.2
--- pkgsrc/graphics/dcraw/options.mk:1.1        Mon Jan 27 20:25:17 2014
+++ pkgsrc/graphics/dcraw/options.mk    Tue Jul 16 22:50:24 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2014/01/27 20:25:17 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/07/16 22:50:24 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dcraw
-PKG_SUPPORTED_OPTIONS= lcms
+PKG_SUPPORTED_OPTIONS= lcms jasper
 PKG_SUGGESTED_OPTIONS= lcms
 
 .include "../../mk/bsd.options.mk"
@@ -10,5 +10,12 @@ PKG_SUGGESTED_OPTIONS=       lcms
 LIBS+=         -llcms2
 .include "../../graphics/lcms2/buildlink3.mk"
 .else
-CFLAGS+=       -DNO_LCMS
+CPPFLAGS+=     -DNO_LCMS
+.endif
+
+.if !empty(PKG_OPTIONS:Mjasper)
+LIBS+=         -ljasper
+.include "../../graphics/jasper/buildlink3.mk"
+.else
+CPPFLAGS+=     -DNO_JASPER
 .endif