Sat Sep 26 08:47:17 2015 UTC ()
Enable more functionality in modular-xorg-server:

- always include dri3 support with dri option (can still use dri2)
- always include GLAMOR support with dri option
- enable xtrans file descriptor passing
- require mesa 11
- Bump PKGREVISION

GLAMOR is experimental OpenGL accelerated 2D graphics. It works with
xf86-video-ati and xf86-video-intel but must be explicitly enabled.
Sample configuration:

---8<---
# /usr/pkg/share/X11/xorg.conf.d/20-glamor.conf
Section "Module"
    Load "dri2"
    Load "glamoregl"
EndSection
Section "Device"
    Identifier "radeon" # or intel
    Driver "radeon" # or intel
    Option "AccelMethod" "glamor"
EndSection
---8<---


(tnn)
diff -r1.102 -r1.103 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.22 -r1.23 pkgsrc/x11/modular-xorg-server/PLIST
diff -r1.12 -r1.13 pkgsrc/x11/modular-xorg-server/options.mk
cvs diff -r1.102 -r1.103 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2015/09/13 04:59:35 1.102
+++ pkgsrc/x11/modular-xorg-server/Makefile 2015/09/26 08:47:17 1.103
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.102 2015/09/13 04:59:35 tnn Exp $ 1# $NetBSD: Makefile,v 1.103 2015/09/26 08:47:17 tnn Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 5 5PKGREVISION= 6
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modular X11 server from modular X.org 8COMMENT= Modular X11 server from modular X.org
9 9
10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
11 11
12.include "Makefile.common" 12.include "Makefile.common"
13 13
14CONFIGURE_ARGS+= --enable-xorg 14CONFIGURE_ARGS+= --enable-xorg
15CONFIGURE_ARGS+= --disable-xephyr 15CONFIGURE_ARGS+= --disable-xephyr
16CONFIGURE_ARGS+= --disable-kdrive 16CONFIGURE_ARGS+= --disable-kdrive
17 17
18.include "options.mk" 18.include "options.mk"
cvs diff -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2015/07/07 21:51:22 1.1
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2015/09/26 08:47:17 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.1 2015/07/07 21:51:22 khorben Exp $ 1# $NetBSD: Makefile.common,v 1.2 2015/09/26 08:47:17 tnn Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4 4
5XORG_VERSION= 1.17.2 5XORG_VERSION= 1.17.2
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -58,26 +58,27 @@ LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fo @@ -58,26 +58,27 @@ LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fo
58.endfor 58.endfor
59FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} 59FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS}
60 60
61CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} 61CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q}
62 62
63CONFIGURE_ARGS+= --disable-config-hal 63CONFIGURE_ARGS+= --disable-config-hal
64CONFIGURE_ARGS+= --disable-dmx 64CONFIGURE_ARGS+= --disable-dmx
65CONFIGURE_ARGS+= --disable-xwin 65CONFIGURE_ARGS+= --disable-xwin
66CONFIGURE_ARGS+= --disable-xephyr 66CONFIGURE_ARGS+= --disable-xephyr
67CONFIGURE_ARGS+= --disable-kdrive 67CONFIGURE_ARGS+= --disable-kdrive
68#CONFIGURE_ARGS+= --disable-kdrive-vesa 68#CONFIGURE_ARGS+= --disable-kdrive-vesa
69CONFIGURE_ARGS+= --disable-xfake 69CONFIGURE_ARGS+= --disable-xfake
70CONFIGURE_ARGS+= --disable-xfbdev 70CONFIGURE_ARGS+= --disable-xfbdev
 71CONFIGURE_ARGS+= --enable-xtrans-send-fds
71 72
72CONFIGURE_ARGS+= --with-int10=x86emu 73CONFIGURE_ARGS+= --with-int10=x86emu
73 74
74CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 75CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
75CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 76CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
76 77
77PLIST_VARS+= sunos 78PLIST_VARS+= sunos
78PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH} 79PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH}
79 80
80.if ${OPSYS} == "SunOS" 81.if ${OPSYS} == "SunOS"
81PLIST.sunos= yes 82PLIST.sunos= yes
82. if ${MACHINE_ARCH} == "i386" 83. if ${MACHINE_ARCH} == "i386"
83SUNOS_ARCH= ia32 84SUNOS_ARCH= ia32
cvs diff -r1.22 -r1.23 pkgsrc/x11/modular-xorg-server/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/PLIST 2015/09/13 04:59:35 1.22
+++ pkgsrc/x11/modular-xorg-server/PLIST 2015/09/26 08:47:17 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.22 2015/09/13 04:59:35 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.23 2015/09/26 08:47:17 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,46 +23,46 @@ include/xorg/cursorstr.h @@ -23,46 +23,46 @@ 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/dri3.h
37${PLIST.dri}include/xorg/dristruct.h 37${PLIST.dri}include/xorg/dristruct.h
38include/xorg/edid.h 38include/xorg/edid.h
39include/xorg/events.h 39include/xorg/events.h
40include/xorg/exa.h 40include/xorg/exa.h
41include/xorg/exevents.h 41include/xorg/exevents.h
42include/xorg/extension.h 42include/xorg/extension.h
43include/xorg/extinit.h 43include/xorg/extinit.h
44include/xorg/extnsionst.h 44include/xorg/extnsionst.h
45include/xorg/fb.h 45include/xorg/fb.h
46include/xorg/fbdevhw.h 46include/xorg/fbdevhw.h
47include/xorg/fboverlay.h 47include/xorg/fboverlay.h
48include/xorg/fbpict.h 48include/xorg/fbpict.h
49include/xorg/fbrop.h 49include/xorg/fbrop.h
50include/xorg/fourcc.h 50include/xorg/fourcc.h
51include/xorg/gc.h 51include/xorg/gc.h
52include/xorg/gcstruct.h 52include/xorg/gcstruct.h
53include/xorg/geext.h 53include/xorg/geext.h
54include/xorg/geint.h 54include/xorg/geint.h
55${PLIST.glamor}include/xorg/glamor.h 55${PLIST.dri}include/xorg/glamor.h
56include/xorg/globals.h 56include/xorg/globals.h
57include/xorg/glx_extinit.h 57include/xorg/glx_extinit.h
58include/xorg/glyphstr.h 58include/xorg/glyphstr.h
59include/xorg/hotplug.h 59include/xorg/hotplug.h
60include/xorg/i2c_def.h 60include/xorg/i2c_def.h
61include/xorg/input.h 61include/xorg/input.h
62include/xorg/inputstr.h 62include/xorg/inputstr.h
63include/xorg/list.h 63include/xorg/list.h
64include/xorg/mi.h 64include/xorg/mi.h
65include/xorg/micmap.h 65include/xorg/micmap.h
66include/xorg/micoord.h 66include/xorg/micoord.h
67include/xorg/migc.h 67include/xorg/migc.h
68include/xorg/miline.h 68include/xorg/miline.h
@@ -162,27 +162,27 @@ include/xorg/xkbrules.h @@ -162,27 +162,27 @@ include/xorg/xkbrules.h
162include/xorg/xkbsrv.h 162include/xorg/xkbsrv.h
163include/xorg/xkbstr.h 163include/xorg/xkbstr.h
164include/xorg/xorg-server.h 164include/xorg/xorg-server.h
165include/xorg/xorgVersion.h 165include/xorg/xorgVersion.h
166include/xorg/xserver-properties.h 166include/xorg/xserver-properties.h
167include/xorg/xvdix.h 167include/xorg/xvdix.h
168include/xorg/xvmcext.h 168include/xorg/xvmcext.h
169lib/pkgconfig/xorg-server.pc 169lib/pkgconfig/xorg-server.pc
170${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la 170${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la
171${PLIST.dri}lib/xorg/modules/extensions/libglx.la 171${PLIST.dri}lib/xorg/modules/extensions/libglx.la
172lib/xorg/modules/libexa.la 172lib/xorg/modules/libexa.la
173lib/xorg/modules/libfb.la 173lib/xorg/modules/libfb.la
174lib/xorg/modules/libfbdevhw.la 174lib/xorg/modules/libfbdevhw.la
175${PLIST.glamor}lib/xorg/modules/libglamoregl.la 175${PLIST.dri}lib/xorg/modules/libglamoregl.la
176lib/xorg/modules/libint10.la 176lib/xorg/modules/libint10.la
177lib/xorg/modules/libshadow.la 177lib/xorg/modules/libshadow.la
178lib/xorg/modules/libshadowfb.la 178lib/xorg/modules/libshadowfb.la
179lib/xorg/modules/libvbe.la 179lib/xorg/modules/libvbe.la
180lib/xorg/modules/libvgahw.la 180lib/xorg/modules/libvgahw.la
181lib/xorg/modules/libwfb.la 181lib/xorg/modules/libwfb.la
182lib/xorg/protocol.txt 182lib/xorg/protocol.txt
183man/man1/Xnest.1 183man/man1/Xnest.1
184man/man1/Xorg.1 184man/man1/Xorg.1
185man/man1/Xserver.1 185man/man1/Xserver.1
186man/man1/Xvfb.1 186man/man1/Xvfb.1
187man/man1/cvt.1 187man/man1/cvt.1
188man/man1/gtf.1 188man/man1/gtf.1
cvs diff -r1.12 -r1.13 pkgsrc/x11/modular-xorg-server/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/options.mk 2015/09/13 04:59:35 1.12
+++ pkgsrc/x11/modular-xorg-server/options.mk 2015/09/26 08:47:17 1.13
@@ -1,48 +1,40 @@ @@ -1,48 +1,40 @@
1# $NetBSD: options.mk,v 1.12 2015/09/13 04:59:35 tnn Exp $ 1# $NetBSD: options.mk,v 1.13 2015/09/26 08:47:17 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 dri3 dtrace glamor 9PLIST_VARS+= dri 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>=11
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/dri3proto/buildlink3.mk"
17.include "../../x11/libdrm/buildlink3.mk" 18.include "../../x11/libdrm/buildlink3.mk"
 19.include "../../x11/libxshmfence/buildlink3.mk"
18.include "../../x11/xf86driproto/buildlink3.mk" 20.include "../../x11/xf86driproto/buildlink3.mk"
19PLIST.dri= yes 21PLIST.dri= yes
20CONFIGURE_ARGS+= --enable-dri 22CONFIGURE_ARGS+= --enable-dri
 23CONFIGURE_ARGS+= --enable-dri2
 24CONFIGURE_ARGS+= --enable-dri3
21CONFIGURE_ARGS+= --enable-glx 25CONFIGURE_ARGS+= --enable-glx
22CONFIGURE_ARGS+= --enable-aiglx 26CONFIGURE_ARGS+= --enable-aiglx
23. if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 
24PLIST.glamor= yes 
25CONFIGURE_ARGS+= --enable-glamor 27CONFIGURE_ARGS+= --enable-glamor
26.include "../../x11/libxshmfence/buildlink3.mk" 
27. endif 
28# Linux supports dri3 
29. if ${OPSYS} == "Linux" 
30PLIST.dri3= yes 
31.include "../../x11/dri3proto/buildlink3.mk" 
32CONFIGURE_ARGS+= --enable-dri3 
33. else 
34CONFIGURE_ARGS+= --disable-dri3 
35. endif 
36.else 28.else
37### 29###
38### XXX Perhaps we should allow for a built-in glx without dri enabled? 30### XXX Perhaps we should allow for a built-in glx without dri enabled?
39### 31###
40CONFIGURE_ARGS+= --disable-dri 32CONFIGURE_ARGS+= --disable-dri
41CONFIGURE_ARGS+= --disable-glx 33CONFIGURE_ARGS+= --disable-glx
42pre-build: disable-modesetting 34pre-build: disable-modesetting
43.PHONY: disable-modesetting 35.PHONY: disable-modesetting
44disable-modesetting: 36disable-modesetting:
45 (echo "all:"; echo "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile 37 (echo "all:"; echo "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile
46.endif 38.endif
47 39
48.if !empty(PKG_OPTIONS:Minet6) 40.if !empty(PKG_OPTIONS:Minet6)