Mesa 10.2.7

This commit is contained in:
jsg 2014-09-07 15:32:18 +00:00
parent 29ddf62fe4
commit b222fe706e
7 changed files with 735 additions and 726 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2014/07/09 21:32:40 jsg Exp $ # $OpenBSD: Makefile,v 1.8 2014/09/07 15:32:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
LIB= EGL LIB= EGL
@ -11,7 +11,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_MAJOR= 10 MESA_MAJOR= 10
MESA_MINOR= 2 MESA_MINOR= 2
MESA_TINY= 3 MESA_TINY= 7
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri
EGL_DRIVER_SEARCH_DIR= ${X11BASE}/lib/modules/egl EGL_DRIVER_SEARCH_DIR= ${X11BASE}/lib/modules/egl

View File

@ -1,12 +1,12 @@
# $OpenBSD: config.mk,v 1.1 2014/07/09 21:32:40 jsg Exp $ # $OpenBSD: config.mk,v 1.2 2014/09/07 15:32:18 jsg Exp $
MESA_MAJOR= 10 MESA_MAJOR= 10
MESA_MINOR= 2 MESA_MINOR= 2
MESA_TINY= 3 MESA_TINY= 7
CPP= cpp -notraditional CPP= cpp -notraditional
CFLAGS+= -std=c99 -fms-extensions CFLAGS+= -std=c99
CPPFLAGS+= \ CPPFLAGS+= \
-DPACKAGE_VERSION=\"${MESA_MAJOR}.${MESA_MINOR}.${MESA_TINY}\" \ -DPACKAGE_VERSION=\"${MESA_MAJOR}.${MESA_MINOR}.${MESA_TINY}\" \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.7 2014/07/09 21:32:40 jsg Exp $ # $OpenBSD: Makefile.inc,v 1.8 2014/09/07 15:32:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
.include "../config.mk" .include "../config.mk"
@ -27,9 +27,17 @@ lib${LIB}_pic.a: ${OBJS} ${DPADD}
.if ${XENOCARA_BUILD_GALLIUM} == "llvm" .if ${XENOCARA_BUILD_GALLIUM} == "llvm"
# Remember to keep in sync with LLVM port's version.
LLVM_VERSION= 0x305 # 3.5
LLVM_CONFIG?= /usr/local/bin/llvm-config LLVM_CONFIG?= /usr/local/bin/llvm-config
LLVM_V!= ${LLVM_CONFIG} --version | sed 's/svn.*//g'
LLVM_V_MAJOR!= echo ${LLVM_V} | cut -d. -f 1
LLVM_V_MINOR!= echo ${LLVM_V} | cut -d. -f 2
LLVM_V_PATCH!= echo ${LLVM_V} | cut -d. -f 3
.if empty(LLVM_V_PATCH)
LLVM_V_PATCH=0
.endif
LLVM_VERSION_INT="${LLVM_V_MAJOR}0${LLVM_V_MINOR}"
# ugh... # ugh...
ALLVM_CFLAGS!= ${LLVM_CONFIG} --cflags ALLVM_CFLAGS!= ${LLVM_CONFIG} --cflags
@ -47,7 +55,7 @@ LDADD+= -L${LLVM_LIBDIR} ${LLVM_LIBS}
CPPFLAGS+= \ CPPFLAGS+= \
-DGALLIUM_LLVMPIPE \ -DGALLIUM_LLVMPIPE \
-DHAVE_LLVM=${LLVM_VERSION} -DLLVM_VERSION_PATCH=0 -DHAVE_LLVM=0x0${LLVM_VERSION_INT} -DLLVM_VERSION_PATCH=${LLVM_V_PATCH}
SWRAST_DRIVERS+= ../../gallium/drivers/llvmpipe/libllvmpipe_pic.a SWRAST_DRIVERS+= ../../gallium/drivers/llvmpipe/libllvmpipe_pic.a

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2014/07/09 21:32:41 jsg Exp $ # $OpenBSD: Makefile,v 1.8 2014/09/07 15:32:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
LIB= GLESv1_CM LIB= GLESv1_CM
@ -10,7 +10,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_MAJOR= 10 MESA_MAJOR= 10
MESA_MINOR= 2 MESA_MINOR= 2
MESA_TINY= 3 MESA_TINY= 7
INCSDIR= ${X11BASE}/include/GLES INCSDIR= ${X11BASE}/include/GLES

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2014/07/09 21:32:42 jsg Exp $ # $OpenBSD: Makefile,v 1.8 2014/09/07 15:32:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
LIB= GLESv2 LIB= GLESv2
@ -10,7 +10,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_MAJOR= 10 MESA_MAJOR= 10
MESA_MINOR= 2 MESA_MINOR= 2
MESA_TINY= 3 MESA_TINY= 7
INCSDIR= ${X11BASE}/include/GLES2 INCSDIR= ${X11BASE}/include/GLES2
INCSDIR3= ${X11BASE}/include/GLES3 INCSDIR3= ${X11BASE}/include/GLES3

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2014/07/09 21:32:42 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2014/09/07 15:32:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
LIB= gbm LIB= gbm
@ -12,7 +12,7 @@ DEFAULT_DRIVER_DIR= ${X11BASE}/lib/modules/dri
MESA_MAJOR= 10 MESA_MAJOR= 10
MESA_MINOR= 2 MESA_MINOR= 2
MESA_TINY= 3 MESA_TINY= 7
INCSDIR= ${X11BASE}/include INCSDIR= ${X11BASE}/include