diff options
| author | wiz <wiz> | 2014-12-09 11:42:10 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-12-09 11:42:10 +0000 |
| commit | 186d46a2179cfefa2610d01bffc5309714f6918c (patch) | |
| tree | d45759770593f15b71589904de45f4f79990a2e9 /graphics/gd | |
| parent | 8638eb7bdc0b84ac2237ea209b9c8956aef3acca (diff) | |
| download | pkgsrc-186d46a2179cfefa2610d01bffc5309714f6918c.tar.gz | |
Make libvpx a default-on option instead of a hard dependency.
Based on patch by Thomas Orgis on pkgsrc-users.
Diffstat (limited to 'graphics/gd')
| -rw-r--r-- | graphics/gd/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gd/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/gd/options.mk | 13 |
3 files changed, 14 insertions, 7 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 93d7ab9859b..2806feb1307 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2014/10/09 14:06:35 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2014/12/09 11:42:10 wiz Exp $ DISTNAME= libgd-2.1.0 PKGNAME= ${DISTNAME:S/libgd/gd/} @@ -21,7 +21,6 @@ CONFIGURE_ARGS+= --with-freetype=${BUILDLINK_PREFIX.freetype2} CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} CONFIGURE_ARGS+= --with-tiff=${BUILDLINK_PREFIX.tiff} -CONFIGURE_ARGS+= --with-vpx=${BUILDLINK_PREFIX.libvpx} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} REPLACE_PERL+= src/bdftogd PTHREAD_AUTO_VARS= yes @@ -32,7 +31,6 @@ PTHREAD_AUTO_VARS= yes .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../multimedia/libvpx/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index b9079ab657e..dd2e3e05a72 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2013/09/04 12:31:24 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2014/12/09 11:42:10 wiz Exp $ BUILDLINK_TREE+= gd @@ -21,7 +21,9 @@ pkgbase := gd .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.if !empty(PKG_BUILD_OPTIONS.gd:Mlibvpx) .include "../../multimedia/libvpx/buildlink3.mk" +.endif .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GD_BUILDLINK3_MK diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk index 4066910781f..24c566f71fd 100644 --- a/graphics/gd/options.mk +++ b/graphics/gd/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2013/09/02 21:17:42 adam Exp $ +# $NetBSD: options.mk,v 1.3 2014/12/09 11:42:10 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gd -PKG_SUPPORTED_OPTIONS= x11 -PKG_SUGGESTED_OPTIONS= # empty +PKG_SUPPORTED_OPTIONS= libvpx x11 +PKG_SUGGESTED_OPTIONS= libvpx .include "../../mk/bsd.options.mk" @@ -13,3 +13,10 @@ CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} .else CONFIGURE_ARGS+= --without-xpm .endif + +.if !empty(PKG_OPTIONS:Mlibvpx) +.include "../../multimedia/libvpx/buildlink3.mk" +CONFIGURE_ARGS+= --with-vpx=${BUILDLINK_PREFIX.libvpx} +.else +CONFIGURE_ARGS+= --without-vpx +.endif |