From: Jonathan Gray <jsg@jsg.id.au>
Subject: stop building libOSMesa
To: tech@openbsd.org
Date: Tue, 28 Oct 2025 20:40:34 +1100

OSMesa is the Mesa Off-Screen rendering library.

It was removed upstream in Mesa 25.1
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33836

Using an EGL surfaceless context is the suggested replacement.

Index: lib/mesa/mk/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/mesa/mk/Makefile,v
diff -u -p -r1.13 Makefile
--- lib/mesa/mk/Makefile	5 Jun 2025 14:18:37 -0000	1.13
+++ lib/mesa/mk/Makefile	28 Oct 2025 07:16:21 -0000
@@ -105,7 +105,7 @@ SUBDIR+=	libva_st libgallium_drv_video
 
 SUBDIR+=	libgallium_dri
 SUBDIR+=	libgbm libdri_gbm
-SUBDIR+=	libEGL libGL libGLESv1_CM libGLESv2 libOSMesa
+SUBDIR+=	libEGL libGL libGLESv1_CM libGLESv2
 
 SUBDIR+=	libdril_dri
 
Index: lib/mesa/mk/include/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/mesa/mk/include/Makefile,v
diff -u -p -r1.3 Makefile
--- lib/mesa/mk/include/Makefile	28 Jan 2023 08:56:33 -0000	1.3
+++ lib/mesa/mk/include/Makefile	28 Oct 2025 07:16:22 -0000
@@ -20,7 +20,6 @@ GL_FILES=	gl.h \
 		glext.h \
 		glx.h \
 		glxext.h \
-		osmesa.h \
 		internal/dri_interface.h
 EGL_FILES=	egl.h \
 		eglext.h \
Index: lib/mesa/mk/pkgconfig/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/mesa/mk/pkgconfig/Makefile,v
diff -u -p -r1.1 Makefile
--- lib/mesa/mk/pkgconfig/Makefile	26 Aug 2020 06:02:41 -0000	1.1
+++ lib/mesa/mk/pkgconfig/Makefile	28 Oct 2025 07:16:22 -0000
@@ -1,6 +1,6 @@
 #	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
 
-PC_FILES= dri.pc egl.pc gbm.pc gl.pc glesv1_cm.pc glesv2.pc osmesa.pc
+PC_FILES= dri.pc egl.pc gbm.pc gl.pc glesv1_cm.pc glesv2.pc
 CLEANFILES+=${PC_FILES}
 
 all: ${PC_FILES}
@@ -23,9 +23,6 @@ glesv1_cm.pc:
 
 glesv2.pc:
 	/bin/sh ${.CURDIR}/gen_glesv2.sh -c ${.CURDIR} -o ${.OBJDIR}
-
-osmesa.pc:
-	/bin/sh ${.CURDIR}/gen_osmesa.sh -c ${.CURDIR} -o ${.OBJDIR}
 
 install:
 .for PC in ${PC_FILES}
Index: distrib/sets/lists/xbase/md.amd64
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.amd64,v
diff -u -p -r1.222 md.amd64
--- distrib/sets/lists/xbase/md.amd64	6 Jun 2025 09:05:40 -0000	1.222
+++ distrib/sets/lists/xbase/md.amd64	28 Oct 2025 07:16:23 -0000
@@ -21,7 +21,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -293,8 +292,6 @@
 ./usr/X11R6/lib/libGLw.so.6.0
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.3.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -337,7 +334,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
Index: distrib/sets/lists/xbase/md.arm64
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.arm64,v
diff -u -p -r1.56 md.arm64
--- distrib/sets/lists/xbase/md.arm64	6 Jun 2025 09:05:40 -0000	1.56
+++ distrib/sets/lists/xbase/md.arm64	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -284,8 +283,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -324,7 +321,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
Index: distrib/sets/lists/xbase/md.armv7
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.armv7,v
diff -u -p -r1.104 md.armv7
--- distrib/sets/lists/xbase/md.armv7	6 Jun 2025 09:05:41 -0000	1.104
+++ distrib/sets/lists/xbase/md.armv7	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -284,8 +283,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -323,7 +320,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
Index: distrib/sets/lists/xbase/md.i386
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.i386,v
diff -u -p -r1.224 md.i386
--- distrib/sets/lists/xbase/md.i386	6 Jun 2025 09:05:41 -0000	1.224
+++ distrib/sets/lists/xbase/md.i386	28 Oct 2025 07:16:23 -0000
@@ -21,7 +21,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -293,8 +292,6 @@
 ./usr/X11R6/lib/libGLw.so.6.0
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.3.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -337,7 +334,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
Index: distrib/sets/lists/xbase/md.loongson
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.loongson,v
diff -u -p -r1.153 md.loongson
--- distrib/sets/lists/xbase/md.loongson	6 Jun 2025 09:05:41 -0000	1.153
+++ distrib/sets/lists/xbase/md.loongson	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -284,8 +283,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -321,7 +318,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
Index: distrib/sets/lists/xbase/md.macppc
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.macppc,v
diff -u -p -r1.210 md.macppc
--- distrib/sets/lists/xbase/md.macppc	6 Jun 2025 09:05:41 -0000	1.210
+++ distrib/sets/lists/xbase/md.macppc	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -285,8 +284,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -323,7 +320,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
Index: distrib/sets/lists/xbase/md.octeon
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.octeon,v
diff -u -p -r1.90 md.octeon
--- distrib/sets/lists/xbase/md.octeon	6 Jun 2025 09:05:41 -0000	1.90
+++ distrib/sets/lists/xbase/md.octeon	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -125,8 +124,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -164,7 +161,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
Index: distrib/sets/lists/xbase/md.powerpc64
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.powerpc64,v
diff -u -p -r1.33 md.powerpc64
--- distrib/sets/lists/xbase/md.powerpc64	6 Jun 2025 09:05:41 -0000	1.33
+++ distrib/sets/lists/xbase/md.powerpc64	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -284,8 +283,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -329,7 +326,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
Index: distrib/sets/lists/xbase/md.riscv64
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.riscv64,v
diff -u -p -r1.22 md.riscv64
--- distrib/sets/lists/xbase/md.riscv64	6 Jun 2025 09:05:41 -0000	1.22
+++ distrib/sets/lists/xbase/md.riscv64	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -282,8 +281,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -322,7 +319,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
Index: distrib/sets/lists/xbase/md.sparc64
===================================================================
RCS file: /cvs/xenocara/distrib/sets/lists/xbase/md.sparc64,v
diff -u -p -r1.212 md.sparc64
--- distrib/sets/lists/xbase/md.sparc64	6 Jun 2025 09:05:41 -0000	1.212
+++ distrib/sets/lists/xbase/md.sparc64	28 Oct 2025 07:16:23 -0000
@@ -19,7 +19,6 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/GLES/egl.h
 ./usr/X11R6/include/GLES/gl.h
 ./usr/X11R6/include/GLES/glext.h
@@ -285,8 +284,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.13.1
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.7.13
 ./usr/X11R6/lib/libdrm_amdgpu.a
@@ -324,7 +321,6 @@
 ./usr/X11R6/lib/pkgconfig/libva-drm.pc
 ./usr/X11R6/lib/pkgconfig/libva-x11.pc
 ./usr/X11R6/lib/pkgconfig/libva.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/pkgconfig/xshmfence.pc