Mon Jul 20 14:24:13 2020 UTC ()
Switch ports using MI wsfb drivers to HAVE_XORG_SERVER_VER=120.

Xorg wsfb servers from 1.20 for dreamcast (16bpp), hp300 (8bpp), and
luna68k (1bpp) work fine even on NetBSD 9.0, and zaurus is also
confirmed working.

Discussed with mrg@ and macallan@ on tech-x11:
 https://mail-index.netbsd.org/tech-x11/2020/07/thread1.html#002098


(tsutsui)
diff -r1.1200 -r1.1201 src/share/mk/bsd.own.mk
cvs diff -r1.1200 -r1.1201 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2020/07/04 21:02:16 1.1200
+++ src/share/mk/bsd.own.mk 2020/07/20 14:24:13 1.1201
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1200 2020/07/04 21:02:16 chs Exp $ 1# $NetBSD: bsd.own.mk,v 1.1201 2020/07/20 14:24:13 tsutsui Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -1507,37 +1507,31 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi @@ -1507,37 +1507,31 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi
1507 pthread-stubs 1507 pthread-stubs
1508X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist 1508X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
1509.endfor 1509.endfor
1510 1510
1511.for _proto in \ 1511.for _proto in \
1512 xcb- xorg 1512 xcb- xorg
1513X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist 1513X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
1514.endfor 1514.endfor
1515 1515
1516# During transition from xorg-server 1.10 to 1.20 1516# During transition from xorg-server 1.10 to 1.20
1517.if \ 1517.if \
1518 ${MACHINE} == "alpha" || \ 1518 ${MACHINE} == "alpha" || \
1519 ${MACHINE} == "amiga" || \ 1519 ${MACHINE} == "amiga" || \
1520 ${MACHINE} == "ews4800mips" || \ 
1521 ${MACHINE} == "hpcarm" || \ 
1522 ${MACHINE} == "hpcmips" || \ 
1523 ${MACHINE} == "hpcsh" || \ 
1524 ${MACHINE} == "mac68k" || \ 1520 ${MACHINE} == "mac68k" || \
1525 ${MACHINE} == "netwinder" || \ 1521 ${MACHINE} == "netwinder" || \
1526 ${MACHINE} == "newsmips" || \ 
1527 ${MACHINE} == "sgimips" || \ 1522 ${MACHINE} == "sgimips" || \
1528 ${MACHINE} == "vax" || \ 1523 ${MACHINE} == "vax" || \
1529 ${MACHINE} == "x68k" || \ 1524 ${MACHINE} == "x68k"
1530 ${MACHINE} == "zaurus" 
1531HAVE_XORG_SERVER_VER?=110 1525HAVE_XORG_SERVER_VER?=110
1532.else 1526.else
1533HAVE_XORG_SERVER_VER?=120 1527HAVE_XORG_SERVER_VER?=120
1534.endif 1528.endif
1535 1529
1536.if ${HAVE_XORG_SERVER_VER} == "120" 1530.if ${HAVE_XORG_SERVER_VER} == "120"
1537XORG_SERVER_SUBDIR?=xorg-server 1531XORG_SERVER_SUBDIR?=xorg-server
1538. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm" 1532. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
1539HAVE_XORG_GLAMOR?= yes 1533HAVE_XORG_GLAMOR?= yes
1540. endif 1534. endif
1541.else 1535.else
1542XORG_SERVER_SUBDIR?=xorg-server.old 1536XORG_SERVER_SUBDIR?=xorg-server.old
1543.endif 1537.endif