[src/trunk]: src/external/mit/xorg xorg/lib stuff to enable mesa.old, prepare...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ed97823a7bed
branches:  trunk
changeset: 984567:ed97823a7bed
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 11 20:52:06 2021 +0000

description:
xorg/lib stuff to enable mesa.old, prepare for new mesa

- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support

diffstat:

 external/mit/xorg/include/Makefile                              |   6 ++----
 external/mit/xorg/lib/Makefile                                  |  10 +++++-----
 external/mit/xorg/lib/dri/Makefile                              |   6 ++++--
 external/mit/xorg/lib/gallium/Makefile                          |   6 ++++--
 external/mit/xorg/lib/libGL/Makefile                            |   6 ++++--
 external/mit/xorg/lib/libGLU/Makefile                           |   6 +++---
 external/mit/xorg/lib/libGLw/Makefile                           |   4 ++--
 external/mit/xorg/lib/libgbm/Makefile                           |   6 ++++--
 external/mit/xorg/lib/mesa-which.mk                             |   6 +++---
 external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile |   4 ++--
 10 files changed, 33 insertions(+), 27 deletions(-)

diffs (240 lines):

diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/include/Makefile
--- a/external/mit/xorg/include/Makefile        Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/include/Makefile        Sun Jul 11 20:52:06 2021 +0000
@@ -1,15 +1,13 @@
-#      $NetBSD: Makefile,v 1.9 2019/03/10 13:52:11 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2021/07/11 20:52:06 mrg Exp $
 
 # *proto packages for xorg
 
 .include <bsd.own.mk>
 
-.if ${HAVE_MESA_VER} == 18
-SUBDIR=                KHR 
-.endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
 SUBDIR+=       libvdpau
 .endif
+SUBDIR+=       KHR 
 SUBDIR+=       xorgproto xbitmaps xcb-proto
 SUBDIR+=       .WAIT xtrans
 
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/Makefile    Sun Jul 11 20:52:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.56 2021/07/11 20:52:06 mrg Exp $
 
 # build libraries for xorg
 
@@ -6,7 +6,7 @@
 
 .include "mesa-which.mk"
 
-SUBDIR=        libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
+SUBDIR=        libfontenc freetype libFS libICE libglapi${OLD_SUFFIX} \
        libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=libdrm_intel
@@ -23,7 +23,7 @@
        libX11 \
        .WAIT
 .if !defined(MLIBDIR)
-SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
+SUBDIR+=dri${OLD_SUFFIX} gallium${OLD_SUFFIX}
 .endif
 SUBDIR+=fontconfig libSM \
        .WAIT \
@@ -36,7 +36,7 @@
        .WAIT
 .endif
 SUBDIR+=libXi libXxf86vm \
-       libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \
+       libGL${OLD_SUFFIX} libXScrnSaver libXfont libXfont2 \
        libXinerama libXmu libXmuu libXpm libXrender \
        libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
        libxkbui \
@@ -54,7 +54,7 @@
        .WAIT \
        libXdmGreet \
        xcb-util
-SUBDIR+=libgbm${OLD_PREFIX}
+SUBDIR+=libgbm${OLD_SUFFIX}
 .if ${HAVE_XORG_GLAMOR} != "no"
 # libEGL depends upon libgbm
 SUBDIR+=.WAIT libEGL
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile        Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/dri/Makefile        Sun Jul 11 20:52:06 2021 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2021/04/13 04:58:59 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2021/07/11 20:52:06 mrg Exp $
 
 # Link the mesa_dri_drivers mega driver.
 
 .include <bsd.own.mk>
 
+.include "../mesa-which.mk"
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE} == "evbarm"
 
@@ -425,7 +427,7 @@
 LIBDPLIBS+=    expat           ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
 LIBDPLIBS+=    m               ${NETBSDSRCDIR}/lib/libm
 LIBDPLIBS+=    pthread         ${NETBSDSRCDIR}/lib/libpthread
-LIBDPLIBS+=    glapi           ${.CURDIR}/../libglapi
+LIBDPLIBS+=    glapi           ${.CURDIR}/../libglapi${OLD_SUFFIX}
 LIBDPLIBS+=    drm             ${.CURDIR}/../libdrm
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 LIBDPLIBS+=    drm_intel       ${.CURDIR}/../libdrm_intel
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/gallium/Makefile
--- a/external/mit/xorg/lib/gallium/Makefile    Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/gallium/Makefile    Sun Jul 11 20:52:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2021/05/30 01:57:00 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2021/07/11 20:52:06 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -7,6 +7,8 @@
 
 .include <bsd.own.mk>
 
+.include "../mesa-which.mk"
+
 SHLIB_MAJOR=    0
 
 LIB=           gallium_dri
@@ -970,7 +972,7 @@
 LIBDPLIBS+=    drm_nouveau     ${.CURDIR}/../libdrm_nouveau
 .endif # ${BUILD_NOUVEAU} == 1
 .endif # ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
-LIBDPLIBS+=    glapi           ${.CURDIR}/../libglapi
+LIBDPLIBS+=    glapi           ${.CURDIR}/../libglapi${OLD_SUFFIX}
 LIBDPLIBS+=    expat           ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
 LIBDPLIBS+=    terminfo        ${.CURDIR}/../../../../../lib/libterminfo
 LIBDPLIBS+=    execinfo        ${.CURDIR}/../../../../../lib/libexecinfo
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Sun Jul 11 20:52:06 2021 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.31 2020/10/31 13:28:22 nia Exp $
+#      $NetBSD: Makefile,v 1.32 2021/07/11 20:52:06 mrg Exp $
 
 .include <bsd.own.mk>
 
+.include "../mesa-which.mk"
+
 LIB=           GL
 LIBISCXX=      yes
 
@@ -201,7 +203,7 @@
                Xxf86vm         ${.CURDIR}/../libXxf86vm \
                Xfixes          ${.CURDIR}/../libXfixes \
                Xdamage         ${.CURDIR}/../libXdamage \
-               glapi           ${.CURDIR}/../libglapi \
+               glapi           ${.CURDIR}/../libglapi${OLD_SUFFIX} \
                drm             ${.CURDIR}/../libdrm \
                X11-xcb         ${.CURDIR}/../libX11/libX11-xcb \
                xcb-dri2        ${.CURDIR}/../libxcb/dri2 \
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/libGLU/Makefile
--- a/external/mit/xorg/lib/libGLU/Makefile     Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/libGLU/Makefile     Sun Jul 11 20:52:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2019/03/24 00:47:16 rin Exp $
+#      $NetBSD: Makefile,v 1.21 2021/07/11 20:52:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -133,7 +133,7 @@
 
 LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
                X11     ${.CURDIR}/../libX11/dynamic \
-               GL      ${.CURDIR}/../libGL${OLD_PREFIX} \
+               GL      ${.CURDIR}/../libGL${OLD_SUFFIX} \
                Xxf86vm ${.CURDIR}/../libXxf86vm \
                Xfixes  ${.CURDIR}/../libXfixes \
                Xdamage ${.CURDIR}/../libXdamage \
@@ -142,7 +142,7 @@
 
 PKGCONFIG=     glu
 PKGDIST.glu=   ${X11SRCDIR.glu}
-.include "${.CURDIR}/../libGL${OLD_PREFIX}/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
 PKGCONFIG_VERSION.glu= ${MESA_VER}
 PKGCONFIG_SED_FLAGS= \
        -e "s,@GLU_REQUIRES@,gl,"
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/libGLw/Makefile
--- a/external/mit/xorg/lib/libGLw/Makefile     Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/libGLw/Makefile     Sun Jul 11 20:52:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2019/03/10 02:29:53 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2021/07/11 20:52:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -32,7 +32,7 @@
                Xdamage         ${.CURDIR}/../libXdamage \
                m               ${.CURDIR}/../../../../../lib/libm \
                drm             ${.CURDIR}/../libdrm \
-               GL              ${.CURDIR}/../libGL${OLD_PREFIX} \
+               GL              ${.CURDIR}/../libGL${OLD_SUFFIX} \
                ICE             ${.CURDIR}/../libICE \
                SM              ${.CURDIR}/../libSM \
                Xt              ${.CURDIR}/../libXt \
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/libgbm/Makefile
--- a/external/mit/xorg/lib/libgbm/Makefile     Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/libgbm/Makefile     Sun Jul 11 20:52:06 2021 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.7 2019/09/24 19:29:42 maya Exp $
+#      $NetBSD: Makefile,v 1.8 2021/07/11 20:52:06 mrg Exp $
 
 .include <bsd.own.mk>
 
+.include "../mesa-which.mk"
+
 LIB=           gbm
 
 .PATH: ${X11SRCDIR.Mesa}/src/gbm/main
@@ -45,7 +47,7 @@
 INCS=          gbm.h
 INCSDIR=       ${X11INCDIR}
 
-LIBDPLIBS=     glapi   ${.CURDIR}/../libglapi
+LIBDPLIBS=     glapi   ${.CURDIR}/../libglapi${OLD_SUFFIX}
 LIBDPLIBS+=    drm     ${.CURDIR}/../libdrm
 LIBDPLIBS+=    expat   ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
 
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/lib/mesa-which.mk
--- a/external/mit/xorg/lib/mesa-which.mk       Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/lib/mesa-which.mk       Sun Jul 11 20:52:06 2021 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $
+#      $NetBSD: mesa-which.mk,v 1.3 2021/07/11 20:52:06 mrg Exp $
 
-OLD_PREFIX=
+OLD_SUFFIX=
 .if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
-OLD_PREFIX=.old
+OLD_SUFFIX=.old
 .endif
diff -r 7dfe59ef1b32 -r ed97823a7bed external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile   Sun Jul 11 20:48:48 2021 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile   Sun Jul 11 20:52:06 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2021/05/30 22:24:36 joerg Exp $
+#      $NetBSD: Makefile,v 1.14 2021/07/11 20:52:07 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -59,7 +59,7 @@
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${X11SRCDIR.${DRIVER}}/../include
 
-LIBDPLIBS+=    gbm ${.CURDIR}/../../../lib/libgbm${OLD_PREFIX}
+LIBDPLIBS+=    gbm ${.CURDIR}/../../../lib/libgbm${OLD_SUFFIX}
 
 COPTS+=                -fcommon