Module Name: src
Committed By: rjs
Date: Sat Jul 15 21:24:47 UTC 2023
Modified Files:
src/external/mit/xorg/lib: Makefile libmesa.old.mk
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile
src/external/mit/xorg/lib/libglapi.old: Makefile
Log Message:
Fixup more references to "old" components.
ok mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libmesa.old.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libgbm.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libglapi.old/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/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.57 src/external/mit/xorg/lib/Makefile:1.58
--- src/external/mit/xorg/lib/Makefile:1.57 Thu Jul 14 07:41:49 2022
+++ src/external/mit/xorg/lib/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: Makefile,v 1.58 2023/07/15 21:24:46 rjs Exp $
# build libraries for xorg
@@ -58,7 +58,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
SUBDIR+=libgbm${OLD_SUFFIX}
.if ${HAVE_XORG_GLAMOR} != "no"
# libEGL depends upon libgbm
-SUBDIR+=.WAIT libEGL
+SUBDIR+=.WAIT libEGL${OLD_SUFFIX}
.endif
.include <bsd.buildinstall.mk>
Index: src/external/mit/xorg/lib/libmesa.old.mk
diff -u src/external/mit/xorg/lib/libmesa.old.mk:1.2 src/external/mit/xorg/lib/libmesa.old.mk:1.3
--- src/external/mit/xorg/lib/libmesa.old.mk:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libmesa.old.mk Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: libmesa.old.mk,v 1.3 2023/07/15 21:24:46 rjs Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -550,4 +550,4 @@ CPPFLAGS+= \
CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
-.include "libGL/mesa-ver.mk"
+.include "libGL.old/mesa-ver.mk"
Index: src/external/mit/xorg/lib/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.6 src/external/mit/xorg/lib/dri.old/Makefile:1.7
--- src/external/mit/xorg/lib/dri.old/Makefile:1.6 Sun Jul 2 23:56:12 2023
+++ src/external/mit/xorg/lib/dri.old/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/07/02 23:56:12 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2023/07/15 21:24:46 rjs Exp $
# Link the mesa_dri_drivers mega driver.
@@ -449,8 +449,8 @@ LIBDPLIBS+= drm_intel ${.CURDIR}/../lib
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
MESA_SRC_MODULES= main math math_xform vbo tnl swrast ss common asm_c program asm_s
-.include "../libmesa.old.mk"
-.include "../libglsl.old.mk"
+.include "../libmesa${OLD_SUFFIX}.mk"
+.include "../libglsl${OLD_SUFFIX}.mk"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS+= streaming-load-memcpy.c
@@ -460,7 +460,7 @@ CPPFLAGS.isl_tiled_memcpy_sse41.c+= -mss
CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
.for _d in ${DRIVERS}
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
@@ -474,7 +474,7 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_M
PKGCONFIG= dri
PKGDIST.dri= ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
PKGCONFIG_VERSION.dri= ${MESA_VER}
# XXX remove these from bsd.x11.mk
Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.5 src/external/mit/xorg/lib/gallium.old/Makefile:1.6
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.5 Tue Feb 7 06:19:03 2023
+++ src/external/mit/xorg/lib/gallium.old/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/07/15 21:24:46 rjs Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -1133,7 +1133,7 @@ CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARC
CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
.PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri
Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.4 src/external/mit/xorg/lib/libGL.old/Makefile:1.5
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.4 Sat Jun 3 21:33:02 2023
+++ src/external/mit/xorg/lib/libGL.old/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2023/07/15 21:24:46 rjs Exp $
.include <bsd.own.mk>
@@ -216,7 +216,7 @@ MKLINT=no
PKGCONFIG= gl
PKGDIST.gl= ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
PKGCONFIG_VERSION.gl= ${MESA_VER}
# XXX remove these from bsd.x11.mk
Index: src/external/mit/xorg/lib/libgbm.old/Makefile
diff -u src/external/mit/xorg/lib/libgbm.old/Makefile:1.3 src/external/mit/xorg/lib/libgbm.old/Makefile:1.4
--- src/external/mit/xorg/lib/libgbm.old/Makefile:1.3 Thu Sep 29 18:58:04 2022
+++ src/external/mit/xorg/lib/libgbm.old/Makefile Sat Jul 15 21:24:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
+# $NetBSD: Makefile,v 1.4 2023/07/15 21:24:47 rjs Exp $
.include <bsd.own.mk>
@@ -53,7 +53,7 @@ LIBDPLIBS+= expat ${NETBSDSRCDIR}/extern
PKGCONFIG= gbm
PKGDIST.gbm= ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
PKGCONFIG_VERSION.gbm= ${MESA_VER}
.include "../libdrm/Makefile.defines"
Index: src/external/mit/xorg/lib/libglapi.old/Makefile
diff -u src/external/mit/xorg/lib/libglapi.old/Makefile:1.2 src/external/mit/xorg/lib/libglapi.old/Makefile:1.3
--- src/external/mit/xorg/lib/libglapi.old/Makefile:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libglapi.old/Makefile Sat Jul 15 21:24:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/07/15 21:24:47 rjs Exp $
.include <bsd.own.mk>
@@ -37,7 +37,7 @@ CPPFLAGS+= \
CPPFLAGS+= ${X11FLAGS.THREADLIB}
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread -fno-builtin-memcmp
