Sun Jul 11 01:13:27 2021 UTC ()
remove dead mesa7 support.


(mrg)
diff -r1.54 -r1.55 src/external/mit/xorg/lib/Makefile
diff -r1.1 -r1.2 src/external/mit/xorg/lib/mesa-which.mk
diff -r1.1 -r0 src/external/mit/xorg/lib/dri7/Makefile
diff -r1.1 -r0 src/external/mit/xorg/lib/dri7/dri.mk
diff -r1.1 -r0 src/external/mit/xorg/lib/dri7/libmesa7.mk
diff -r1.2 -r0 src/external/mit/xorg/lib/dri7/libglsl7.mk
diff -r1.1 -r0 src/external/mit/xorg/lib/dri7/libmesa/Makefile
diff -r1.1 -r0 src/external/mit/xorg/lib/dri7/r300/Makefile
cvs diff -r1.54 -r1.55 src/external/mit/xorg/lib/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/Makefile 2020/10/28 08:10:10 1.54
+++ src/external/mit/xorg/lib/Makefile 2021/07/11 01:13:26 1.55
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.54 2020/10/28 08:10:10 nia Exp $ 1# $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
2 2
3# build libraries for xorg 3# build libraries for xorg
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7.include "mesa-which.mk" 7.include "mesa-which.mk"
8 8
9SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \ 9SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
10 libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT 10 libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
11.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 11.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
12SUBDIR+=libdrm_intel 12SUBDIR+=libdrm_intel
13.endif 13.endif
14.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm" 14.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
15SUBDIR+=libdrm_amdgpu libdrm_nouveau 15SUBDIR+=libdrm_amdgpu libdrm_nouveau
16.endif 16.endif
17SUBDIR+=libdrm_radeon pixman 17SUBDIR+=libdrm_radeon pixman
18.if !defined(MLIBDIR) 18.if !defined(MLIBDIR)
19SUBDIR+=xkeyboard-config 19SUBDIR+=xkeyboard-config
20.endif 20.endif
21SUBDIR+=libxcb \ 21SUBDIR+=libxcb \
22 .WAIT \ 22 .WAIT \
23 libX11 \ 23 libX11 \
24 .WAIT 24 .WAIT
25.if !defined(MLIBDIR) 25.if !defined(MLIBDIR)
26SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX} 26SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
27.endif 27.endif
28SUBDIR+=fontconfig libSM \ 28SUBDIR+=fontconfig libSM \
29 .WAIT \ 29 .WAIT \
30 libXcomposite libXdamage libXext libXfixes libXt \ 30 libXcomposite libXdamage libXext libXfixes libXt \
31 libxkbfile libepoxy \ 31 libxkbfile libepoxy \
32 .WAIT 32 .WAIT
33.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm" 33.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
34# libvdpau depends upon libX11 and libXext 34# libvdpau depends upon libX11 and libXext
35SUBDIR+=libvdpau \ 35SUBDIR+=libvdpau \
36 .WAIT 36 .WAIT
37.endif 37.endif
38SUBDIR+=libXi libXxf86vm \ 38SUBDIR+=libXi libXxf86vm \
39 libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \ 39 libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \
cvs diff -r1.1 -r1.2 src/external/mit/xorg/lib/mesa-which.mk (expand / switch to unified diff)

--- src/external/mit/xorg/lib/mesa-which.mk 2019/03/10 02:29:52 1.1
+++ src/external/mit/xorg/lib/mesa-which.mk 2021/07/11 01:13:26 1.2
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1# $NetBSD: mesa-which.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $ 1# $NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $
2 2
3OLD_PREFIX= 3OLD_PREFIX=
4.if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old" 4.if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
5OLD_PREFIX=.old 5OLD_PREFIX=.old
6EXTRA_DRI_DIRS=dri7 
7.endif 6.endif
File Deleted: src/external/mit/xorg/lib/dri7/Attic/Makefile
File Deleted: src/external/mit/xorg/lib/dri7/Attic/dri.mk
File Deleted: src/external/mit/xorg/lib/dri7/Attic/libmesa7.mk
File Deleted: src/external/mit/xorg/lib/dri7/Attic/libglsl7.mk
File Deleted: src/external/mit/xorg/lib/dri7/libmesa/Attic/Makefile
File Deleted: src/external/mit/xorg/lib/dri7/r300/Attic/Makefile