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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.19 2015/04/25 11:47:03 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.20 2015/04/29 15:11:02 tnn Exp $
2bin/X 2bin/X
3bin/Xnest 3bin/Xnest
4bin/Xorg 4bin/Xorg
5bin/Xvfb 5bin/Xvfb
6bin/cvt 6bin/cvt
7bin/gtf 7bin/gtf
8include/xorg/BT.h 8include/xorg/BT.h
9include/xorg/IBM.h 9include/xorg/IBM.h
10include/xorg/TI.h 10include/xorg/TI.h
11include/xorg/XIstubs.h 11include/xorg/XIstubs.h
12include/xorg/Xprintf.h 12include/xorg/Xprintf.h
13include/xorg/callback.h 13include/xorg/callback.h
14include/xorg/client.h 14include/xorg/client.h
@@ -23,26 +23,27 @@ include/xorg/cursorstr.h @@ -23,26 +23,27 @@ include/xorg/cursorstr.h
23include/xorg/damage.h 23include/xorg/damage.h
24include/xorg/damagestr.h 24include/xorg/damagestr.h
25include/xorg/dbestruct.h 25include/xorg/dbestruct.h
26include/xorg/dgaproc.h 26include/xorg/dgaproc.h
27include/xorg/dix.h 27include/xorg/dix.h
28include/xorg/dixaccess.h 28include/xorg/dixaccess.h
29include/xorg/dixevents.h 29include/xorg/dixevents.h
30include/xorg/dixfont.h 30include/xorg/dixfont.h
31include/xorg/dixfontstr.h 31include/xorg/dixfontstr.h
32include/xorg/dixgrabs.h 32include/xorg/dixgrabs.h
33include/xorg/dixstruct.h 33include/xorg/dixstruct.h
34${PLIST.dri}include/xorg/dri.h 34${PLIST.dri}include/xorg/dri.h
35${PLIST.dri}include/xorg/dri2.h 35${PLIST.dri}include/xorg/dri2.h
 36${PLIST.dri3}include/xorg/dri3.h
36${PLIST.dri}include/xorg/dristruct.h 37${PLIST.dri}include/xorg/dristruct.h
37include/xorg/edid.h 38include/xorg/edid.h
38include/xorg/events.h 39include/xorg/events.h
39include/xorg/exa.h 40include/xorg/exa.h
40include/xorg/exevents.h 41include/xorg/exevents.h
41include/xorg/extension.h 42include/xorg/extension.h
42include/xorg/extinit.h 43include/xorg/extinit.h
43include/xorg/extnsionst.h 44include/xorg/extnsionst.h
44include/xorg/fb.h 45include/xorg/fb.h
45include/xorg/fbdevhw.h 46include/xorg/fbdevhw.h
46include/xorg/fboverlay.h 47include/xorg/fboverlay.h
47include/xorg/fbpict.h 48include/xorg/fbpict.h
48include/xorg/fbrop.h 49include/xorg/fbrop.h
cvs diff -r1.10 -r1.11 pkgsrc/x11/modular-xorg-server/options.mk (expand / switch to unified 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,35 +1,44 @@ @@ -1,35 +1,44 @@
1# $NetBSD: options.mk,v 1.10 2015/04/25 11:47:03 tnn Exp $ 1# $NetBSD: options.mk,v 1.11 2015/04/29 15:11:02 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
4PKG_SUPPORTED_OPTIONS= dri inet6 debug dtrace 4PKG_SUPPORTED_OPTIONS= dri inet6 debug dtrace
5PKG_SUGGESTED_OPTIONS= dri inet6 5PKG_SUGGESTED_OPTIONS= dri inet6
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dri dtrace 9PLIST_VARS+= dri dri3 dtrace
10 10
11.if !empty(PKG_OPTIONS:Mdri) 11.if !empty(PKG_OPTIONS:Mdri)
12.include "../../graphics/libepoxy/buildlink3.mk" 12.include "../../graphics/libepoxy/buildlink3.mk"
13BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=10 13BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=10
14.include "../../graphics/MesaLib/buildlink3.mk" 14.include "../../graphics/MesaLib/buildlink3.mk"
15.include "../../x11/glproto/buildlink3.mk" 15.include "../../x11/glproto/buildlink3.mk"
16.include "../../x11/dri2proto/buildlink3.mk" 16.include "../../x11/dri2proto/buildlink3.mk"
17.include "../../x11/libdrm/buildlink3.mk" 17.include "../../x11/libdrm/buildlink3.mk"
18.include "../../x11/xf86driproto/buildlink3.mk" 18.include "../../x11/xf86driproto/buildlink3.mk"
19PLIST.dri= yes 19PLIST.dri= yes
20CONFIGURE_ARGS+= --enable-dri 20CONFIGURE_ARGS+= --enable-dri
21CONFIGURE_ARGS+= --enable-glx 21CONFIGURE_ARGS+= --enable-glx
22CONFIGURE_ARGS+= --enable-aiglx 22CONFIGURE_ARGS+= --enable-aiglx
 23# Linux supports dri3
 24. if ${OPSYS} == "Linux"
 25PLIST.dri3= yes
 26.include "../../x11/dri3proto/buildlink3.mk"
 27.include "../../x11/libxshmfence/buildlink3.mk"
 28CONFIGURE_ARGS+= --enable-dri3
 29. else
 30CONFIGURE_ARGS+= --disable-dri3
 31. endif
23.else 32.else
24### 33###
25### XXX Perhaps we should allow for a built-in glx without dri enabled? 34### XXX Perhaps we should allow for a built-in glx without dri enabled?
26### 35###
27CONFIGURE_ARGS+= --disable-dri 36CONFIGURE_ARGS+= --disable-dri
28CONFIGURE_ARGS+= --disable-glx 37CONFIGURE_ARGS+= --disable-glx
29pre-build: disable-modesetting 38pre-build: disable-modesetting
30.PHONY: disable-modesetting 39.PHONY: disable-modesetting
31disable-modesetting: 40disable-modesetting:
32 (echo "all:"; echo "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile 41 (echo "all:"; echo "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile
33.endif 42.endif
34 43
35#.if !empty(PKG_OPTIONS:Mglamor) 44#.if !empty(PKG_OPTIONS:Mglamor)