[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Fix DRI3 build on Linux

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b9eb37ffd77
branches:  trunk
changeset: 650967:6b9eb37ffd77
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Apr 29 15:11:02 2015 +0000

description:
Fix DRI3 build on Linux

diffstat:

 x11/modular-xorg-server/PLIST      |   3 ++-
 x11/modular-xorg-server/options.mk |  13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r cdc0a594da02 -r 6b9eb37ffd77 x11/modular-xorg-server/PLIST
--- a/x11/modular-xorg-server/PLIST     Wed Apr 29 14:41:52 2015 +0000
+++ b/x11/modular-xorg-server/PLIST     Wed Apr 29 15:11:02 2015 +0000
@@ -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/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 -r cdc0a594da02 -r 6b9eb37ffd77 x11/modular-xorg-server/options.mk
--- a/x11/modular-xorg-server/options.mk        Wed Apr 29 14:41:52 2015 +0000
+++ b/x11/modular-xorg-server/options.mk        Wed Apr 29 15:11:02 2015 +0000
@@ -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 @@
 
 .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 @@
 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?