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.

A build with the following changes completes and seems to work on
amd64 and aarch64.

Put it in a bug or just commit it?

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	28 Sep 2022 13:15:19 -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	28 Sep 2022 13:15:19 -0000
@@ -952,7 +952,7 @@
 #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+= 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: libGL.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libGL.old/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- libGL.old/Makefile	11 Jul 2021 20:53:35 -0000	1.2
+++ libGL.old/Makefile	28 Sep 2022 13:15:19 -0000
@@ -126,7 +126,7 @@
 
 SRCS.util+=	u_process.c
 
-.include "../libloader.mk"
+.include "../libloader.old.mk"
 
 .PATH:		${X11SRCDIR.Mesa}/src/glw
 .PATH:		${X11SRCDIR.Mesa}/include/GL
Index: libgbm.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libgbm.old/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- libgbm.old/Makefile	11 Jul 2021 20:53:35 -0000	1.2
+++ libgbm.old/Makefile	28 Sep 2022 13:15:19 -0000
@@ -40,7 +40,7 @@
 
 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