Index: head/Mk/Uses/gl.mk =================================================================== --- head/Mk/Uses/gl.mk (revision 548949) +++ head/Mk/Uses/gl.mk (revision 548950) @@ -1,57 +1,58 @@ # $FreeBSD$ # # Use OpenGL and related libraries and ports # # Feature: gl # Usage: USES=gl -# USE_GL=egl gbm gl glesv2 glew glu glut +# USE_GL=egl gbm gl glesv1 glesv2 glew glu glut # # USE_GL specifies which GL components to add as dependencies. # Not specifying USE_GL with USES=gl is an error. # USE_GL=yes implies USE_GL=glu. This is deprecated # # MAINTAINER: x11@FreeBSD.org .if !defined(_INCLUDE_USES_GL_MK) _INCLUDE_USES_GL_MK=yes _GL_egl_LIB_DEPENDS= libEGL.so:graphics/mesa-libs _GL_gbm_LIB_DEPENDS= libgbm.so:graphics/mesa-libs _GL_gl_LIB_DEPENDS= libGL.so:graphics/mesa-libs _GL_gl_USE_XORG= xorgproto +_GL_glesv1_LIB_DEPENDS= libGLESv1_CM.so:graphics/mesa-libs _GL_glesv2_LIB_DEPENDS= libGLESv2.so:graphics/mesa-libs _GL_glew_LIB_DEPENDS= libGLEW.so:graphics/glew _GL_glu_LIB_DEPENDS= libGLU.so:graphics/libGLU _GL_glu_USE_XORG= xorgproto _GL_glut_LIB_DEPENDS= libglut.so:graphics/freeglut .if !empty(gl_ARGS) IGNORE= USES=gl takes no arguments .endif .if !defined(USE_GL) IGNORE= need to specify gl component with USE_GL .elif ${USE_GL:tl} == yes DEV_WARNING+= "USE_GL=yes is deprecated, please add USE_GL=glu (default) or specify component" USE_GL= glu .endif .for _component in ${USE_GL} .if !defined(_GL_${_component}_LIB_DEPENDS) IGNORE= uses unknown GL component .else USE_XORG+= ${_GL_${_component}_USE_XORG} LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS} .endif .endfor # We only need to include xorg.mk if we want USE_XORG modules # USES+=xorg does not provide any functionality, it just silences an error # message about USES=xorg not being set .if defined(USE_XORG) && !empty(USE_XORG) USES+= xorg .include "${USESDIR}/xorg.mk" .endif # _INCLUDE_USES_GL_MK .endif Index: head/graphics/libxatracker/Makefile =================================================================== --- head/graphics/libxatracker/Makefile (revision 548949) +++ head/graphics/libxatracker/Makefile (revision 548950) @@ -1,43 +1,44 @@ # Created by: johalun # $FreeBSD$ PORTNAME= libxatracker PORTVERSION= ${MESAVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics COMMENT= Mesa XA state tracker USES= xorg USE_XORG= xorgproto .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Used only by VMWare supported architectures MESON_ARGS+= -Ddri-drivers="" \ -Dgallium-drivers="svga" \ -Dvulkan-drivers="" \ -Dgallium-vdpau=false \ -Dgallium-omx=disabled \ -Dgallium-va=false \ -Dgallium-opencl=disabled \ -Dgallium-xvmc=false \ -Dgallium-nine=false \ -Degl=false \ -Dgbm=false \ + -Dgles1=false \ -Dgles2=false \ -Dglx=disabled \ -Dopengl=false \ -Dshared-glapi=false \ -Dosmesa=none \ -Dplatforms= LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-xa=true .include "${MASTERDIR}/Makefile.targets" .include Index: head/graphics/mesa-dri/Makefile.common =================================================================== --- head/graphics/mesa-dri/Makefile.common (revision 548949) +++ head/graphics/mesa-dri/Makefile.common (revision 548950) @@ -1,111 +1,108 @@ # 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/libosmesa # - graphics/mesa-dri # - graphics/mesa-libs # - lang/clover # # $FreeBSD$ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} MESABASEVERSION= 19.0.8 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= https://mesa.freedesktop.org/archive/ \ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \ ftp://ftp.freedesktop.org/pub/mesa/ \ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org NOT_FOR_ARCHS=sparc64 NOT_FOR_ARCHS_REASON=not supported on sparc64 COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS+= libexpat.so:textproc/expat2 .if ${COMPONENT} != clover .if ${PORT_OPTIONS:MPLATFORM_X11} USES+= xorg .endif .endif .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm .endif .if ${COMPONENT} != libs LIB_DEPENDS+= libglapi.so:graphics/mesa-libs .endif .if ${ARCH} == amd64 || ${ARCH} == i386 LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${OPSYS} == DragonFly LIB_DEPENDS+= libelf.so:devel/libelf .endif USES+= compiler:c++11-lib bison meson pathfix pkgconfig \ python:3.6+,build shebangfix tar:xz USE_LDCONFIG= yes .if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base # Also ld.bfd have problems that seems related to --as-needed USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin .endif # only have one port to check with portscout. .if ${PORTNAME} != mesa-dri PORTSCOUT= ignore:1 .endif python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \ src/util/xmlpool/gen_xmlpool.py \ src/mesa/main/get_*.py src/util/format_srgb.py \ src/amd/*/*.py src/intel/genxml/gen_pack_header.py MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri PATCHDIR= ${MASTERDIR}/files WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall INSTALL_TARGET= install-strip .include .if ${ARCH} == powerpc64 LLVM_DEFAULT= 90 .elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif BINARY_ALIAS+= python3=${PYTHON_VERSION} BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .if ${COMPONENT} != libs RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .endif MESON_ARGS+= --native-file="${WRKSRC}/llvm.ini" LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib MESON_ARGS+= -Dllvm=true -# we don't care about GLes v1 -MESON_ARGS+= -Dgles1=false - Index: head/graphics/mesa-libs/Makefile =================================================================== --- head/graphics/mesa-libs/Makefile (revision 548949) +++ head/graphics/mesa-libs/Makefile (revision 548950) @@ -1,82 +1,82 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients CONFLICTS_INSTALL= libglvnd # include/GL/gl.h OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS PLATFORM_X11_DESC= Enable X11 support for GBM/EGL PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL PLATFORM_DRM_DESC= Enable DRM support for GBM/EGL PLATFORM_SURFACELESS_DESC= Enable Surfaceless support for GBM/EGL PLATFORM_WAYLAND_IMPLIES= WAYLAND OPTIONS_DEFINE= WAYLAND OPTIONS_DEFAULT=WAYLAND PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS OPTIONS_SUB= yes WAYLAND_DESC= Enable support for the Wayland platform in EGL WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_IMPLIES= PLATFORM_WAYLAND .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" MESON_ARGS+= -Dgallium-drivers="" \ -Dgallium-vdpau=false \ -Dgallium-xvmc=false \ -Dgallium-omx=disabled \ -Dgallium-va=false \ -Dgallium-xa=false \ -Dgallium-nine=false \ -Dgallium-clover=disabled \ -Dosmesa=none \ -Dtools="" \ -Degl=true \ -Dgbm=true \ -Dvulkan-drivers="" # Building EGL and GBM requires a dri driver so add swrast MESON_ARGS+= -Ddri-drivers="swrast" .if ${PORT_OPTIONS:MPLATFORM_X11} MESA_PLATFORMS+= x11 USE_XORG+= xorgproto x11 xcb xdamage xext \ xfixes xshmfence xxf86vm xrandr PLIST_SUB+= GLX="" .else MESON_ARGS+= -Dglx=disabled PLIST_SUB+= GLX="@comment " .endif .if ${PORT_OPTIONS:MPLATFORM_WAYLAND} && ${PORT_OPTIONS:MWAYLAND} MESA_PLATFORMS+= wayland .endif .if ${PORT_OPTIONS:MPLATFORM_DRM} MESA_PLATFORMS+= drm .endif .if ${PORT_OPTIONS:MPLATFORM_SURFACELESS} MESA_PLATFORMS+= surfaceless .endif MESON_ARGS+= -Dplatforms="${MESA_PLATFORMS:ts,:tl}" .if ${ARCH} == "i386" # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set LDFLAGS+=-Wl,-z,notext .elif ${ARCH} == "powerpc" USE_GCC= yes .endif .include "${MASTERDIR}/Makefile.targets" .include Index: head/graphics/mesa-libs/pkg-plist =================================================================== --- head/graphics/mesa-libs/pkg-plist (revision 548949) +++ head/graphics/mesa-libs/pkg-plist (revision 548950) @@ -1,45 +1,53 @@ include/EGL/egl.h include/EGL/eglext.h include/EGL/eglextchromium.h include/EGL/eglmesaext.h include/EGL/eglplatform.h include/GL/gl.h include/GL/gl_mangle.h include/GL/glcorearb.h include/GL/glext.h %%GLX%%include/GL/glx.h %%GLX%%include/GL/glx_mangle.h %%GLX%%include/GL/glxext.h @comment include/GL/internal/dri_interface.h +include/GLES/egl.h +include/GLES/gl.h +include/GLES/glext.h +include/GLES/glplatform.h include/GLES2/gl2.h include/GLES2/gl2ext.h include/GLES2/gl2platform.h include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3ext.h include/GLES3/gl3platform.h include/KHR/khrplatform.h include/gbm.h @comment lib/dri/swrast_dri.so lib/libEGL.so lib/libEGL.so.1 lib/libEGL.so.1.0.0 %%GLX%%lib/libGL.so %%GLX%%lib/libGL.so.1 %%GLX%%lib/libGL.so.1.2.0 +lib/libGLESv1_CM.so +lib/libGLESv1_CM.so.1 +lib/libGLESv1_CM.so.1.1.0 lib/libGLESv2.so lib/libGLESv2.so.2 lib/libGLESv2.so.2.0.0 lib/libgbm.so lib/libgbm.so.1 lib/libgbm.so.1.0.0 lib/libglapi.so lib/libglapi.so.0 lib/libglapi.so.0.0.0 @comment libdata/pkgconfig/dri.pc libdata/pkgconfig/egl.pc libdata/pkgconfig/gbm.pc %%GLX%%libdata/pkgconfig/gl.pc +libdata/pkgconfig/glesv1_cm.pc libdata/pkgconfig/glesv2.pc @comment share/drirc.d/00-mesa-defaults.conf