Module Name: src
Committed By: mrg
Date: Sun Jul 11 20:52:07 UTC 2021
Modified Files:
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile mesa-which.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libGLw: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.55 -r1.56 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.47 -r1.48 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libGLw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.9 src/external/mit/xorg/include/Makefile:1.10
--- src/external/mit/xorg/include/Makefile:1.9 Sun Mar 10 13:52:11 2019
+++ src/external/mit/xorg/include/Makefile Sun Jul 11 20:52:06 2021
@@ -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
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.55 src/external/mit/xorg/lib/Makefile:1.56
--- src/external/mit/xorg/lib/Makefile:1.55 Sun Jul 11 01:13:26 2021
+++ src/external/mit/xorg/lib/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ SUBDIR+=libxcb \
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 @@ SUBDIR+=libvdpau \
.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 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
.WAIT \
libXdmGreet \
xcb-util
-SUBDIR+=libgbm${OLD_PREFIX}
+SUBDIR+=libgbm${OLD_SUFFIX}
.if ${HAVE_XORG_GLAMOR} != "no"
# libEGL depends upon libgbm
SUBDIR+=.WAIT libEGL
Index: src/external/mit/xorg/lib/mesa-which.mk
diff -u src/external/mit/xorg/lib/mesa-which.mk:1.2 src/external/mit/xorg/lib/mesa-which.mk:1.3
--- src/external/mit/xorg/lib/mesa-which.mk:1.2 Sun Jul 11 01:13:26 2021
+++ src/external/mit/xorg/lib/mesa-which.mk Sun Jul 11 20:52:06 2021
@@ -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
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.37 src/external/mit/xorg/lib/dri/Makefile:1.38
--- src/external/mit/xorg/lib/dri/Makefile:1.37 Tue Apr 13 04:58:59 2021
+++ src/external/mit/xorg/lib/dri/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ SRCS+= ${DRI_SOURCES.${_d}}
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
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.47 src/external/mit/xorg/lib/gallium/Makefile:1.48
--- src/external/mit/xorg/lib/gallium/Makefile:1.47 Sun May 30 01:57:00 2021
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ LIBISCXX= yes
.include <bsd.own.mk>
+.include "../mesa-which.mk"
+
SHLIB_MAJOR= 0
LIB= gallium_dri
@@ -970,7 +972,7 @@ LIBDPLIBS+= drm_amdgpu ${.CURDIR}/../li
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
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.31 src/external/mit/xorg/lib/libGL/Makefile:1.32
--- src/external/mit/xorg/lib/libGL/Makefile:1.31 Sat Oct 31 13:28:22 2020
+++ src/external/mit/xorg/lib/libGL/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
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 \
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.20 src/external/mit/xorg/lib/libGLU/Makefile:1.21
--- src/external/mit/xorg/lib/libGLU/Makefile:1.20 Sun Mar 24 00:47:16 2019
+++ src/external/mit/xorg/lib/libGLU/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ INCSDIR=${X11INCDIR}/GL
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 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
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,"
Index: src/external/mit/xorg/lib/libGLw/Makefile
diff -u src/external/mit/xorg/lib/libGLw/Makefile:1.5 src/external/mit/xorg/lib/libGLw/Makefile:1.6
--- src/external/mit/xorg/lib/libGLw/Makefile:1.5 Sun Mar 10 02:29:53 2019
+++ src/external/mit/xorg/lib/libGLw/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
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 \
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.7 src/external/mit/xorg/lib/libgbm/Makefile:1.8
--- src/external/mit/xorg/lib/libgbm/Makefile:1.7 Tue Sep 24 19:29:42 2019
+++ src/external/mit/xorg/lib/libgbm/Makefile Sun Jul 11 20:52:06 2021
@@ -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 @@ COPTS.gbm_dri.c+= -Wno-error
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
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.13 Sun May 30 22:24:36 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Jul 11 20:52:07 2021
@@ -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 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-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
