Module Name: src
Committed By: rjs
Date: Thu Sep 29 18:58:04 UTC 2022
Modified Files:
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
Log Message:
Only include other "old" makefiles from old MesaLib ones. Ok @mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libgbm.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/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.3 src/external/mit/xorg/lib/dri.old/Makefile:1.4
--- src/external/mit/xorg/lib/dri.old/Makefile:1.3 Mon Dec 13 20:53:22 2021
+++ src/external/mit/xorg/lib/dri.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/13 20:53:22 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
# Link the mesa_dri_drivers mega driver.
@@ -438,8 +438,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.mk"
-.include "../libglsl.mk"
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS+= streaming-load-memcpy.c
Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.3 src/external/mit/xorg/lib/gallium.old/Makefile:1.4
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.3 Tue Dec 14 21:37:06 2021
+++ src/external/mit/xorg/lib/gallium.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/14 21:37:06 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -952,7 +952,7 @@ CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src
#SRCS+= ${GALLIUM_SOURCES.${_d}}
#. endif
-.include "../libloader.mk"
+.include "../libloader.old.mk"
.if ${BUILD_RADEON} == 1
CFLAGS+= -pthread
@@ -1108,8 +1108,8 @@ MESA_SRC_MODULES= main math vbo state_t
MESA_SRC_MODULES+= amd
.endif
-.include "../libmesa.mk"
-.include "../libglsl.mk"
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
# Special addition for just gallium; it misses the rest of asm_c files.
.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.2 src/external/mit/xorg/lib/libGL.old/Makefile:1.3
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libGL.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
.include <bsd.own.mk>
@@ -126,7 +126,7 @@ CPPFLAGS.${fn}= \
SRCS.util+= u_process.c
-.include "../libloader.mk"
+.include "../libloader.old.mk"
.PATH: ${X11SRCDIR.Mesa}/src/glw
.PATH: ${X11SRCDIR.Mesa}/include/GL
Index: src/external/mit/xorg/lib/libgbm.old/Makefile
diff -u src/external/mit/xorg/lib/libgbm.old/Makefile:1.2 src/external/mit/xorg/lib/libgbm.old/Makefile:1.3
--- src/external/mit/xorg/lib/libgbm.old/Makefile:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libgbm.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
.include <bsd.own.mk>
@@ -40,7 +40,7 @@ CFLAGS+= -fno-strict-aliasing -fexceptio
COPTS.gbm_dri.c+= -Wno-error
-.include "../libloader.mk"
+.include "../libloader.old.mk"
.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
.PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri
