diff options
| author | obache <obache@pkgsrc.org> | 2014-02-05 09:42:33 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-02-05 09:42:33 +0000 |
| commit | 75ff081ae17225bf9170e8e7ccd7df9ee9882d69 (patch) | |
| tree | 3ee4eac842768cc06b2a335656625b8149d4df9f /x11 | |
| parent | bc0cd27a7dda21e8a2b26ec9d20f48c7e0e80e00 (diff) | |
| download | pkgsrc-75ff081ae17225bf9170e8e7ccd7df9ee9882d69.tar.gz | |
require randrproto>=1.4 to build, and packags not using builtin libXrandr
also require the version.
fixes a part of PR pkg/48532.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libXrandr/Makefile | 3 | ||||
| -rw-r--r-- | x11/libXrandr/builtin.mk | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 84d2864f8e5..b29884db996 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/09/08 08:19:48 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2014/02/05 09:42:33 obache Exp $ DISTNAME= libXrandr-1.4.2 CATEGORIES= x11 devel @@ -27,6 +27,7 @@ CONFIGURE_ARGS+= --disable-malloc0returnsnull .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" +BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4 .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" diff --git a/x11/libXrandr/builtin.mk b/x11/libXrandr/builtin.mk index f0c80105507..37a1c8d5bfb 100644 --- a/x11/libXrandr/builtin.mk +++ b/x11/libXrandr/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $ +# $NetBSD: builtin.mk,v 1.3 2014/02/05 09:42:33 obache Exp $ BUILTIN_PKG:= libXrandr @@ -49,3 +49,12 @@ USE_BUILTIN.libXrandr!= \ MAKEVARS+= USE_BUILTIN.libXrandr .include "../../mk/x11.builtin.mk" + +CHECK_BUILTIN.libXrandr?= no +.if !empty(CHECK_BUILTIN.libXrandr:M[nN][oO]) + +. if !empty(USE_BUILTIN.libXrandr:M[nN][oO]) +BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4 +. endif + +.endif # CHECK_BUILTIN.libXrandr |