Sun Oct 16 06:23:48 2016 UTC ()
begin to get alpha to xorg-server 1.18 - disable the known problematic
drivers.


(mrg)
diff -r1.90 -r1.91 src/external/mit/xorg/server/drivers/Makefile
cvs diff -r1.90 -r1.91 src/external/mit/xorg/server/drivers/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/drivers/Makefile 2016/10/04 21:37:10 1.90
+++ src/external/mit/xorg/server/drivers/Makefile 2016/10/16 06:23:48 1.91
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.90 2016/10/04 21:37:10 mrg Exp $ 1# $NetBSD: Makefile,v 1.91 2016/10/16 06:23:48 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# modesetting is builtin to xorg-server 1.18 tree 5# modesetting is builtin to xorg-server 1.18 tree
6.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" 6.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
7MODE_SETTING= xf86-video-modesetting 7MODE_SETTING= xf86-video-modesetting
8.else 8.else
9MODE_SETTING= 9MODE_SETTING=
10.endif 10.endif
11 11
12# xf86-input drivers 12# xf86-input drivers
13 13
14SUBDIR= \ 14SUBDIR= \
@@ -83,53 +83,57 @@ SUBDIR+= \ @@ -83,53 +83,57 @@ SUBDIR+= \
83SUBDIR+= \ 83SUBDIR+= \
84 xf86-video-amdgpu 84 xf86-video-amdgpu
85.endif # ${XORG_SERVER_SUBDIR} == "xorg-server" 85.endif # ${XORG_SERVER_SUBDIR} == "xorg-server"
86 86
87.if ${MACHINE_ARCH} == "i386" 87.if ${MACHINE_ARCH} == "i386"
88SUBDIR+= \ 88SUBDIR+= \
89 xf86-video-geode 89 xf86-video-geode
90.endif # ${MACHINE_ARCH} == "i386" 90.endif # ${MACHINE_ARCH} == "i386"
91 91
92.endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 92.endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
93 93
94.if ${MACHINE} == "alpha" 94.if ${MACHINE} == "alpha"
95SUBDIR+= \ 95SUBDIR+= \
96 xf86-video-apm \ 
97 xf86-video-ark \ 
98 xf86-video-ast \ 96 xf86-video-ast \
99 xf86-video-ati \ 97 xf86-video-ati \
100 xf86-video-chips \ 98 xf86-video-chips \
101 xf86-video-cirrus \ 99 xf86-video-cirrus \
102 xf86-video-cirrus_alpine \ 100 xf86-video-cirrus_alpine \
103 xf86-video-cirrus_laguna \ 101 xf86-video-cirrus_laguna \
104 xf86-video-glint \ 
105 xf86-video-i128 \ 102 xf86-video-i128 \
106 xf86-video-i740 \ 103 xf86-video-i740 \
107 xf86-video-mach64 \ 104 xf86-video-mach64 \
108 xf86-video-mga \ 105 xf86-video-mga \
109 xf86-video-nv \ 106 xf86-video-nv \
110 xf86-video-r128 \ 107 xf86-video-r128 \
111 xf86-video-radeon \ 108 xf86-video-radeon \
112 xf86-video-s3 \ 109 xf86-video-s3 \
113 xf86-video-s3virge \ 110 xf86-video-s3virge \
114 xf86-video-savage \ 111 xf86-video-savage \
115 xf86-video-siliconmotion \ 112 xf86-video-siliconmotion \
116 xf86-video-sis \ 113 xf86-video-sis \
117 xf86-video-tdfx \ 114 xf86-video-tdfx \
118 xf86-video-tga \ 115 xf86-video-tga \
119 xf86-video-trident \ 116 xf86-video-trident \
120 xf86-video-tseng \ 117 xf86-video-tseng \
121 xf86-video-wsfb 118 xf86-video-wsfb
122# xf86-video-imstt 119# xf86-video-imstt
 120# needs porting for xorg-server 1.18
 121.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 122SUBDIR+= \
 123 xf86-video-apm \
 124 xf86-video-ark \
 125 xf86-video-glint
 126.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
123.endif # ${MACHINE} == "alpha" 127.endif # ${MACHINE} == "alpha"
124 128
125.if ${MACHINE} == "amiga" 129.if ${MACHINE} == "amiga"
126SUBDIR+= \ 130SUBDIR+= \
127 xf86-video-wsfb 131 xf86-video-wsfb
128.endif # ${MACHINE} == "amiga" 132.endif # ${MACHINE} == "amiga"
129 133
130.if ${MACHINE} == "bebox" 134.if ${MACHINE} == "bebox"
131SUBDIR+= \ 135SUBDIR+= \
132 xf86-video-cirrus \ 136 xf86-video-cirrus \
133 xf86-video-cirrus_alpine \ 137 xf86-video-cirrus_alpine \
134 xf86-video-mga \ 138 xf86-video-mga \
135 xf86-video-s3 \ 139 xf86-video-s3 \