Tue Jan 5 13:04:23 2016 UTC ()
Update to xorg-server-1.18.0 (2015-11-09)

The main highlight of this release are RandR 1.5 with reworked
multi-monitor support, GLAMOR optimizations and better generic
modesetting driver support.


(tnn)
diff -r1.4 -r1.5 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.23 -r1.24 pkgsrc/x11/modular-xorg-server/PLIST
diff -r1.16 -r1.17 pkgsrc/x11/modular-xorg-server/buildlink3.mk
diff -r1.68 -r1.69 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.2 -r0 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h
cvs diff -r1.4 -r1.5 pkgsrc/x11/modular-xorg-server/Makefile.common (switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2015/11/08 15:08:00 1.4
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2016/01/05 13:04:23 1.5
@@ -1,183 +1,184 @@ @@ -1,183 +1,184 @@
1# $NetBSD: Makefile.common,v 1.4 2015/11/08 15:08:00 sevan Exp $ 1# $NetBSD: Makefile.common,v 1.5 2016/01/05 13:04:23 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.4 5XORG_VERSION= 1.18.0
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
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES+= c99 16USE_LANGUAGES+= c99
17 17
18PKGCONFIG_OVERRIDE+= xorg-server.pc.in 18PKGCONFIG_OVERRIDE+= xorg-server.pc.in
19SHLIBTOOL_OVERRIDE= # empty 19SHLIBTOOL_OVERRIDE= # empty
20 20
21BUILD_DEFS+= VARBASE 21BUILD_DEFS+= VARBASE
22BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR 22BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR
23 23
24OWN_DIRS+= ${VARBASE}/log 24OWN_DIRS+= ${VARBASE}/log
25OWN_DIRS+= ${XKB_OUTPUT_DIR} 25OWN_DIRS+= ${XKB_OUTPUT_DIR}
26XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config 26XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
27 27
28CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 28CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
29CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 29CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
30 30
31.if !empty(USE_TOOLS:Mauto*) 31.if !empty(USE_TOOLS:Mauto*)
32TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 32TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
33.endif 33.endif
34 34
35DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 35DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
36DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 36DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40.if ${OPSYS} == "NetBSD" 40.if ${OPSYS} == "NetBSD"
 41CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3)
41CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 42CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
42CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 43CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
43# TLS is not supported by NetBSD<6 44# TLS is not supported by NetBSD<6
44. if !empty(OS_VERSION:M[0-5].*) 45. if !empty(OS_VERSION:M[0-5].*)
45CONFIGURE_ENV+= ac_cv_tls=no 46CONFIGURE_ENV+= ac_cv_tls=no
46CONFIGURE_ARGS+= --disable-glx-tls 47CONFIGURE_ARGS+= --disable-glx-tls
47. endif 48. endif
48.endif 49.endif
49CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 50CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
50 51
51CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 52CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11
52 53
53LEGACY_FONT_PATHS= 54LEGACY_FONT_PATHS=
54DEFAULT_FONT_PATHS= 55DEFAULT_FONT_PATHS=
55.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic 56.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic
56DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} 57DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f}
57LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} 58LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f}
58.endfor 59.endfor
59FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} 60FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS}
60 61
61CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} 62CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q}
62 63
63CONFIGURE_ARGS+= --disable-config-hal 64CONFIGURE_ARGS+= --disable-config-hal
64CONFIGURE_ARGS+= --disable-dmx 65CONFIGURE_ARGS+= --disable-dmx
65CONFIGURE_ARGS+= --disable-xwin 66CONFIGURE_ARGS+= --disable-xwin
66CONFIGURE_ARGS+= --disable-xephyr 67CONFIGURE_ARGS+= --disable-xephyr
67CONFIGURE_ARGS+= --disable-kdrive 68CONFIGURE_ARGS+= --disable-kdrive
68#CONFIGURE_ARGS+= --disable-kdrive-vesa 69#CONFIGURE_ARGS+= --disable-kdrive-vesa
69CONFIGURE_ARGS+= --disable-xfake 70CONFIGURE_ARGS+= --disable-xfake
70CONFIGURE_ARGS+= --disable-xfbdev 71CONFIGURE_ARGS+= --disable-xfbdev
71CONFIGURE_ARGS+= --enable-xtrans-send-fds 72CONFIGURE_ARGS+= --enable-xtrans-send-fds
72 73
73CONFIGURE_ARGS+= --with-int10=x86emu 74CONFIGURE_ARGS+= --with-int10=x86emu
74 75
75CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 76CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
76CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 77CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
77 78
78PLIST_VARS+= sunos 79PLIST_VARS+= sunos
79PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH} 80PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH}
80 81
81.if ${OPSYS} == "SunOS" 82.if ${OPSYS} == "SunOS"
82PLIST.sunos= yes 83PLIST.sunos= yes
83. if ${MACHINE_ARCH} == "i386" 84. if ${MACHINE_ARCH} == "i386"
84SUNOS_ARCH= ia32 85SUNOS_ARCH= ia32
85. elif ${MACHINE_ARCH} == "x86_64" 86. elif ${MACHINE_ARCH} == "x86_64"
86SUNOS_ARCH= amd64 87SUNOS_ARCH= amd64
87. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" 88. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
88SUNOS_ARCH= sparcv8plus 89SUNOS_ARCH= sparcv8plus
89. endif 90. endif
90.endif 91.endif
91 92
92PLIST_VARS+= sparc 93PLIST_VARS+= sparc
93.if !empty(MACHINE_ARCH:Msparc*) 94.if !empty(MACHINE_ARCH:Msparc*)
94PLIST.sparc= yes 95PLIST.sparc= yes
95.endif 96.endif
96 97
97# Workaround for PR#41556. 98# Workaround for PR#41556.
98# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 99# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
99.if ${OPSYS} == "NetBSD" 100.if ${OPSYS} == "NetBSD"
100CONFIGURE_ENV+= ac_cv_header_sys_event_h=no 101CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
101.endif 102.endif
102 103
103INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 104INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
104 105
105BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 106BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
106BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 107BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
107BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 108BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
108BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 109BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
109BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 110BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
110BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 111BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
111BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 112BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
112BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22 113BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22
113BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 114BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
114BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 115BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
115BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 116BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
116BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0 117BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
117BUILDLINK_API_DEPENDS.dri+= dri>=7.8 118BUILDLINK_API_DEPENDS.dri+= dri>=7.8
118BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 119BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
119BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16 120BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
120BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6 121BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
121BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 122BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
122BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 123BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
123BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0 124BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
124BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 125BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
125BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 126BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
126BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0 127BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
127 128
128BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 129BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
129CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 130CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
130 131
131.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD" 132.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
132CONFIGURE_ARGS+= --with-sha1=libc 133CONFIGURE_ARGS+= --with-sha1=libc
133.else 134.else
134.include "../../security/nettle/buildlink3.mk" 135.include "../../security/nettle/buildlink3.mk"
135CONFIGURE_ARGS+= --with-sha1=libnettle 136CONFIGURE_ARGS+= --with-sha1=libnettle
136.endif 137.endif
137 138
138.include "../../devel/ncurses/buildlink3.mk" 139.include "../../devel/ncurses/buildlink3.mk"
139.include "../../devel/zlib/buildlink3.mk" 140.include "../../devel/zlib/buildlink3.mk"
140.include "../../fonts/libfontenc/buildlink3.mk" 141.include "../../fonts/libfontenc/buildlink3.mk"
141BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 142BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
142BUILDLINK_DEPMETHOD.libpciaccess= full 143BUILDLINK_DEPMETHOD.libpciaccess= full
143.include "../../sysutils/libpciaccess/buildlink3.mk" 144.include "../../sysutils/libpciaccess/buildlink3.mk"
144.include "../../x11/bigreqsproto/buildlink3.mk" 145.include "../../x11/bigreqsproto/buildlink3.mk"
145.include "../../x11/compositeproto/buildlink3.mk" 146.include "../../x11/compositeproto/buildlink3.mk"
146.include "../../x11/damageproto/buildlink3.mk" 147.include "../../x11/damageproto/buildlink3.mk"
147.include "../../x11/evieext/buildlink3.mk" 148.include "../../x11/evieext/buildlink3.mk"
148.include "../../x11/fixesproto/buildlink3.mk" 149.include "../../x11/fixesproto/buildlink3.mk"
149.include "../../x11/fontsproto/buildlink3.mk" 150.include "../../x11/fontsproto/buildlink3.mk"
150.include "../../x11/inputproto/buildlink3.mk" 151.include "../../x11/inputproto/buildlink3.mk"
151.include "../../x11/libX11/buildlink3.mk" 152.include "../../x11/libX11/buildlink3.mk"
152.include "../../x11/libXau/buildlink3.mk" 153.include "../../x11/libXau/buildlink3.mk"
153.include "../../x11/libXaw/buildlink3.mk" 154.include "../../x11/libXaw/buildlink3.mk"
154BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 155BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
155.include "../../x11/libXext/buildlink3.mk" 156.include "../../x11/libXext/buildlink3.mk"
156.include "../../x11/libXfixes/buildlink3.mk" 157.include "../../x11/libXfixes/buildlink3.mk"
157.include "../../x11/libXfont/buildlink3.mk" 158.include "../../x11/libXfont/buildlink3.mk"
158.include "../../x11/libXt/buildlink3.mk" 159.include "../../x11/libXt/buildlink3.mk"
159.include "../../x11/libXxf86misc/buildlink3.mk" 160.include "../../x11/libXxf86misc/buildlink3.mk"
160.include "../../x11/libXxf86vm/buildlink3.mk" 161.include "../../x11/libXxf86vm/buildlink3.mk"
161.include "../../x11/libXinerama/buildlink3.mk" 162.include "../../x11/libXinerama/buildlink3.mk"
162.include "../../x11/libxkbfile/buildlink3.mk" 163.include "../../x11/libxkbfile/buildlink3.mk"
163.include "../../x11/libxkbui/buildlink3.mk" 164.include "../../x11/libxkbui/buildlink3.mk"
164.include "../../x11/pixman/buildlink3.mk" 165.include "../../x11/pixman/buildlink3.mk"
165.include "../../x11/presentproto/buildlink3.mk" 166.include "../../x11/presentproto/buildlink3.mk"
166.include "../../x11/randrproto/buildlink3.mk" 167.include "../../x11/randrproto/buildlink3.mk"
167.include "../../x11/recordproto/buildlink3.mk" 168.include "../../x11/recordproto/buildlink3.mk"
168.include "../../x11/renderproto/buildlink3.mk" 169.include "../../x11/renderproto/buildlink3.mk"
169.include "../../x11/resourceproto/buildlink3.mk" 170.include "../../x11/resourceproto/buildlink3.mk"
170.include "../../x11/scrnsaverproto/buildlink3.mk" 171.include "../../x11/scrnsaverproto/buildlink3.mk"
171.include "../../x11/trapproto/buildlink3.mk" 172.include "../../x11/trapproto/buildlink3.mk"
172.include "../../x11/videoproto/buildlink3.mk" 173.include "../../x11/videoproto/buildlink3.mk"
173.include "../../x11/xcmiscproto/buildlink3.mk" 174.include "../../x11/xcmiscproto/buildlink3.mk"
174.include "../../x11/xextproto/buildlink3.mk" 175.include "../../x11/xextproto/buildlink3.mk"
175.include "../../x11/kbproto/buildlink3.mk" 176.include "../../x11/kbproto/buildlink3.mk"
176.include "../../x11/xcb-util-keysyms/buildlink3.mk" 177.include "../../x11/xcb-util-keysyms/buildlink3.mk"
177.include "../../x11/xf86bigfontproto/buildlink3.mk" 178.include "../../x11/xf86bigfontproto/buildlink3.mk"
178.include "../../x11/xf86dgaproto/buildlink3.mk" 179.include "../../x11/xf86dgaproto/buildlink3.mk"
179.include "../../x11/xf86miscproto/buildlink3.mk" 180.include "../../x11/xf86miscproto/buildlink3.mk"
180.include "../../x11/xf86vidmodeproto/buildlink3.mk" 181.include "../../x11/xf86vidmodeproto/buildlink3.mk"
181.include "../../x11/xineramaproto/buildlink3.mk" 182.include "../../x11/xineramaproto/buildlink3.mk"
182.include "../../x11/xproto/buildlink3.mk" 183.include "../../x11/xproto/buildlink3.mk"
183.include "../../x11/xtrans/buildlink3.mk" 184.include "../../x11/xtrans/buildlink3.mk"
cvs diff -r1.23 -r1.24 pkgsrc/x11/modular-xorg-server/PLIST (switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/PLIST 2015/09/26 08:47:17 1.23
+++ pkgsrc/x11/modular-xorg-server/PLIST 2016/01/05 13:04:23 1.24
@@ -1,196 +1,193 @@ @@ -1,196 +1,193 @@
1@comment $NetBSD: PLIST,v 1.23 2015/09/26 08:47:17 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.24 2016/01/05 13:04:23 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.dri}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.dri}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
69include/xorg/mioverlay.h 69include/xorg/mioverlay.h
70include/xorg/mipict.h 70include/xorg/mipict.h
71include/xorg/mipointer.h 71include/xorg/mipointer.h
72include/xorg/mipointrst.h 72include/xorg/mipointrst.h
73include/xorg/misc.h 73include/xorg/misc.h
74include/xorg/miscstruct.h 74include/xorg/miscstruct.h
75include/xorg/mistruct.h 75include/xorg/mistruct.h
76include/xorg/misync.h 76include/xorg/misync.h
77include/xorg/misyncfd.h 77include/xorg/misyncfd.h
78include/xorg/misyncshm.h 78include/xorg/misyncshm.h
79include/xorg/misyncstr.h 79include/xorg/misyncstr.h
80include/xorg/mizerarc.h 80include/xorg/mizerarc.h
 81include/xorg/nonsdk_extinit.h
81include/xorg/opaque.h 82include/xorg/opaque.h
82include/xorg/optionstr.h 83include/xorg/optionstr.h
83include/xorg/os.h 84include/xorg/os.h
84include/xorg/panoramiX.h 85include/xorg/panoramiX.h
85include/xorg/panoramiXsrv.h 86include/xorg/panoramiXsrv.h
86include/xorg/picture.h 87include/xorg/picture.h
87include/xorg/picturestr.h 88include/xorg/picturestr.h
88include/xorg/pixmap.h 89include/xorg/pixmap.h
89include/xorg/pixmapstr.h 90include/xorg/pixmapstr.h
90include/xorg/present.h 91include/xorg/present.h
91include/xorg/presentext.h 92include/xorg/presentext.h
92include/xorg/privates.h 93include/xorg/privates.h
93include/xorg/property.h 94include/xorg/property.h
94include/xorg/propertyst.h 95include/xorg/propertyst.h
95include/xorg/ptrveloc.h 96include/xorg/ptrveloc.h
96include/xorg/randrstr.h 97include/xorg/randrstr.h
97include/xorg/region.h 98include/xorg/region.h
98include/xorg/regionstr.h 99include/xorg/regionstr.h
99include/xorg/registry.h 100include/xorg/registry.h
100include/xorg/resource.h 101include/xorg/resource.h
101include/xorg/rgb.h 102include/xorg/rgb.h
102include/xorg/rrtransform.h 103include/xorg/rrtransform.h
103${PLIST.dri}include/xorg/sarea.h 104${PLIST.dri}include/xorg/sarea.h
104include/xorg/screenint.h 105include/xorg/screenint.h
105include/xorg/scrnintstr.h 106include/xorg/scrnintstr.h
106include/xorg/selection.h 107include/xorg/selection.h
107include/xorg/servermd.h 108include/xorg/servermd.h
108include/xorg/shadow.h 109include/xorg/shadow.h
109include/xorg/shadowfb.h 110include/xorg/shadowfb.h
110include/xorg/shmint.h 111include/xorg/shmint.h
111include/xorg/site.h 112include/xorg/site.h
112${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il 113${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
113include/xorg/swaprep.h 
114include/xorg/swapreq.h 
115include/xorg/syncsdk.h 114include/xorg/syncsdk.h
116include/xorg/validate.h 115include/xorg/validate.h
117include/xorg/vbe.h 116include/xorg/vbe.h
118include/xorg/vbeModes.h 117include/xorg/vbeModes.h
119include/xorg/vgaHW.h 118include/xorg/vgaHW.h
120include/xorg/vidmodeproc.h 
121include/xorg/wfbrename.h 119include/xorg/wfbrename.h
122include/xorg/window.h 120include/xorg/window.h
123include/xorg/windowstr.h 121include/xorg/windowstr.h
124include/xorg/xaarop.h 122include/xorg/xaarop.h
125include/xorg/xace.h 123include/xorg/xace.h
126include/xorg/xacestr.h 124include/xorg/xacestr.h
127include/xorg/xf86.h 125include/xorg/xf86.h
128include/xorg/xf86Crtc.h 126include/xorg/xf86Crtc.h
129include/xorg/xf86Cursor.h 127include/xorg/xf86Cursor.h
130include/xorg/xf86DDC.h 128include/xorg/xf86DDC.h
131include/xorg/xf86Modes.h 129include/xorg/xf86Modes.h
132include/xorg/xf86Module.h 130include/xorg/xf86Module.h
133include/xorg/xf86Opt.h 131include/xorg/xf86Opt.h
134include/xorg/xf86Optionstr.h 132include/xorg/xf86Optionstr.h
135include/xorg/xf86Optrec.h 133include/xorg/xf86Optrec.h
136include/xorg/xf86Parser.h 134include/xorg/xf86Parser.h
137include/xorg/xf86Pci.h 135include/xorg/xf86Pci.h
138include/xorg/xf86PciInfo.h 136include/xorg/xf86PciInfo.h
139include/xorg/xf86Priv.h 137include/xorg/xf86Priv.h
140include/xorg/xf86Privstr.h 138include/xorg/xf86Privstr.h
141include/xorg/xf86RamDac.h 139include/xorg/xf86RamDac.h
142include/xorg/xf86RandR12.h 140include/xorg/xf86RandR12.h
143${PLIST.sparc}include/xorg/xf86Sbus.h 141${PLIST.sparc}include/xorg/xf86Sbus.h
144include/xorg/xf86VGAarbiter.h 142include/xorg/xf86VGAarbiter.h
145include/xorg/xf86Xinput.h 143include/xorg/xf86Xinput.h
146include/xorg/xf86_OSlib.h 144include/xorg/xf86_OSlib.h
147include/xorg/xf86_OSproc.h 145include/xorg/xf86_OSproc.h
148include/xorg/xf86cmap.h 146include/xorg/xf86cmap.h
149include/xorg/xf86fbman.h 147include/xorg/xf86fbman.h
150include/xorg/xf86i2c.h 148include/xorg/xf86i2c.h
151include/xorg/xf86int10.h 149include/xorg/xf86int10.h
152include/xorg/xf86platformBus.h 150include/xorg/xf86platformBus.h
153include/xorg/xf86sbusBus.h 151include/xorg/xf86sbusBus.h
154include/xorg/xf86str.h 152include/xorg/xf86str.h
155include/xorg/xf86xv.h 153include/xorg/xf86xv.h
156include/xorg/xf86xvmc.h 154include/xorg/xf86xvmc.h
157include/xorg/xf86xvpriv.h 155include/xorg/xf86xvpriv.h
158include/xorg/xfixes.h 
159include/xorg/xisb.h 156include/xorg/xisb.h
160include/xorg/xkbfile.h 157include/xorg/xkbfile.h
161include/xorg/xkbrules.h 158include/xorg/xkbrules.h
162include/xorg/xkbsrv.h 159include/xorg/xkbsrv.h
163include/xorg/xkbstr.h 160include/xorg/xkbstr.h
164include/xorg/xorg-server.h 161include/xorg/xorg-server.h
165include/xorg/xorgVersion.h 162include/xorg/xorgVersion.h
166include/xorg/xserver-properties.h 163include/xorg/xserver-properties.h
167include/xorg/xvdix.h 164include/xorg/xvdix.h
168include/xorg/xvmcext.h 165include/xorg/xvmcext.h
169lib/pkgconfig/xorg-server.pc 166lib/pkgconfig/xorg-server.pc
170${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la 167${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la
171${PLIST.dri}lib/xorg/modules/extensions/libglx.la 168${PLIST.dri}lib/xorg/modules/extensions/libglx.la
172lib/xorg/modules/libexa.la 169lib/xorg/modules/libexa.la
173lib/xorg/modules/libfb.la 170lib/xorg/modules/libfb.la
174lib/xorg/modules/libfbdevhw.la 171lib/xorg/modules/libfbdevhw.la
175${PLIST.dri}lib/xorg/modules/libglamoregl.la 172${PLIST.dri}lib/xorg/modules/libglamoregl.la
176lib/xorg/modules/libint10.la 173lib/xorg/modules/libint10.la
177lib/xorg/modules/libshadow.la 174lib/xorg/modules/libshadow.la
178lib/xorg/modules/libshadowfb.la 175lib/xorg/modules/libshadowfb.la
179lib/xorg/modules/libvbe.la 176lib/xorg/modules/libvbe.la
180lib/xorg/modules/libvgahw.la 177lib/xorg/modules/libvgahw.la
181lib/xorg/modules/libwfb.la 178lib/xorg/modules/libwfb.la
182lib/xorg/protocol.txt 179lib/xorg/protocol.txt
183man/man1/Xnest.1 180man/man1/Xnest.1
184man/man1/Xorg.1 181man/man1/Xorg.1
185man/man1/Xserver.1 182man/man1/Xserver.1
186man/man1/Xvfb.1 183man/man1/Xvfb.1
187man/man1/cvt.1 184man/man1/cvt.1
188man/man1/gtf.1 185man/man1/gtf.1
189man/man4/exa.4 186man/man4/exa.4
190man/man4/fbdevhw.4 187man/man4/fbdevhw.4
191${PLIST.dri}man/man4/modesetting.4 188${PLIST.dri}man/man4/modesetting.4
192man/man5/xorg.conf.5 189man/man5/xorg.conf.5
193man/man5/xorg.conf.d.5 190man/man5/xorg.conf.d.5
194share/aclocal/xorg-server.m4 191share/aclocal/xorg-server.m4
195${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml 192${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml
196@pkgdir lib/xorg/modules/input 193@pkgdir lib/xorg/modules/input
cvs diff -r1.16 -r1.17 pkgsrc/x11/modular-xorg-server/buildlink3.mk (switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/buildlink3.mk 2015/09/25 00:57:16 1.16
+++ pkgsrc/x11/modular-xorg-server/buildlink3.mk 2016/01/05 13:04:23 1.17
@@ -1,46 +1,47 @@ @@ -1,46 +1,47 @@
1# $NetBSD: buildlink3.mk,v 1.16 2015/09/25 00:57:16 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.17 2016/01/05 13:04:23 tnn Exp $
2 2
3BUILDLINK_TREE+= modular-xorg-server 3BUILDLINK_TREE+= modular-xorg-server
4 4
5.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK) 5.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK)
6MODULAR_XORG_SERVER_BUILDLINK3_MK:= 6MODULAR_XORG_SERVER_BUILDLINK3_MK:=
7 7
8.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
9 9
10USE_OLD_MODULAR_XORG_SERVER?= no 10USE_OLD_MODULAR_XORG_SERVER?= no
11 11
12.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS]) 12.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
13BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17 13BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17
14BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server112 14BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server112
15.else 15.else
16BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.17 16BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18
17BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server 17BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
18.endif 18.endif
19 19
20BUILDLINK_DEPMETHOD.libpciaccess= full 20BUILDLINK_DEPMETHOD.libpciaccess= full
21.include "../../sysutils/libpciaccess/buildlink3.mk" 21.include "../../sysutils/libpciaccess/buildlink3.mk"
22.include "../../x11/pixman/buildlink3.mk" 22.include "../../x11/pixman/buildlink3.mk"
23 23
24.include "../../x11/compositeproto/buildlink3.mk" 24.include "../../x11/compositeproto/buildlink3.mk"
25.include "../../x11/dri2proto/buildlink3.mk" 25.include "../../x11/dri2proto/buildlink3.mk"
26.include "../../x11/dri3proto/buildlink3.mk" 26.include "../../x11/dri3proto/buildlink3.mk"
27.include "../../x11/fontsproto/buildlink3.mk" 27.include "../../x11/fontsproto/buildlink3.mk"
28.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS]) 28.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
29.include "../../graphics/MesaLib7/buildlink3.mk" # XXX should not be needed for non-dri build 29.include "../../graphics/MesaLib7/buildlink3.mk" # XXX should not be needed for non-dri build
30.else 30.else
31.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build 31.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
32.include "../../x11/resourceproto/buildlink3.mk" 32.include "../../x11/resourceproto/buildlink3.mk"
33.include "../../x11/scrnsaverproto/buildlink3.mk" 33.include "../../x11/scrnsaverproto/buildlink3.mk"
34.include "../../x11/presentproto/buildlink3.mk" 34.include "../../x11/presentproto/buildlink3.mk"
35.endif 35.endif
36.include "../../x11/inputproto/buildlink3.mk" 36.include "../../x11/inputproto/buildlink3.mk"
 37.include "../../x11/libXfont/buildlink3.mk"
37.include "../../x11/randrproto/buildlink3.mk" 38.include "../../x11/randrproto/buildlink3.mk"
38.include "../../x11/renderproto/buildlink3.mk" 39.include "../../x11/renderproto/buildlink3.mk"
39.include "../../x11/videoproto/buildlink3.mk" 40.include "../../x11/videoproto/buildlink3.mk"
40.include "../../x11/xextproto/buildlink3.mk" 41.include "../../x11/xextproto/buildlink3.mk"
41.include "../../x11/xf86driproto/buildlink3.mk" 42.include "../../x11/xf86driproto/buildlink3.mk"
42.include "../../x11/xproto/buildlink3.mk" 43.include "../../x11/xproto/buildlink3.mk"
43.include "../../x11/xineramaproto/buildlink3.mk" 44.include "../../x11/xineramaproto/buildlink3.mk"
44.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK 45.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
45 46
46BUILDLINK_TREE+= -modular-xorg-server 47BUILDLINK_TREE+= -modular-xorg-server
cvs diff -r1.68 -r1.69 pkgsrc/x11/modular-xorg-server/distinfo (switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2015/11/01 22:58:52 1.68
+++ pkgsrc/x11/modular-xorg-server/distinfo 2016/01/05 13:04:23 1.69
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: distinfo,v 1.68 2015/11/01 22:58:52 tnn Exp $ 1$NetBSD: distinfo,v 1.69 2016/01/05 13:04:23 tnn Exp $
2 2
3SHA1 (xorg-server-1.17.4.tar.bz2) = 139c4d6795eb4c3848616cc514d134532975e49e 3SHA1 (xorg-server-1.18.0.tar.bz2) = f37f9ca17d211552c775c3ce78ff03385026bf3a
4RMD160 (xorg-server-1.17.4.tar.bz2) = d89d56015d093666e932fd0afc7d51aa2db7cc2f 4RMD160 (xorg-server-1.18.0.tar.bz2) = d154fa2a43ad32e746fba9893d51206036a6daa7
5SHA512 (xorg-server-1.17.4.tar.bz2) = 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 5SHA512 (xorg-server-1.18.0.tar.bz2) = c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
6Size (xorg-server-1.17.4.tar.bz2) = 5791384 bytes 6Size (xorg-server-1.18.0.tar.bz2) = 5818703 bytes
7SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2 7SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
8SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8 8SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8
9SHA1 (patch-hw_xfree86_common_compiler.h) = c6f2a1ec352e3577dcd46acc8c9c45d81a0c3964 
10SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
11SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 11SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
13SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 12SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
14SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59 13SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
15SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 74ddd0ce09b8d4426accca5a1a1d25bc6cea6524 14SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 74ddd0ce09b8d4426accca5a1a1d25bc6cea6524
16SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 15SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
17SHA1 (patch-os_WaitFor.c) = a76c5ef4e3725f5299fa3f0860183e89c6004a71 16SHA1 (patch-os_WaitFor.c) = a76c5ef4e3725f5299fa3f0860183e89c6004a71
18SHA1 (patch-os_connection.c) = d6b9bbc1ab34cec6457aa68546105ea5deb6ded6 17SHA1 (patch-os_connection.c) = d6b9bbc1ab34cec6457aa68546105ea5deb6ded6
19SHA1 (patch-os_io.c) = 6216e35e780706a8d5aaa60652c9ae7b4ec8e6e6 18SHA1 (patch-os_io.c) = 6216e35e780706a8d5aaa60652c9ae7b4ec8e6e6
20SHA1 (patch-os_xdmcp.c) = 3d0f3a1d8c7078f3c8752e5ca12929e41d76f899 19SHA1 (patch-os_xdmcp.c) = 3d0f3a1d8c7078f3c8752e5ca12929e41d76f899
21SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e 20SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e
File Deleted: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-hw_xfree86_common_compiler.h