Enable the build of libOSMesa. Ports will need it soon.

tested by juanfra@ ok jsg@

5 files changed, 63 insertions, 8 deletions

diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile
index 4a0eb4acc..062e299e4 100644
--- a/lib/libGL/Makefile
+++ b/lib/libGL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2015/02/20 23:31:04 jsg Exp $
+# $OpenBSD: Makefile,v 1.46 2015/08/19 23:00:12 matthieu Exp $
 .include <bsd.xconf.mk>
 .include "config.mk"
 
@@ -8,7 +8,7 @@ MAKE_FLAGS+= XENOCARA_BUILD_GALLIUM=${XENOCARA_BUILD_GALLIUM}
 .endif
 
 .if ${XENOCARA_BUILD_DRI:L} == "yes"
-SUBDIR+=glsl mesa dri
+SUBDIR+=glsl mesa dri osmesa
 .endif
 
 LIB=	GL
diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc
index 9e405b809..c9f335bac 100644
--- a/lib/libGL/dri/Makefile.inc
+++ b/lib/libGL/dri/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.22 2015/02/20 23:31:04 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.23 2015/08/19 23:00:12 matthieu Exp $
 .include <bsd.xconf.mk>
 .include "../config.mk"
 
@@ -14,10 +14,6 @@ COMMON_GALLIUM_SOURCES = \
 	xmlconfig.c
 
 COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
-	driverfuncs.c \
-	meta_blit.c \
-	meta_generate_mipmap.c \
-	meta.c \
 	megadriver_stub.c
 
 CPPFLAGS+= -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
diff --git a/lib/libGL/mesa/Makefile.inc b/lib/libGL/mesa/Makefile.inc
index 4537208ed..2360a17e5 100644
--- a/lib/libGL/mesa/Makefile.inc
+++ b/lib/libGL/mesa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2015/02/20 23:31:06 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2015/08/19 23:00:12 matthieu Exp $
 .include "../config.mk"
 
 MESA=		${.CURDIR}/../../../../dist/Mesa/src/mesa
@@ -378,6 +378,8 @@ SPARC_SOURCES =			\
 
 COMMON_DRIVER_SOURCES = \
 	driverfuncs.c		\
+	meta_blit.c		\
+	meta_generate_mipmap.c	\
 	meta.c
 
 MESA_SOURCES = \
diff --git a/lib/libGL/osmesa/Makefile b/lib/libGL/osmesa/Makefile
new file mode 100644
index 000000000..10a391b1f
--- /dev/null
+++ b/lib/libGL/osmesa/Makefile
@@ -0,0 +1,55 @@
+# $OpenBSD: Makefile,v 1.1 2015/08/19 23:00:12 matthieu Exp $
+.include <bsd.xconf.mk>
+.include "${.CURDIR}/../config.mk"
+
+LIB= OSMesa
+
+MESA=   ${.CURDIR}/../../../dist/Mesa/src/mesa
+MAPI=   ${.CURDIR}/../../../dist/Mesa/src/mapi
+OSMESA=	${MESA}/drivers/osmesa
+MESA_INCLUDE=   ${.CURDIR}/../../../dist/Mesa/include
+
+OSMESA_VERSION=	8
+
+SRCS= osmesa.c
+
+NOPROFILE=
+
+PKGCONGIG= osmesa.pc
+
+obj: _xenocara_obj
+
+CPPFLAGS += \
+	-I. \
+	-I${MESA_INCLUDE} \
+	-I${MESA} \
+	-I${MAPI} \
+	-I${.CURDIR}/../generated
+
+LDADD=	../mesa/libmesa/libmesa_pic.a \
+	../glsl/libglsl/libglsl_pic.a \
+	-L${X11BASE}/lib -lglapi -lpthread -lstdc++ -lm
+
+osmesa.pc: ${OSMESA}/osmesa.pc.in
+	sed -e 's,@prefix@,${X11BASE},' \
+	    -e 's,@exec_prefix@,${X11BASE},' \
+	    -e 's,@libdir@,${LIBDIR},' \
+	    -e 's,@includedir@,${INCSDIR},' \
+	    -e 's,@OSMESA_VERSION@,$(OSMESA_VERSION),' \
+	    -e 's,@OSMESA_PC_REQ@,,' \
+	    -e 's,@OSMESA_LIB@,${LIB},' \
+	    -e 's,@OSMESA_PC_LIB_PRIV@,-lm -lpthread,' \
+	< ${OSMESA}/osmesa.pc.in > osmesa.pc
+
+beforedepend: osmesa.pc
+
+afterinstall: osmesa.pc
+	$(INSTALL_DATA) osmesa.pc ${DESTDIR}${LIBDIR}/pkgconfig
+
+CLEANFILES+= osmesa.pc
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+
+.PATH: ${MESA}/drivers/osmesa
diff --git a/lib/libGL/osmesa/shlib_version b/lib/libGL/osmesa/shlib_version
new file mode 100644
index 000000000..9c1551636
--- /dev/null
+++ b/lib/libGL/osmesa/shlib_version
@@ -0,0 +1,2 @@
+major=6
+minor=0