summaryrefslogtreecommitdiff
path: root/graphics/libwebp
diff options
context:
space:
mode:
authorkim <kim>2017-04-15 15:48:12 +0000
committerkim <kim>2017-04-15 15:48:12 +0000
commit7d971450111e200903a41900cbcbee8826b74e7f (patch)
tree2f2837c62129ccef1164189e796de7cb9a77115a /graphics/libwebp
parent4b8087dcf2d0b5e8d791f66a4c42be0344248b7e (diff)
downloadpkgsrc-7d971450111e200903a41900cbcbee8826b74e7f.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.
Diffstat (limited to 'graphics/libwebp')
-rw-r--r--graphics/libwebp/Makefile6
-rw-r--r--graphics/libwebp/options.mk12
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