diff options
| -rw-r--r-- | graphics/dri/Makefile | 14 | ||||
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 18 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-src_egl_main_Makefile.in | 6 | ||||
| -rw-r--r-- | graphics/libGL/files/patch-src_mapi_es2api_Makefile.in | 6 |
4 files changed, 36 insertions, 8 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index 3534a5d..ba11437 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -9,7 +9,6 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for the DRI -BUILD_DEPENDS= python2:${PORTSDIR}/lang/python2 LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \ libexpat.so:${PORTSDIR}/textproc/expat2 @@ -20,6 +19,18 @@ CONFLICTS= dri-[7-8].* .include <bsd.port.options.mk> +# gcc from base can't handle some code in mesa 9.1+ +# We only care for 9.x and 8.x, not for old pre-clang default current. +.if defined(WITH_NEW_XORG) +. if ${OSVERSION} >= 901000 && ${OSVERSION} < 902502 +CC=clang +CXX=clang++ +CPP=clang-cpp +. elif ${OSVERSION} < 901500 +USE_GCC=yes +. endif +.endif + .if ${ARCH} == ia64 #BROKEN= does not install on ia64 .endif @@ -89,6 +100,7 @@ pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers." @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" + @${ECHO_MSG} "Note that gallium support is highly experimental." @${ECHO_MSG} "" .endif diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 7bf8219..8100307 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -32,9 +32,10 @@ DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ + python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 -USES= bison gmake pathfix pkgconfig +USES= bison gmake pathfix pkgconfig shebangfix USE_PYTHON_BUILD=-2.7 USE_BZIP2= yes USE_LDCONFIG= yes @@ -62,6 +63,13 @@ REAPPLY_PATCHES= \ ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in + +python_OLD_CMD= "/usr/bin/env[[:space:]]python" +python_CMD= ${LOCALBASE}/bin/python2 +SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ + src/gallium/drivers/svga/svgadump/svga_dump.py \ + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ + src/mapi/mapi/mapi_abi.py .else CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu @@ -115,6 +123,14 @@ post-patch: ${WRKSRC}/src/glu/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile + @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ + ${WRKSRC}/src/glsl/builtins/tools/*.py + @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' \ + ${WRKSRC}/src/mesa/main/get_hash_generator.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \ + .endif pre-configure: diff --git a/graphics/libGL/files/patch-src_egl_main_Makefile.in b/graphics/libGL/files/patch-src_egl_main_Makefile.in index d125c62..7fefe71 100644 --- a/graphics/libGL/files/patch-src_egl_main_Makefile.in +++ b/graphics/libGL/files/patch-src_egl_main_Makefile.in @@ -1,6 +1,6 @@ ---- src/egl/main/Makefile.in.orig 2013-06-27 00:21:41.000000000 +0200 -+++ src/egl/main/Makefile.in 2013-06-27 00:22:04.000000000 +0200 -@@ -990,8 +982,14 @@ +--- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200 ++++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200 +@@ -990,8 +990,14 @@ # a while by putting a link to the driver into /lib of the build tree. all-local: libEGL.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR); diff --git a/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in b/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in index b270657..1e3229e 100644 --- a/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in +++ b/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in @@ -1,6 +1,6 @@ ---- src/mapi/es2api/Makefile.in.orig 2013-08-22 09:41:37.000000000 +0200 -+++ src/mapi/es2api/Makefile.in 2013-08-22 09:43:20.000000000 +0200 -@@ -991,9 +991,14 @@ +--- src/mapi/es2api/Makefile.in.orig 2013-08-01 23:22:21.000000000 +0200 ++++ src/mapi/es2api/Makefile.in 2013-09-01 11:38:01.000000000 +0200 +@@ -958,9 +958,14 @@ # a while by putting a link to the driver into /lib of the build tree. all-local: libGLESv2.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR); |