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 (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,192 +1,193 @@ @@ -1,192 +1,193 @@
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
15include/xorg/closestr.h 15include/xorg/closestr.h
16include/xorg/closure.h 16include/xorg/closure.h
17include/xorg/colormap.h 17include/xorg/colormap.h
18include/xorg/colormapst.h 18include/xorg/colormapst.h
19include/xorg/compiler.h 19include/xorg/compiler.h
20include/xorg/compositeext.h 20include/xorg/compositeext.h
21include/xorg/cursor.h 21include/xorg/cursor.h
22include/xorg/cursorstr.h 22include/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
49include/xorg/fourcc.h 50include/xorg/fourcc.h
50include/xorg/gc.h 51include/xorg/gc.h
51include/xorg/gcstruct.h 52include/xorg/gcstruct.h
52include/xorg/geext.h 53include/xorg/geext.h
53include/xorg/geint.h 54include/xorg/geint.h
54include/xorg/globals.h 55include/xorg/globals.h
55include/xorg/glx_extinit.h 56include/xorg/glx_extinit.h
56include/xorg/glyphstr.h 57include/xorg/glyphstr.h
57include/xorg/hotplug.h 58include/xorg/hotplug.h
58include/xorg/i2c_def.h 59include/xorg/i2c_def.h
59include/xorg/input.h 60include/xorg/input.h
60include/xorg/inputstr.h 61include/xorg/inputstr.h
61include/xorg/list.h 62include/xorg/list.h
62include/xorg/mi.h 63include/xorg/mi.h
63include/xorg/micmap.h 64include/xorg/micmap.h
64include/xorg/micoord.h 65include/xorg/micoord.h
65include/xorg/migc.h 66include/xorg/migc.h
66include/xorg/miline.h 67include/xorg/miline.h
67include/xorg/mioverlay.h 68include/xorg/mioverlay.h
68include/xorg/mipict.h 69include/xorg/mipict.h
69include/xorg/mipointer.h 70include/xorg/mipointer.h
70include/xorg/mipointrst.h 71include/xorg/mipointrst.h
71include/xorg/misc.h 72include/xorg/misc.h
72include/xorg/miscstruct.h 73include/xorg/miscstruct.h
73include/xorg/mistruct.h 74include/xorg/mistruct.h
74include/xorg/misync.h 75include/xorg/misync.h
75include/xorg/misyncfd.h 76include/xorg/misyncfd.h
76include/xorg/misyncshm.h 77include/xorg/misyncshm.h
77include/xorg/misyncstr.h 78include/xorg/misyncstr.h
78include/xorg/mizerarc.h 79include/xorg/mizerarc.h
79include/xorg/opaque.h 80include/xorg/opaque.h
80include/xorg/optionstr.h 81include/xorg/optionstr.h
81include/xorg/os.h 82include/xorg/os.h
82include/xorg/panoramiX.h 83include/xorg/panoramiX.h
83include/xorg/panoramiXsrv.h 84include/xorg/panoramiXsrv.h
84include/xorg/picture.h 85include/xorg/picture.h
85include/xorg/picturestr.h 86include/xorg/picturestr.h
86include/xorg/pixmap.h 87include/xorg/pixmap.h
87include/xorg/pixmapstr.h 88include/xorg/pixmapstr.h
88include/xorg/present.h 89include/xorg/present.h
89include/xorg/presentext.h 90include/xorg/presentext.h
90include/xorg/privates.h 91include/xorg/privates.h
91include/xorg/property.h 92include/xorg/property.h
92include/xorg/propertyst.h 93include/xorg/propertyst.h
93include/xorg/ptrveloc.h 94include/xorg/ptrveloc.h
94include/xorg/randrstr.h 95include/xorg/randrstr.h
95include/xorg/region.h 96include/xorg/region.h
96include/xorg/regionstr.h 97include/xorg/regionstr.h
97include/xorg/registry.h 98include/xorg/registry.h
98include/xorg/resource.h 99include/xorg/resource.h
99include/xorg/rgb.h 100include/xorg/rgb.h
100include/xorg/rrtransform.h 101include/xorg/rrtransform.h
101${PLIST.dri}include/xorg/sarea.h 102${PLIST.dri}include/xorg/sarea.h
102include/xorg/screenint.h 103include/xorg/screenint.h
103include/xorg/scrnintstr.h 104include/xorg/scrnintstr.h
104include/xorg/selection.h 105include/xorg/selection.h
105include/xorg/servermd.h 106include/xorg/servermd.h
106include/xorg/shadow.h 107include/xorg/shadow.h
107include/xorg/shadowfb.h 108include/xorg/shadowfb.h
108include/xorg/shmint.h 109include/xorg/shmint.h
109include/xorg/site.h 110include/xorg/site.h
110${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il 111${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
111include/xorg/swaprep.h 112include/xorg/swaprep.h
112include/xorg/swapreq.h 113include/xorg/swapreq.h
113include/xorg/syncsdk.h 114include/xorg/syncsdk.h
114include/xorg/validate.h 115include/xorg/validate.h
115include/xorg/vbe.h 116include/xorg/vbe.h
116include/xorg/vbeModes.h 117include/xorg/vbeModes.h
117include/xorg/vgaHW.h 118include/xorg/vgaHW.h
118include/xorg/vidmodeproc.h 119include/xorg/vidmodeproc.h
119include/xorg/wfbrename.h 120include/xorg/wfbrename.h
120include/xorg/window.h 121include/xorg/window.h
121include/xorg/windowstr.h 122include/xorg/windowstr.h
122include/xorg/xaarop.h 123include/xorg/xaarop.h
123include/xorg/xace.h 124include/xorg/xace.h
124include/xorg/xacestr.h 125include/xorg/xacestr.h
125include/xorg/xf86.h 126include/xorg/xf86.h
126include/xorg/xf86Crtc.h 127include/xorg/xf86Crtc.h
127include/xorg/xf86Cursor.h 128include/xorg/xf86Cursor.h
128include/xorg/xf86DDC.h 129include/xorg/xf86DDC.h
129include/xorg/xf86Modes.h 130include/xorg/xf86Modes.h
130include/xorg/xf86Module.h 131include/xorg/xf86Module.h
131include/xorg/xf86Opt.h 132include/xorg/xf86Opt.h
132include/xorg/xf86Optionstr.h 133include/xorg/xf86Optionstr.h
133include/xorg/xf86Optrec.h 134include/xorg/xf86Optrec.h
134include/xorg/xf86Parser.h 135include/xorg/xf86Parser.h
135include/xorg/xf86Pci.h 136include/xorg/xf86Pci.h
136include/xorg/xf86PciInfo.h 137include/xorg/xf86PciInfo.h
137include/xorg/xf86Priv.h 138include/xorg/xf86Priv.h
138include/xorg/xf86Privstr.h 139include/xorg/xf86Privstr.h
139include/xorg/xf86RamDac.h 140include/xorg/xf86RamDac.h
140include/xorg/xf86RandR12.h 141include/xorg/xf86RandR12.h
141${PLIST.sparc}include/xorg/xf86Sbus.h 142${PLIST.sparc}include/xorg/xf86Sbus.h
142include/xorg/xf86VGAarbiter.h 143include/xorg/xf86VGAarbiter.h
143include/xorg/xf86Xinput.h 144include/xorg/xf86Xinput.h
144include/xorg/xf86_OSlib.h 145include/xorg/xf86_OSlib.h
145include/xorg/xf86_OSproc.h 146include/xorg/xf86_OSproc.h
146include/xorg/xf86cmap.h 147include/xorg/xf86cmap.h
147include/xorg/xf86fbman.h 148include/xorg/xf86fbman.h
148include/xorg/xf86i2c.h 149include/xorg/xf86i2c.h
149include/xorg/xf86int10.h 150include/xorg/xf86int10.h
150include/xorg/xf86platformBus.h 151include/xorg/xf86platformBus.h
151include/xorg/xf86sbusBus.h 152include/xorg/xf86sbusBus.h
152include/xorg/xf86str.h 153include/xorg/xf86str.h
153include/xorg/xf86xv.h 154include/xorg/xf86xv.h
154include/xorg/xf86xvmc.h 155include/xorg/xf86xvmc.h
155include/xorg/xf86xvpriv.h 156include/xorg/xf86xvpriv.h
156include/xorg/xfixes.h 157include/xorg/xfixes.h
157include/xorg/xisb.h 158include/xorg/xisb.h
158include/xorg/xkbfile.h 159include/xorg/xkbfile.h
159include/xorg/xkbrules.h 160include/xorg/xkbrules.h
160include/xorg/xkbsrv.h 161include/xorg/xkbsrv.h
161include/xorg/xkbstr.h 162include/xorg/xkbstr.h
162include/xorg/xorg-server.h 163include/xorg/xorg-server.h
163include/xorg/xorgVersion.h 164include/xorg/xorgVersion.h
164include/xorg/xserver-properties.h 165include/xorg/xserver-properties.h
165include/xorg/xvdix.h 166include/xorg/xvdix.h
166include/xorg/xvmcext.h 167include/xorg/xvmcext.h
167lib/pkgconfig/xorg-server.pc 168lib/pkgconfig/xorg-server.pc
168${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la 169${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la
169${PLIST.dri}lib/xorg/modules/extensions/libglx.la 170${PLIST.dri}lib/xorg/modules/extensions/libglx.la
170lib/xorg/modules/libexa.la 171lib/xorg/modules/libexa.la
171lib/xorg/modules/libfb.la 172lib/xorg/modules/libfb.la
172lib/xorg/modules/libfbdevhw.la 173lib/xorg/modules/libfbdevhw.la
173lib/xorg/modules/libint10.la 174lib/xorg/modules/libint10.la
174lib/xorg/modules/libshadow.la 175lib/xorg/modules/libshadow.la
175lib/xorg/modules/libshadowfb.la 176lib/xorg/modules/libshadowfb.la
176lib/xorg/modules/libvbe.la 177lib/xorg/modules/libvbe.la
177lib/xorg/modules/libvgahw.la 178lib/xorg/modules/libvgahw.la
178lib/xorg/modules/libwfb.la 179lib/xorg/modules/libwfb.la
179lib/xorg/protocol.txt 180lib/xorg/protocol.txt
180man/man1/Xnest.1 181man/man1/Xnest.1
181man/man1/Xorg.1 182man/man1/Xorg.1
182man/man1/Xserver.1 183man/man1/Xserver.1
183man/man1/Xvfb.1 184man/man1/Xvfb.1
184man/man1/cvt.1 185man/man1/cvt.1
185man/man1/gtf.1 186man/man1/gtf.1
186man/man4/exa.4 187man/man4/exa.4
187man/man4/fbdevhw.4 188man/man4/fbdevhw.4
188${PLIST.dri}man/man4/modesetting.4 189${PLIST.dri}man/man4/modesetting.4
189man/man5/xorg.conf.5 190man/man5/xorg.conf.5
190man/man5/xorg.conf.d.5 191man/man5/xorg.conf.d.5
191share/aclocal/xorg-server.m4 192share/aclocal/xorg-server.m4
192@pkgdir lib/xorg/modules/input 193@pkgdir lib/xorg/modules/input
cvs diff -r1.10 -r1.11 pkgsrc/x11/modular-xorg-server/options.mk (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,59 +1,68 @@ @@ -1,59 +1,68 @@
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)
36#.include "../../x11/dri3proto/buildlink3.mk" 45#.include "../../x11/dri3proto/buildlink3.mk"
37#.include "../../x11/libxshmfence/buildlink3.mk" 46#.include "../../x11/libxshmfence/buildlink3.mk"
38#CONFIGURE_ARGS+= --enable-xtrans-send-fds 47#CONFIGURE_ARGS+= --enable-xtrans-send-fds
39#CONFIGURE_ARGS+= --enable-dri3 48#CONFIGURE_ARGS+= --enable-dri3
40#CONFIGURE_ARGS+= --enable-glamor 49#CONFIGURE_ARGS+= --enable-glamor
41#.endif 50#.endif
42 51
43.if !empty(PKG_OPTIONS:Minet6) 52.if !empty(PKG_OPTIONS:Minet6)
44CONFIGURE_ARGS+= --enable-ipv6 53CONFIGURE_ARGS+= --enable-ipv6
45.else 54.else
46CONFIGURE_ARGS+= --disable-ipv6 55CONFIGURE_ARGS+= --disable-ipv6
47.endif 56.endif
48 57
49.if !empty(PKG_OPTIONS:Mdebug) 58.if !empty(PKG_OPTIONS:Mdebug)
50CONFIGURE_ARGS+= --enable-debug 59CONFIGURE_ARGS+= --enable-debug
51CFLAGS+= -ggdb 60CFLAGS+= -ggdb
52.endif 61.endif
53 62
54.if !empty(PKG_OPTIONS:Mdtrace) 63.if !empty(PKG_OPTIONS:Mdtrace)
55PLIST.dtrace= yes 64PLIST.dtrace= yes
56CONFIGURE_ARGS+= --with-dtrace 65CONFIGURE_ARGS+= --with-dtrace
57.else 66.else
58CONFIGURE_ARGS+= --without-dtrace 67CONFIGURE_ARGS+= --without-dtrace
59.endif 68.endif