Re: DRM Stuff

matthew green <[email protected]> wrote:
> Mesa.old should use "*old*" files.  if there's a bug with it using
> the non-"*old*" file, we should fix it.

There are several places where the "old" Makefiles include non-old
files.

Will do some test builds with the following diffs.

Index: dri.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/dri.old/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- dri.old/Makefile	13 Dec 2021 20:53:22 -0000	1.3
+++ dri.old/Makefile	27 Sep 2022 11:28:39 -0000
@@ -438,8 +438,8 @@
 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: gallium.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/gallium.old/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- gallium.old/Makefile	14 Dec 2021 21:37:06 -0000	1.3
+++ gallium.old/Makefile	27 Sep 2022 11:28:39 -0000
@@ -1108,8 +1108,8 @@
 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