Wed Apr 24 19:14:39 2024 UTC (15d)
Force old Mesa for all old X server builds


(martin)
diff -r1.1370 -r1.1371 src/share/mk/bsd.own.mk
cvs diff -r1.1370 -r1.1371 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2024/04/24 07:54:53 1.1370
+++ src/share/mk/bsd.own.mk 2024/04/24 19:14:39 1.1371
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $ 1# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin 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#
@@ -1310,30 +1310,38 @@ MKTEGRAFIRMWARE.evbarm= yes @@ -1310,30 +1310,38 @@ MKTEGRAFIRMWARE.evbarm= yes
1310MKDTB.aarch64= yes 1310MKDTB.aarch64= yes
1311MKDTB.aarch64eb= yes 1311MKDTB.aarch64eb= yes
1312MKDTB.earmv6= yes 1312MKDTB.earmv6= yes
1313MKDTB.earmv6hf= yes 1313MKDTB.earmv6hf= yes
1314MKDTB.earmv6eb= yes 1314MKDTB.earmv6eb= yes
1315MKDTB.earmv6hfeb= yes 1315MKDTB.earmv6hfeb= yes
1316MKDTB.earmv7= yes 1316MKDTB.earmv7= yes
1317MKDTB.earmv7hf= yes 1317MKDTB.earmv7hf= yes
1318MKDTB.earmv7eb= yes 1318MKDTB.earmv7eb= yes
1319MKDTB.earmv7hfeb= yes 1319MKDTB.earmv7hfeb= yes
1320MKDTB.riscv32= yes 1320MKDTB.riscv32= yes
1321MKDTB.riscv64= yes 1321MKDTB.riscv64= yes
1322 1322
1323# alpha build fails due to missing X include files, 1323# During transition from xorg-server 1.10 to 1.20
1324# vax build triggers a gcc bug and dies with an internal compiler error. 1324.if \
1325# XXX switch both to old Mesa for now. 1325 ${MACHINE} == "alpha" || \
1326.if ${MACHINE} == "alpha" || ${MACHINE} == "vax" 1326 ${MACHINE} == "netwinder" || \
 1327 ${MACHINE} == "sgimips"
 1328HAVE_XORG_SERVER_VER?=110
 1329.else
 1330HAVE_XORG_SERVER_VER?=120
 1331.endif
 1332
 1333# Newer Mesa does not build with old X server
 1334.if ${HAVE_XORG_SERVER_VER} != "120"
1327HAVE_MESA_VER=19 1335HAVE_MESA_VER=19
1328.endif 1336.endif
1329 1337
1330HAVE_MESA_VER?= 21 1338HAVE_MESA_VER?= 21
1331.if ${HAVE_MESA_VER} == 19 1339.if ${HAVE_MESA_VER} == 19
1332EXTERNAL_MESALIB_DIR?= MesaLib.old 1340EXTERNAL_MESALIB_DIR?= MesaLib.old
1333.elif ${HAVE_MESA_VER} == 21 1341.elif ${HAVE_MESA_VER} == 21
1334EXTERNAL_MESALIB_DIR?= MesaLib 1342EXTERNAL_MESALIB_DIR?= MesaLib
1335.endif 1343.endif
1336 1344
1337# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer 1345# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer
1338# XXX This knows that MKX11=no is default below, but would 1346# XXX This knows that MKX11=no is default below, but would
1339# require splitting the below loop in two parts. 1347# require splitting the below loop in two parts.
@@ -1666,36 +1674,26 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi @@ -1666,36 +1674,26 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi
1666 FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \ 1674 FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
1667 Xdmcp Xevie Xext Xfixes Xfont Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \ 1675 Xdmcp Xevie Xext Xfixes Xfont Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \
1668 Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \ 1676 Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
1669 epoxy fontenc vdpau xkbfile xkbui Xaw pciaccess xcb xshmfence \ 1677 epoxy fontenc vdpau xkbfile xkbui Xaw pciaccess xcb xshmfence \
1670 pthread-stubs xcvt 1678 pthread-stubs xcvt
1671X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist 1679X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
1672.endfor 1680.endfor
1673 1681
1674.for _proto in \ 1682.for _proto in \
1675 xcb- xorg 1683 xcb- xorg
1676X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist 1684X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
1677.endfor 1685.endfor
1678 1686
1679# During transition from xorg-server 1.10 to 1.20 
1680.if \ 
1681 ${MACHINE} == "alpha" || \ 
1682 ${MACHINE} == "netwinder" || \ 
1683 ${MACHINE} == "sgimips" 
1684HAVE_XORG_SERVER_VER?=110 
1685.else 
1686HAVE_XORG_SERVER_VER?=120 
1687.endif 
1688 
1689.if ${HAVE_XORG_SERVER_VER} == "120" 1687.if ${HAVE_XORG_SERVER_VER} == "120"
1690XORG_SERVER_SUBDIR?=xorg-server 1688XORG_SERVER_SUBDIR?=xorg-server
1691. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm" 1689. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
1692HAVE_XORG_GLAMOR?= yes 1690HAVE_XORG_GLAMOR?= yes
1693. endif 1691. endif
1694.else 1692.else
1695XORG_SERVER_SUBDIR?=xorg-server.old 1693XORG_SERVER_SUBDIR?=xorg-server.old
1696.endif 1694.endif
1697 1695
1698X11SRCDIR.xorg-server?= ${X11SRCDIRMIT}/${XORG_SERVER_SUBDIR}/dist 1696X11SRCDIR.xorg-server?= ${X11SRCDIRMIT}/${XORG_SERVER_SUBDIR}/dist
1699HAVE_XORG_GLAMOR?= no 1697HAVE_XORG_GLAMOR?= no
1700 1698
1701# Build glamor extension? 1699# Build glamor extension?