diff options
author | tnn <tnn@pkgsrc.org> | 2015-03-09 19:54:44 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2015-03-09 19:54:44 +0000 |
commit | 769d5c7faa722a15324e7f8f59f8d2d8940a81c3 (patch) | |
tree | d1b597660a806c5508990cda7f86848a9258abbd /graphics | |
parent | bb3949b64732fd2d38d38d473b5b07694aff4ede (diff) | |
download | pkgsrc-769d5c7faa722a15324e7f8f59f8d2d8940a81c3.tar.gz |
Force a full dependency on libpciaccess in situations where we definitely
need to link with it but might have included x11/xf86driproto's bl3.mk first,
because we have:
x11/xf86driproto/buildlink3.mk:BUILDLINK_DEPMETHOD.libpciaccess?= build
(This issue appears only on non-x86 because on x86 we get libpciaccess
through libdrm)
Bump PKGREVISION to get the dependency expressed.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
-rw-r--r-- | graphics/MesaLib/options.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 4165ea2f5ca..b87d887f84f 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.97 2014/08/06 10:25:14 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2015/03/09 19:54:44 tnn Exp $ PKGNAME= MesaLib-${MESA_PKGVERSION} -PKGREVISION= 5 +PKGREVISION= 6 COMMENT= Graphics library similar to SGI's OpenGL CONFLICTS+= xf86driproto<2.0.4 diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index ed4dd4cfaef..167ef9a58ee 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.26 2014/03/14 07:19:36 obache Exp $ +# $NetBSD: options.mk,v 1.27 2015/03/09 19:54:44 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib PKG_SUPPORTED_OPTIONS= @@ -48,6 +48,7 @@ PKG_SUGGESTED_OPTIONS+= dri .if !empty(PKG_OPTIONS:Mdri) CONFIGURE_ARGS+= --with-driver=dri PLIST.dri= yes +BUILDLINK_DEPMETHOD.libpciaccess= full . include "../../sysutils/libpciaccess/buildlink3.mk" USE_BUILTIN.MesaLib= no . include "../../graphics/MesaLib/dri.mk" |