tech-x11 archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Mesa versions



Found some more places that look like they are mixing up MesaLib and
MesaLib.old.

Maybe we also need a src/external/mit/xorg/lib/libEGL.old target, the
current libEGL target includes libGL/mesa-ver.mk.

Tried doing a build with the diffs below and with MESA_VER in
libGL/mesa-ver.mk set to 21.3.7, it seems ok apart from egl.pc.

Index: libmesa.old.mk
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libmesa.old.mk,v
retrieving revision 1.2
diff -u -r1.2 libmesa.old.mk
--- libmesa.old.mk	11 Jul 2021 20:53:35 -0000	1.2
+++ libmesa.old.mk	6 Jul 2023 10:44:32 -0000
@@ -550,4 +550,4 @@
 
 CFLAGS+=	-fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
 
-.include "libGL/mesa-ver.mk"
+.include "libGL.old/mesa-ver.mk"
Index: dri.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/dri.old/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- dri.old/Makefile	2 Jul 2023 23:56:12 -0000	1.6
+++ dri.old/Makefile	6 Jul 2023 10:44:32 -0000
@@ -474,7 +474,7 @@
 
 PKGCONFIG=	dri
 PKGDIST.dri=	${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
 PKGCONFIG_VERSION.dri=	${MESA_VER}
 
 # XXX remove these from bsd.x11.mk
Index: libGL.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libGL.old/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- libGL.old/Makefile	3 Jun 2023 21:33:02 -0000	1.4
+++ libGL.old/Makefile	6 Jul 2023 10:44:32 -0000
@@ -216,7 +216,7 @@
 
 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: libgbm.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libgbm.old/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libgbm.old/Makefile	29 Sep 2022 18:58:04 -0000	1.3
+++ libgbm.old/Makefile	6 Jul 2023 10:44:32 -0000
@@ -53,7 +53,7 @@
 
 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: libglapi.old/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libglapi.old/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- libglapi.old/Makefile	11 Jul 2021 20:53:35 -0000	1.2
+++ libglapi.old/Makefile	6 Jul 2023 10:44:32 -0000
@@ -37,7 +37,7 @@
 
 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
 


Home | Main Index | Thread Index | Old Index