Add a new option to the xenocara infrastructure be able to automatically

build the Gallium3D software rasterizer as part of the libGL.

Note that it can also makes use of LLVM to build the llvmpipe if the
corresponding port is installed. Please refer to the README for a more
complete documentation.

Prodded by ajacoutot@, ok matthieu@

6 files changed, 27 insertions, 15 deletions

diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile
index 397643d90..77fe9b8c7 100644
--- a/lib/libGL/Makefile
+++ b/lib/libGL/Makefile
@@ -1,10 +1,14 @@
-# $OpenBSD: Makefile,v 1.33 2012/11/11 12:09:09 mpi Exp $
+# $OpenBSD: Makefile,v 1.34 2013/04/14 10:23:04 mpi Exp $
 .include <bsd.xconf.mk>
 
 .if ${XENOCARA_BUILD_DRI:L} == "yes"
 SUBDIR=glsl mesa dri
 .endif
 
+.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm"
+SUBDIR+=gallium dri/swrastg
+.endif
+
 LIB=	GL
 
 MESA=	${.CURDIR}/../../dist/Mesa/src/mesa
diff --git a/lib/libGL/dri/swrastg/Makefile b/lib/libGL/dri/swrastg/Makefile
index 3f683a5b1..57ea03567 100644
--- a/lib/libGL/dri/swrastg/Makefile
+++ b/lib/libGL/dri/swrastg/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2012/12/04 14:06:32 mpi Exp $
+#	$OpenBSD: Makefile,v 1.8 2013/04/14 10:23:04 mpi Exp $
 
 LIB=	swrastg_dri.so
 
@@ -10,15 +10,11 @@ CPPFLAGS= \
 	-I${GALLIUM}/state_trackers/dri/common \
 	-DHAVE_POSIX_MEMALIGN
 
-DRIVER_LIBS= \
+SWRAST_DRIVERS= \
 	../../gallium/drivers/trace/libtrace_pic.a \
 	../../gallium/drivers/rbug/librbug_pic.a \
 	../../gallium/drivers/softpipe/libsoftpipe_pic.a
 
-.ifdef XENOCARA_HAVE_LLVM
-DRIVER_LIBS+=	../../gallium/drivers/llvmpipe/libllvmpipe_pic.a
-.endif
-
 DRIVER_DEFINES = \
 	-D__NOT_HAVE_DRM_H \
 	-DGALLIUM_SOFTPIPE \
@@ -50,7 +46,7 @@ SRCS = \
 
 LDADD=	../../mesa/libmesagallium/libmesagallium_pic.a \
 	../../glsl/libglsl/libglsl_pic.a \
-	${DRIVER_LIBS} \
+	${SWRAST_DRIVERS} \
 	../../gallium/libgallium/libgallium_pic.a \
 	-L${X11BASE}/lib -lexpat -lm -lstdc++ -lc
 DPADD=	../../mesa/libmesagallium/libmesagallium_pic.a
diff --git a/lib/libGL/gallium/Makefile.inc b/lib/libGL/gallium/Makefile.inc
index 7a9ac5829..0d7f030bf 100644
--- a/lib/libGL/gallium/Makefile.inc
+++ b/lib/libGL/gallium/Makefile.inc
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.2 2012/11/11 12:09:09 mpi Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2013/04/14 10:23:04 mpi Exp $
+.include <bsd.xconf.mk>
 
 CPP=	cpp -notraditional
 
@@ -25,7 +26,9 @@ lib${LIB}_pic.a: ${OBJS} ${DPADD}
 	${RANLIB} lib${LIB}_pic.a
 
 
-.ifdef XENOCARA_HAVE_LLVM
+.if ${XENOCARA_BUILD_GALLIUM} == "llvm"
+
+# Remember to keep in sync with LLVM port's version.
 LLVM_VERSION=	0x301	# 3.1 
 LLVM_CONFIG?=	/usr/local/bin/llvm-config
 
@@ -41,6 +44,8 @@ LDADD+=		-L${LLVM_LIBDIR} ${LLVM_LIBS}
 CPPFLAGS+= \
 	-DGALLIUM_LLVMPIPE \
 	-DHAVE_LLVM=${LLVM_VERSION}
+
+SWRAST_DRIVERS+= ../../gallium/drivers/llvmpipe/libllvmpipe_pic.a
 .endif
 
 
diff --git a/lib/libGL/gallium/drivers/Makefile b/lib/libGL/gallium/drivers/Makefile
index 40fc17265..b582404df 100644
--- a/lib/libGL/gallium/drivers/Makefile
+++ b/lib/libGL/gallium/drivers/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2012/07/13 12:43:34 mpi Exp $
+# $OpenBSD: Makefile,v 1.2 2013/04/14 10:23:04 mpi Exp $
+.include <bsd.xconf.mk>
 
 SUBDIR= rbug softpipe trace
 
-.ifdef XENOCARA_HAVE_LLVM
+.if ${XENOCARA_BUILD_GALLIUM} == "llvm"
 SUBDIR+= llvmpipe
 .endif
 
diff --git a/lib/libGL/gallium/libgallium/Makefile b/lib/libGL/gallium/libgallium/Makefile
index b5846da9f..f0fcee302 100644
--- a/lib/libGL/gallium/libgallium/Makefile
+++ b/lib/libGL/gallium/libgallium/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2012/08/17 13:58:00 mpi Exp $
+# $OpenBSD: Makefile,v 1.3 2013/04/14 10:23:04 mpi Exp $
+.include <bsd.xconf.mk>
 
 LIB=	gallium
 
@@ -193,7 +194,7 @@ GALLIVM_CPP_SOURCES = \
 
 SRCS=	${C_SOURCES}
 
-.ifdef XENOCARA_HAVE_LLVM
+.if ${XENOCARA_BUILD_GALLIUM} == "llvm"
 SRCS+=	${GALLIVM_SOURCES} \
 	${GALLIVM_CPP_SOURCES}
 .endif
diff --git a/lib/libGL/mesa/Makefile b/lib/libGL/mesa/Makefile
index f73b145d4..71aba89cb 100644
--- a/lib/libGL/mesa/Makefile
+++ b/lib/libGL/mesa/Makefile
@@ -1,7 +1,12 @@
-# $OpenBSD: Makefile,v 1.1 2012/08/26 18:46:42 mpi Exp $
+# $OpenBSD: Makefile,v 1.2 2013/04/14 10:23:04 mpi Exp $
+.include <bsd.xconf.mk>
 
 SUBDIR= libmesa
 
+.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm"
+SUBDIR+= libmesagallium
+.endif
+
 build depend all install clean cleandir: _SUBDIRUSE
 
 .include <bsd.xorg.mk>