Thu May 27 04:54:21 2021 UTC ()
Restore the build of the pnozz driver on sparc, now that it has EXA support.


(jdc)
diff -r1.101 -r1.102 src/external/mit/xorg/server/drivers/Makefile
cvs diff -r1.101 -r1.102 src/external/mit/xorg/server/drivers/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/drivers/Makefile 2021/03/07 10:42:27 1.101
+++ src/external/mit/xorg/server/drivers/Makefile 2021/05/27 04:54:21 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.101 2021/03/07 10:42:27 rin Exp $ 1# $NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc 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= \
@@ -325,26 +325,27 @@ SUBDIR+= \ @@ -325,26 +325,27 @@ SUBDIR+= \
325 xf86-video-suncg6 \ 325 xf86-video-suncg6 \
326 xf86-video-sunffb \ 326 xf86-video-sunffb \
327 xf86-video-wsfb 327 xf86-video-wsfb
328# xf86-video-ag10e \ 328# xf86-video-ag10e \
329 329
330.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" 330.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
331SUBDIR+= \ 331SUBDIR+= \
332 xf86-video-ag10e \ 332 xf86-video-ag10e \
333 xf86-video-sunleo 333 xf86-video-sunleo
334.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old" 334.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
335 335
336.if ${MACHINE} == "sparc" 336.if ${MACHINE} == "sparc"
337SUBDIR+= \ 337SUBDIR+= \
 338 xf86-video-pnozz \
338 xf86-video-suncg14 \ 339 xf86-video-suncg14 \
339 xf86-video-suntcx 340 xf86-video-suntcx
340 341
341.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" 342.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
342SUBDIR+= \ 343SUBDIR+= \
343 xf86-video-pnozz 344 xf86-video-pnozz
344.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old" 345.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
345.endif # ${MACHINE} == "sparc" 346.endif # ${MACHINE} == "sparc"
346.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" 347.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
347 348
348.if ${MACHINE} == "vax" 349.if ${MACHINE} == "vax"
349SUBDIR+= \ 350SUBDIR+= \
350 xf86-video-wsfb 351 xf86-video-wsfb