Index: head/graphics/dri/Makefile =================================================================== --- head/graphics/dri/Makefile (revision 378133) +++ head/graphics/dri/Makefile (revision 378134) @@ -1,126 +1,117 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= dri PORTVERSION= ${MESAVERSION} PORTREVISION= ${DRIREVISION} PORTEPOCH= 2 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for the DRI LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \ libexpat.so:${PORTSDIR}/textproc/expat2 USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto \ presentproto xvmc xshmfence OPTIONS_DEFINE= TEXTURE OPTIONS_DEFAULT=TEXTURE OPTIONS_DEFINE_i386= GALLIUM OPTIONS_DEFAULT_i386= GALLIUM OPTIONS_DEFINE_amd64= GALLIUM OPTIONS_DEFAULT_amd64= GALLIUM GALLIUM_DESC= Gallium (llvm backed) dri drivers TEXTURE_DESC= Enable texture-float support (patent encumbered) VDPAU_DESC= VDPAU (GPU video acceleration) support (needs Gallium) PKGHELP= ${.CURDIR}/pkg-help .include # gcc from base can't handle some code in mesa 9.1+ # We only care for 9.x and 8.x. clang in 10.x is new enough. # This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver. . if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) CC=clang CXX=clang++ CPP=clang-cpp . elif ${OSVERSION} < 901500 USE_GCC=yes . endif ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" PLIST_SUB+= VERSION=${MESADISTVERSION} .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif .if defined(WITH_NEW_MESA) DRIREVISION= 0 PLIST= ${.CURDIR}/pkg-plist .else DRIREVISION= 6 PLIST= ${.CURDIR}/pkg-plist-old .endif -DRI_LLVM_VER= 0 - .if ${PORT_OPTIONS:MGALLIUM} -. if defined(WITH_NEW_MESA) -# keep in sync with libopencl please -DRI_LLVM_VER= 34 -. else -DRI_LLVM_VER= 33 -. endif - -BUILD_DEPENDS+= llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER} -RUN_DEPENDS+= llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER} -CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${DRI_LLVM_VER} +BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER} +RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER} +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} CONFIGURE_ARGS+=--enable-gallium-llvm \ --enable-xvmc \ --with-gallium-drivers=r300,r600,radeonsi,svga,swrast PLIST_SUB+= GALLIUM="" .else CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ --disable-gallium-egl PLIST_SUB+= GALLIUM="@comment " .endif .if ${PORT_OPTIONS:MTEXTURE} CONFIGURE_ARGS+=--enable-texture-float .endif .if 0 #${PORT_OPTIONS:MVDPAU} .if ${PORT_OPTIONS:MGALLIUM} == "" IGNORE= VDPAU option requires GALLIUM support to be enabled .endif CONFIGURE_ARGS+=--enable-vdpau LIB_DEPENDS+= libvdpau.so:${PORTSDIR}/multimedia/libvdpau PLIST_SUB+= VDPAU="" .else CONFIGURE_ARGS+=--disable-vdpau PLIST_SUB+= VDPAU="@comment " .endif .if ${ARCH} == powerpc || ${ARCH} == powerpc64 DRI_DRIVERS= RADEON SWRAST .endif .if ${ARCH} == sparc64 || ${ARCH} == armv6 DRI_DRIVERS= SWRAST .endif # empty for unsupported arches DRI_DRIVERS+= .for _d in ${ALL_DRI_DRIVERS} . if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" . else PLIST_SUB+= ${_d}_DRIVER="@comment " . endif .endfor .if !(${ARCH} == amd64 || ${ARCH} == i386) CONFIGURE_ARGS+=--disable-gallium-intel .endif CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}" .include Index: head/graphics/libGL/bsd.mesalib.mk =================================================================== --- head/graphics/libGL/bsd.mesalib.mk (revision 378133) +++ head/graphics/libGL/bsd.mesalib.mk (revision 378134) @@ -1,158 +1,165 @@ # bsd.mesalib.mk - shared code between MesaLib ports. # # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION: # # - graphics/dri # - graphics/gbm # - graphics/libEGL # - graphics/libGL # - graphics/libglapi # - graphics/libglesv2 # - graphics/libosmesa +# - lang/clover # # $FreeBSD$ # hw context support in the i915kms driver .if ${OPSYS} == FreeBSD && \ (${OSVERSION} >= 1000717 && ${OSVERSION} < 1100000 || \ ${OSVERSION} >= 1100035) WITH_NEW_MESA=1 .endif .if ${OPSYS} == DragonFly && ${DFLYVERSION} >= 300901 WITH_NEW_MESA=1 .endif MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_MESA) -MESABASEVERSION= 10.4.0 +MESABASEVERSION= 10.4.3 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ PLIST_SUB+= OLD="@comment " NEW="" # work around libarchive bug? EXTRACT_CMD= ${LOCALBASE}/bin/gtar EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar .else MESABASEVERSION= 9.1.7 MESASUBVERSION= MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/older-versions/${MESABASEVERSION:R:R}.x/${MESABASEVERSION}/ PLIST_SUB+= OLD="" NEW="@comment " .endif DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq USES+= bison gettext-tools gmake libtool pathfix pkgconfig \ python:2,build shebangfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -Wl,-Y${LOCALBASE}/lib PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex .endif 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 .if defined(WITH_NEW_MESA) SHEBANG_FILES+= src/mapi/mapi_abi.py .endif MASTERDIR= ${.CURDIR}/../../graphics/libGL .if defined(WITH_NEW_MESA) PATCHDIR= ${MASTERDIR}/files CONFIGURE_ARGS+= --disable-dri3 .else PATCHDIR= ${MASTERDIR}/files-old .endif DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION} INSTALL_TARGET= install-strip COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} +.if defined(WITH_NEW_MESA) +MESA_LLVM_VER=34 +.else +MESA_LLVM_VER=33 +.endif + .if ${COMPONENT:Mglesv2} == "" CONFIGURE_ARGS+= --disable-gles2 .else CONFIGURE_ARGS+= --enable-gles2 .endif .if ${COMPONENT:Megl} == "" CONFIGURE_ARGS+= --disable-egl .else CONFIGURE_ARGS+= --enable-egl .endif -.if ${COMPONENT:Mopencl} == "" +.if ${COMPONENT:Mclover} == "" CONFIGURE_ARGS+= --disable-opencl .else CONFIGURE_ARGS+= --enable-opencl .endif -.if ${COMPONENT:Mdri} == "" +.if ${COMPONENT:Mdri} == "" && ${COMPONENT:Mclover} == "" CONFIGURE_ARGS+=--with-dri-drivers=no CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers .else # done in the dri port # need to enable this globaly because it also used in dri .. # the third possible option is wayland. CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm .endif .if ${COMPONENT:Mvdpau} == "" CONFIGURE_ARGS+=--disable-vdpau .else CONFIGURE_ARGS+=--enable-vdpau .endif post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c .if !defined(WITH_NEW_MESA) @${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${PYTHON_CMD}|g' \ ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ ${WRKSRC}/src/glsl/builtins/tools/*.py .else @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \ ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py .endif @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|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 pre-build: pre-mesa-build pre-mesa-build: .if defined(WITH_NEW_MESA) # do propper gmake target. @cd ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool && ${MAKE_CMD} @cd ${WRKSRC}/src/loader && ${MAKE_CMD} libloader.la .endif Index: head/graphics/libGL/distinfo =================================================================== --- head/graphics/libGL/distinfo (revision 378133) +++ head/graphics/libGL/distinfo (revision 378134) @@ -1,4 +1,4 @@ SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0 SIZE (MesaLib-9.1.7.tar.bz2) = 6134393 -SHA256 (MesaLib-10.4.0.tar.bz2) = 98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219 -SIZE (MesaLib-10.4.0.tar.bz2) = 7479710 +SHA256 (MesaLib-10.4.3.tar.bz2) = ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad +SIZE (MesaLib-10.4.3.tar.bz2) = 7504749