Index: head/graphics/libEGL/Makefile =================================================================== --- head/graphics/libEGL/Makefile (revision 434816) +++ head/graphics/libEGL/Makefile (revision 434817) @@ -1,30 +1,30 @@ # Created by: kwm@FreeBSD.org # $FreeBSD$ PORTNAME= libEGL PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= OpenEGL library LIB_DEPENDS+= libpthread-stubs.so:devel/libpthread-stubs \ libexpat.so:textproc/expat2 \ libdrm.so:graphics/libdrm USE_GL= gbm USE_XORG= x11 xau xcb xdmcp # stuff not needed by libEGL but configure wants it USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \ xshmfence .include .include "${.CURDIR}/../../graphics/libGL/Makefile.common" MESA_BUILD_WRKSRC= src/mapi src/gbm src/egl/ MESA_INSTALL_WRKSRC= src/egl .include "${.CURDIR}/../../graphics/libGL/Makefile.targets" .include Index: head/graphics/libGL/Makefile =================================================================== --- head/graphics/libGL/Makefile (revision 434816) +++ head/graphics/libGL/Makefile (revision 434817) @@ -1,30 +1,30 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= libGL PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libglapi.so:graphics/libglapi \ libexpat.so:textproc/expat2 USE_XORG= dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \ xfixes xshmfence xxf86vm .include .include "${.CURDIR}/Makefile.common" MESA_BUILD_WRKSRC= src/mapi src/glx MESA_INSTALL_WRKSRC= src/glx .include "${.CURDIR}/Makefile.targets" post-install: @cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \ ${MAKE_CMD} install-pkgconfigDATA install-glHEADERS install-glxHEADERS .include Index: head/graphics/libGL/Makefile.common =================================================================== --- head/graphics/libGL/Makefile.common (revision 434816) +++ head/graphics/libGL/Makefile.common (revision 434817) @@ -1,188 +1,180 @@ # Makefile.common - 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$ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 13.0.4 +MESABASEVERSION= 13.0.5 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:devel/makedepend USES+= compiler:c++11-lib bison gettext-tools gmake libtool \ localbase pathfix pkgconfig python:2,build shebangfix tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall # only have one port to check with portscout. .if ${PORTNAME} != libGL PORTSCOUT= ignore:1 .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/mapi/glapi/gen/*.py SHEBANG_FILES+= src/mapi/mapi_abi.py MASTERDIR= ${.CURDIR}/../../graphics/libGL PATCHDIR= ${MASTERDIR}/files WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist INSTALL_TARGET= install-strip COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} MESA_LLVM_VER=39 CONFIGURE_ARGS+= --with-sha1=libcrypto CONFIGURE_ARGS+= --enable-gbm # There are issues that need to be fixed to use TLS model "initial-exec" # So stick with "global-dynamic"'s model for now. kan@ is working on a # patch for rtld. We might want to backport global-dynamic or # pthread_setspecific which it uses now by default. But since this # configure switch is going away ... # https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html #CONFIGURE_ARGS+= --enable-glx-tls # libEGL, dri and clover need gallium enabled. # the third option in --with-egl-platforms is wayland. CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm # we don't care about GLes v1 -CONFIGURE_ARGS+= --disable-gles1 +CONFIGURE_ARGS+= --disable-gles1 --enable-gles2 -CONFIGURE_ARGS+= --enable-gles2 - # Clover (OpenCL). .if ${OPSYS} == DragonFly || \ (${OPSYS} == FreeBSD && \ (${ARCH} == amd64 || ${ARCH} == i386)) BUILD_DEPENDS+= libclc>=0.2.0.20160915:devel/libclc # We need the clang port too even if it is not used to compile because # Clover needs some of the clang includes to build. .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != "" _USES_pre_configure+= 290:clover-pre-configure # .if !exists() evaluates too early before cairo has a chance to be installed clover-pre-configure: @if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \ ! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \ ${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not build with clang support, which is required."; \ ${FALSE}; \ fi .endif -CONFIGURE_ARGS+= --enable-opencl \ - --enable-opencl-icd +CONFIGURE_ARGS+= --enable-opencl --enable-opencl-icd .else CONFIGURE_ARGS+= --disable-opencl .endif CONFIGURE_ARGS+= --enable-osmesa # gallium BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER} .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != "" RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER} .endif CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} CONFIGURE_ARGS+=--enable-gallium-llvm --enable-llvm-shared-libs \ --enable-xvmc .if ${PORT_OPTIONS:MTEXTURE} CONFIGURE_ARGS+=--enable-texture-float .endif # only support on DragonFly. FreeBSD's drm doesn't support it. .if ${OPSYS} == DragonFly && ${COMPONENT:Mdri} != "" CONFIGURE_ARGS+=--enable-vdpau LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau PLIST_SUB+= VDPAU="" .else CONFIGURE_ARGS+=--disable-vdpau PLIST_SUB+= VDPAU="@comment " .endif # VAAPI support? CONFIGURE_ARGS+=--disable-va -ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST -ALL_GALLIUM_DRIVERS=R300 R600 RADEONSI SVGA SWRAST +ALL_DRI_DRIVERS= I915 I965 RADEON R200 SWRAST +ALL_GALLIUM_DRIVERS= R300 R600 RADEONSI SVGA SWRAST -.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 -DRI_DRIVERS= ${ALL_DRI_DRIVERS} -GALLIUM_DRIVERS= ${ALL_GALLIUM_DRIVERS} +.if ${ARCH} == amd64 || ${ARCH} == i386 +DRI_DRIVERS= I915 I965 RADEON R200 +GALLIUM_DRIVERS= R300 R600 RADEONSI SVGA .endif .if ${ARCH} == powerpc || ${ARCH} == powerpc64 -DRI_DRIVERS= RADEON R200 SWRAST -GALLIUM_DRIVERS= R300 R600 RADEONSI SWRAST +DRI_DRIVERS= RADEON R200 +GALLIUM_DRIVERS= R300 R600 RADEONSI .endif -.if ${ARCH} == sparc64 || ${ARCH} == armv6 -DRI_DRIVERS= SWRAST -GALLIUM_DRIVERS= SWRAST -.endif - -# empty for unsupported arches -DRI_DRIVERS+= -GALLIUM_DRIVERS+= +# software rendering for all arches +DRI_DRIVERS+= SWRAST +GALLIUM_DRIVERS+= SWRAST .for _d in ${ALL_DRI_DRIVERS} . if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" . else PLIST_SUB+= ${_d}_DRIVER="@comment " . endif .endfor CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}" .for _gd in ${ALL_GALLIUM_DRIVERS} . if ${GALLIUM_DRIVERS:M${_gd}} PLIST_SUB+= ${_gd}_GDRIVER="" . else PLIST_SUB+= ${_gd}_GDRIVER="@comment " . endif .endfor CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}" .if ${OPSYS} == DragonFly LIB_DEPENDS+= libelf.so:devel/libelf .endif Index: head/graphics/libGL/distinfo =================================================================== --- head/graphics/libGL/distinfo (revision 434816) +++ head/graphics/libGL/distinfo (revision 434817) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486052718 -SHA256 (mesa-13.0.4.tar.xz) = a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726 -SIZE (mesa-13.0.4.tar.xz) = 9164612 +TIMESTAMP = 1487852413 +SHA256 (mesa-13.0.5.tar.xz) = bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 +SIZE (mesa-13.0.5.tar.xz) = 9171480 Index: head/graphics/libglesv2/Makefile =================================================================== --- head/graphics/libglesv2/Makefile (revision 434816) +++ head/graphics/libglesv2/Makefile (revision 434817) @@ -1,29 +1,29 @@ # Created by: kwm@FreeBSD.org # $FreeBSD$ PORTNAME= libglesv2 PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= OpenGL ES v2 library LICENSE= MIT LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libglapi.so:graphics/libglapi \ libexpat.so:textproc/expat2 # stuff not needed by libglesv2 but configure wants it USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \ xshmfence .include .include "${.CURDIR}/../../graphics/libGL/Makefile.common" BUILD_WRKSRC= ${WRKSRC}/src/mapi INSTALL_WRKSRC= ${WRKSRC}/src/mapi .include "${.CURDIR}/../../graphics/libGL/Makefile.targets" .include Index: head/graphics/libosmesa/Makefile =================================================================== --- head/graphics/libosmesa/Makefile (revision 434816) +++ head/graphics/libosmesa/Makefile (revision 434817) @@ -1,34 +1,34 @@ # Created by: gahr # $FreeBSD$ PORTNAME= libosmesa PORTVERSION= ${MESAVERSION} PORTREVISION= 0 CATEGORIES= graphics COMMENT= Off-Screen Mesa implementation of the OpenGL API LIB_DEPENDS= libexpat.so:textproc/expat2 \ libglapi.so:graphics/libglapi USES= ssl -USE_XORG= x11 xau xcb xdmcp xvmc +USE_XORG= dri2proto dri3proto glproto presentproto x11 xau xcb xdmcp xvmc # libosmesa doesn't link agains libGL but osmesa.h needs GL/gl.h # and both headers are intalled by libGL .... USE_GL= gl .include .include "${.CURDIR}/../../graphics/libGL/Makefile.common" #MESA_BUILD_WRKSRC= src/util src/glsl src/mesa #/drivers/osmesa MESA_INSTALL_WRKSRC= src/mesa/drivers/osmesa .include "${.CURDIR}/../../graphics/libGL/Makefile.targets" post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \ ${STAGEDIR}${PREFIX}/include/GL .include