diff options
| author | tnn <tnn@pkgsrc.org> | 2015-04-29 15:11:02 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-04-29 15:11:02 +0000 |
| commit | 2ff7f5a59172024a1b45e10b44c1e25b4e47e487 (patch) | |
| tree | 08e05e22b8cd0e4add06cd79b9575b123bcf9e51 /x11/modular-xorg-server | |
| parent | 5caf31c17843db60214a5330c26ffd7314bbd831 (diff) | |
| download | pkgsrc-2ff7f5a59172024a1b45e10b44c1e25b4e47e487.tar.gz | |
Fix DRI3 build on Linux
Diffstat (limited to 'x11/modular-xorg-server')
| -rw-r--r-- | x11/modular-xorg-server/PLIST | 3 | ||||
| -rw-r--r-- | x11/modular-xorg-server/options.mk | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 07ae692311b..f1ca09ccb2d 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2015/04/25 11:47:03 tnn Exp $ +@comment $NetBSD: PLIST,v 1.20 2015/04/29 15:11:02 tnn Exp $ bin/X bin/Xnest bin/Xorg @@ -33,6 +33,7 @@ include/xorg/dixgrabs.h include/xorg/dixstruct.h ${PLIST.dri}include/xorg/dri.h ${PLIST.dri}include/xorg/dri2.h +${PLIST.dri3}include/xorg/dri3.h ${PLIST.dri}include/xorg/dristruct.h include/xorg/edid.h include/xorg/events.h diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 2bbb5e5f2f5..70885dd7cb4 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2015/04/25 11:47:03 tnn Exp $ +# $NetBSD: options.mk,v 1.11 2015/04/29 15:11:02 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server PKG_SUPPORTED_OPTIONS= dri inet6 debug dtrace @@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS= dri inet6 .include "../../mk/bsd.options.mk" -PLIST_VARS+= dri dtrace +PLIST_VARS+= dri dri3 dtrace .if !empty(PKG_OPTIONS:Mdri) .include "../../graphics/libepoxy/buildlink3.mk" @@ -20,6 +20,15 @@ PLIST.dri= yes CONFIGURE_ARGS+= --enable-dri CONFIGURE_ARGS+= --enable-glx CONFIGURE_ARGS+= --enable-aiglx +# Linux supports dri3 +. if ${OPSYS} == "Linux" +PLIST.dri3= yes +.include "../../x11/dri3proto/buildlink3.mk" +.include "../../x11/libxshmfence/buildlink3.mk" +CONFIGURE_ARGS+= --enable-dri3 +. else +CONFIGURE_ARGS+= --disable-dri3 +. endif .else ### ### XXX Perhaps we should allow for a built-in glx without dri enabled? |