diff options
| author | tnn <tnn@pkgsrc.org> | 2015-09-16 12:28:53 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-09-16 12:28:53 +0000 |
| commit | 28e9ade4c5ec3431e9be18a73695eb5577485e5c (patch) | |
| tree | 68ec43bfae2dc15785cf86bfe703261b06cbb750 /graphics | |
| parent | 56f5307ea14bd9c7c1f446bf4e229d09bcda8bde (diff) | |
| download | pkgsrc-28e9ade4c5ec3431e9be18a73695eb5577485e5c.tar.gz | |
PR pkg/50243: PLIST fix when X11_TYPE=modular and PKG_OPTIONS.MesaLib=-dri
ok gdt@
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/buildlink3.mk | 9 | ||||
| -rw-r--r-- | graphics/libepoxy/Makefile | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 47725ac7da0..c1f6b47eb80 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.52 2015/04/25 11:19:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.53 2015/09/16 12:28:53 tnn Exp $ BUILDLINK_TREE+= MesaLib @@ -35,6 +35,13 @@ PKG_BUILD_OPTIONS.MesaLib+= dri . include "../../graphics/MesaLib/dri.mk" .endif +.if ${X11_TYPE} == "modular" && !empty(PKG_BUILD_OPTIONS.MesaLib:Mdri) || \ + ${X11_TYPE} == "native" && exists(${X11BASE}/include/EGL/egl.h) +MESALIB_SUPPORTS_EGL= yes +.else +MESALIB_SUPPORTS_EGL= no +.endif + .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) .include "../../devel/pthread-stublib/buildlink3.mk" .endif diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile index f987ff4fc40..146fda35283 100644 --- a/graphics/libepoxy/Makefile +++ b/graphics/libepoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/09/14 18:20:12 tron Exp $ +# $NetBSD: Makefile,v 1.10 2015/09/16 12:28:53 tnn Exp $ DISTNAME= libepoxy-1.3.1 PKGREVISION= 1 @@ -26,12 +26,7 @@ pre-configure: .include "../../mk/bsd.prefs.mk" PLIST_VARS+= egl -.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h) -PLIST.egl= yes -CONFIGURE_ENV+= PKGSRC_BUILD_EGL=yes -.else -CONFIGURE_ENV+= PKGSRC_BUILD_EGL=no -.endif +CONFIGURE_ENV+= PKGSRC_BUILD_EGL=${MESALIB_SUPPORTS_EGL} # This could be garbage collected, but it seems likely that there will # be more glx issues, so it seems easier to leave it. @@ -46,5 +41,8 @@ PLIST.glx= yes .include "../../lang/python/tool.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" +.if !empty(MESALIB_SUPPORTS_EGL:Myes) +PLIST.egl= yes +.endif .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |