Wed Apr 29 15:11:02 2015 UTC ()
Fix DRI3 build on Linux


(tnn)
diff -r1.19 -r1.20 pkgsrc/x11/modular-xorg-server/PLIST
diff -r1.10 -r1.11 pkgsrc/x11/modular-xorg-server/options.mk
cvs diff -r1.19 -r1.20 pkgsrc/x11/modular-xorg-server/PLIST (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-server/PLIST 2015/04/25 11:47:03 1.19
+++ pkgsrc/x11/modular-xorg-server/PLIST 2015/04/29 15:11:02 1.20
@@ -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
cvs diff -r1.10 -r1.11 pkgsrc/x11/modular-xorg-server/options.mk (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-server/options.mk 2015/04/25 11:47:03 1.10
+++ pkgsrc/x11/modular-xorg-server/options.mk 2015/04/29 15:11:02 1.11
@@ -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?