sync code with last improvements from OpenBSD

lib/libepoxy/Makefile

@@ -0,0 +1,76 @@
+# $OpenBSD: Makefile,v 1.10 2021/10/29 15:57:09 matthieu Exp $
+.include <bsd.xconf.mk>
+
+EPOXY=	${.CURDIR}/../../dist/libepoxy
+
+LIB=	epoxy
+
+EPOXY_MAJOR=	1
+EPOXY_MINOR=	5
+EPOXY_TINY=	9
+
+INCSDIR=	${X11BASE}/include/epoxy
+
+CFLAGS+= -std=gnu99
+
+.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64"
+PICFLAG+= -mxgot
+.endif
+
+CPPFLAGS+= \
+	-I${.CURDIR} \
+	-I${.CURDIR}/generated/include \
+	-I${EPOXY}/include \
+	-I${EPOXY}/src \
+	-I${X11BASE}/include
+
+SRCS=	dispatch_common.c \
+	dispatch_glx.c \
+	dispatch_egl.c \
+	gl_generated_dispatch.c \
+	glx_generated_dispatch.c \
+	egl_generated_dispatch.c
+
+INCS=	common.h \
+	gl.h \
+	glx.h \
+	egl.h
+
+GINCS=	gl_generated.h \
+	glx_generated.h \
+	egl_generated.h
+
+includes: _SUBDIRUSE
+	cd ${EPOXY}/include/epoxy; for i in ${INCS}; do \
+	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/epoxy/$$i || \
+		${INSTALL_DATA}	$$i ${DESTDIR}${INCSDIR}/epoxy"; \
+		echo "\tinstalling $$i"; \
+		eval "$$j"; \
+	done
+	cd ${.CURDIR}/generated/include/epoxy; for i in ${GINCS}; do \
+	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/epoxy/$$i || \
+		${INSTALL_DATA}	$$i ${DESTDIR}${INCSDIR}/epoxy"; \
+		echo "\tinstalling $$i"; \
+		eval "$$j"; \
+	done
+
+beforeinstall: includes 
+
+NOPROFILE=
+
+PKGCONFIG=		epoxy.pc
+PACKAGE_VERSION=	$(EPOXY_MAJOR).$(EPOXY_MINOR).$(EPOXY_TINY)
+EXTRA_PKGCONFIG_SUBST=	-e 's,@DLOPEN_LIBS@,,' \
+			 -e 's,@GL_REQS@,gl egl,' \
+			 -e 's,@epoxy_has_glx@,1,' \
+			 -e 's,@epoxy_has_egl@,1,' \
+			 -e 's,@epoxy_has_wgl@,0,'
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${.CURDIR}/generated/src
+.PATH: ${EPOXY}
+.PATH: ${EPOXY}/src

lib/libepoxy/config.h

@@ -0,0 +1,31 @@
+/*
+ * Autogenerated by the Meson build system.
+ * Do not edit, your changes will be lost.
+ */
+
+#pragma once
+
+#define ENABLE_EGL 1
+
+#define ENABLE_GLX 1
+
+#define ENABLE_X11 1
+
+#define EPOXY_PUBLIC __attribute__((visibility("default"))) extern
+
+#define HAVE_KHRPLATFORM_H
+
+#define PACKAGE_DATADIR "/usr/X11R6/share"
+
+#define PACKAGE_LIBDIR "/usr/X11R6/lib"
+
+#define PACKAGE_LIBEXECDIR "/usr/X11R6/libexec"
+
+#define PACKAGE_LOCALEDIR "/usr/X11R6/share/locale"
+
+#define PACKAGE_NAME "libepoxy"
+
+#define PACKAGE_STRING "libepoxy-1.5.4"
+
+#define PACKAGE_VERSION "1.5.4"
+

lib/libepoxy/epoxy.pc.in

@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+epoxy_has_glx=@epoxy_has_glx@
+epoxy_has_egl=@epoxy_has_egl@
+epoxy_has_wgl=@epoxy_has_wgl@
+
+Name: epoxy
+Description: epoxy GL dispatch Library
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lepoxy
+Libs.private: @DLOPEN_LIBS@
+Requires.private: @GL_REQS@

lib/libepoxy/generated/Makefile

@@ -0,0 +1,44 @@
+# $OpenBSD: Makefile,v 1.2 2018/05/25 06:24:59 matthieu Exp $
+
+EPOXY=	${.CURDIR}/../../../dist/libepoxy
+
+PYTHON=		python${PYTHON_VERSION}
+PYTHON_FLAGS=	-t -O -O
+
+GENERATED= \
+	src/gl_generated_dispatch.c \
+	src/glx_generated_dispatch.c \
+	src/egl_generated_dispatch.c
+
+all: ${GENERATED}
+
+obj:
+
+depend:
+
+install:
+
+clean distclean:
+	rm -f ${GENERATED}
+
+src/gl_generated_dispatch.c: registry/gl.xml
+	$(PYTHON) $(PYTHON_FLAGS) ${EPOXY}/src/gen_dispatch.py \
+	    --srcdir ${.CURDIR}/src --includedir ${.CURDIR}/include/epoxy \
+	    ${EPOXY}/registry/gl.xml
+
+src/glx_generated_dispatch.c: registry/glx.xml
+	$(PYTHON) $(PYTHON_FLAGS) ${EPOXY}/src/gen_dispatch.py \
+	    --srcdir ${.CURDIR}/src --includedir ${.CURDIR}/include/epoxy \
+	    ${EPOXY}/registry/glx.xml
+
+src/egl_generated_dispatch.c: registry/egl.xml
+	$(PYTHON) $(PYTHON_FLAGS) ${EPOXY}/src/gen_dispatch.py \
+	    --srcdir ${.CURDIR}/src --includedir ${.CURDIR}/include/epoxy \
+	    ${EPOXY}/registry/egl.xml
+
+.SUFFIXES: .py .xml
+
+.PATH:	${EPOXY}
+.PATH:	${EPOXY}/src
+
+.include <bsd.xorg.mk>

lib/libepoxy/shlib_version

@@ -0,0 +1,2 @@
+major=4
+minor=1