diff options
| author | kim <kim@pkgsrc.org> | 2017-04-15 15:48:12 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2017-04-15 15:48:12 +0000 |
| commit | 2243d992d16d4790223775b086d1998bec90fdd6 (patch) | |
| tree | 5805c5465a91693008c1cfbc8eece4f9d92e0944 | |
| parent | e7ace618036f8c442f8f5e6432d7fe7231ede844 (diff) | |
| download | pkgsrc-2243d992d16d4790223775b086d1998bec90fdd6.tar.gz | |
Make tiff option when building libwebp, as tiff has many long-standing
vulnerabilities. Still enabled by default, as before. Ok by wiz@.
Fixes PR pkg/52149 and adds tiff to PKG_SUGGESTED_OPTIONS.
| -rw-r--r-- | graphics/libwebp/Makefile | 6 | ||||
| -rw-r--r-- | graphics/libwebp/options.mk | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/graphics/libwebp/Makefile b/graphics/libwebp/Makefile index d4248f9a2e7..a48ef6d0649 100644 --- a/graphics/libwebp/Makefile +++ b/graphics/libwebp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2017/02/28 14:40:47 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2017/04/15 15:48:12 kim Exp $ DISTNAME= libwebp-0.6.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://downloads.webmproject.org/releases/webp/ @@ -9,6 +10,8 @@ HOMEPAGE= http://developers.google.com/speed/webp/ COMMENT= WebP image format library and tools LICENSE= modified-bsd +.include "options.mk" + USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -29,6 +32,5 @@ PKGCONFIG_OVERRIDE+= src/libwebp.pc.in .include "../../graphics/giflib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libwebp/options.mk b/graphics/libwebp/options.mk new file mode 100644 index 00000000000..dbc83fbe8b8 --- /dev/null +++ b/graphics/libwebp/options.mk @@ -0,0 +1,12 @@ +# $NetBSD: options.mk,v 1.1 2017/04/15 15:48:12 kim Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.libwebp +PKG_SUPPORTED_OPTIONS= tiff + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mtiff) +.include "../../graphics/tiff/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-tiff +.endif |