Index: head/graphics/mesa-devel/Makefile =================================================================== --- head/graphics/mesa-devel/Makefile (revision 538570) +++ head/graphics/mesa-devel/Makefile (revision 538571) @@ -1,163 +1,173 @@ # $FreeBSD$ PORTNAME= mesa DISTVERSION= 20.1-branchpoint-1696 DISTVERSIONSUFFIX= -g67ad75a282d CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= ee5c7790fa93.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= 9f52b5177728.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= cefdea8105bf.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= 55822330540d.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= f6c7569ad9ea.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= c7a2ab64144b.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= f3b7aba7ed39.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= 23df7d9971dd.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598 PATCHFILES+= ec60ac47860a.patch:-p1 PATCHFILES+= 807ae077ab19.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3568 PATCHFILES+= 1b10b42fe65e.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1619 PATCHFILES+= 9291544ca0bd.patch:-p1 PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 227ebbd9e837.patch:-p1 PATCHFILES+= de60a36d5836.patch:-p1 PATCHFILES+= 614e5280165b.patch:-p1 PATCHFILES+= 15057d74fdb9.patch:-p1 PATCHFILES+= 4902067868ea.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) LICENSE= MIT ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= Limited scope: no old drivers and no software rendering. \ See also https://mesamatrix.net/ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS= libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 .if !exists(/usr/lib/libelf.so) # DragonFly doesn't install it yet LIB_DEPENDS+= libelf.so:devel/libelf .endif USES= bison compiler:c++11-lib meson pkgconfig python:3.6+,build shebangfix USE_GITHUB= yes GH_ACCOUNT= mesa3d USE_LDCONFIG= yes BINARY_ALIAS= python=${PYTHON_CMD} SHEBANG_FILES= src/vulkan/overlay-layer/${PORTNAME}-overlay-control.py PLATFORMS= ${PORT_OPTIONS:MX11:tl} ${PORT_OPTIONS:MWAYLAND:tl} drm surfaceless MESON_ARGS= -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-xa=disabled \ -Dgallium-xvmc=disabled \ -Dplatforms=${PLATFORMS:ts,} \ - ${PKGNAMESUFFIX:S/^/-Degl-lib-suffix=/} \ ${BINARY_ALIAS:D--native-file=binary_alias.ini} \ ${NULL} -SUB_FILES= libmap.conf -SUB_LIST= SUFFIX=${PKGNAMESUFFIX} -PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} SUFFIX=${PKGNAMESUFFIX} +PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base LDFLAGS+= -fuse-ld=lld .endif -OPTIONS_DEFINE= ${OPTIONS_MULTI} LIBUNWIND LLVM NLS VAAPI VDPAU WAYLAND X11 ZSTD -OPTIONS_DEFAULT= ${OPTIONS_MULTI} LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD +OPTIONS_DEFINE= ${OPTIONS_MULTI} GLVND LIBUNWIND LLVM NLS VAAPI VDPAU WAYLAND X11 ZSTD +OPTIONS_DEFAULT= ${OPTIONS_MULTI} GLVND LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD OPTIONS_MULTI= DRI GALLIUM VULKAN OPTIONS_MULTI_DRI= i965 OPTIONS_MULTI_GALLIUM= iris r600 radeonsi OPTIONS_MULTI_VULKAN= anv radv OPTIONS_EXCLUDE_DragonFly= LIBUNWIND anv OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:C/.+/anv i965 iris/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:C/.+/LIBUNWIND/} +OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:} +OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"!=libglvnd:?GLVND:} +OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} +OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"==libglvnd:?GLVND:} OPTIONS_SUB= yes # Convert options to -D-drivers= .for i in ${OPTIONS_MULTI} MESON_ARGS+= -D${i:tl}-drivers=${${i}_DRIVERS:ts,} . for j in ${OPTIONS_MULTI_${i}} OPTIONS_DEFAULT+= ${j} ${j}_VARS+= ${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/} . endfor .endfor DRI_DESC= Classic OpenGL drivers i965_DESC= GMA 3000 (Gen4) and newer GALLIUM_DESC= Unified OpenGL drivers iris_DESC= Broadwell and newer r600_DESC= R600, R700, Evergreen, Northern Islands radeonsi_DESC= Southern Islands and newer +COINST_DESC= Allow co-installation with another Mesa port +COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} +COINST_PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} +COINST_SUB_FILES= libmap.conf +COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} +COINST_PLIST_SUB_OFF= SUFFIX= + +GLVND_DESC= GL Vendor-Neutral Dispatch support +GLVND_BUILD_DEPENDS= libglvnd>0:graphics/libglvnd +GLVND_MESON_TRUE= glvnd + LIBUNWIND_DESC= Use libunwind for stacktraces LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_MESON_ENABLED= libunwind LLVM_DESC= Build with LLVM support LLVM_LIB_DEPENDS= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/11/}.so:devel/llvm${LLVM_DEFAULT} LLVM_MESON_ENABLED= llvm LLVM_BINARY_ALIAS= llvm-config=llvm-config${LLVM_DEFAULT} .for i in r600 radeonsi radv ${i}_IMPLIES+= LLVM .endfor NLS_USES= gettext-tools VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau VULKAN_DESC= Vulkan drivers and layers VULKAN_BUILD_DEPENDS= glslangValidator:devel/glslang VULKAN_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer anv_DESC= Haswell and newer radv_DESC= Southern Islands and newer WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland X11_USES= xorg X11_USE= XORG=x11,xcb,xdamage,xext,xfixes,xorgproto,xrandr,xshmfence,xxf86vm X11_MESON_OFF= -Dglx=disabled ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd post-extract: # Work around Meson lookup order e.g., llvm-config .if defined(BINARY_ALIAS) @${ECHO_CMD} '[binaries]' >${WRKSRC}/binary_alias.ini @for f in ${BINARY_ALIAS}; do \ ${ECHO_CMD} "$${f%%=*} = '$${f#*=}'"; \ done >>${WRKSRC}/binary_alias.ini .endif post-patch: # Extract (snapshot) version from the port instead of empty string @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ ${WRKSRC}/bin/git_sha1_gen.py -.if defined(PKGNAMESUFFIX) + +post-patch-COINST-on: @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf -.endif pre-build-NLS-on: # Meson doesn't automatically generate translations @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC} xmlpool-gmo -post-install: -.if defined(PKGNAMESUFFIX) +post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample -.endif .include Index: head/graphics/mesa-devel/files/libmap.conf.in =================================================================== --- head/graphics/mesa-devel/files/libmap.conf.in (revision 538570) +++ head/graphics/mesa-devel/files/libmap.conf.in (revision 538571) @@ -1,25 +1,25 @@ -# EGL/GLX built with -Dglvnd=false -libEGL.so.1 libEGL%%SUFFIX%%.so.1 -%%X11%%libGL.so.1 libGL%%SUFFIX%%.so.1 -libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1 -libGLESv2.so.2 libGLESv2%%SUFFIX%%.so.2 +%%NO_GLVND%%# EGL/GLX built with -Dglvnd=false +%%NO_GLVND%%libEGL.so.1 libEGL%%SUFFIX%%.so.1 +%%NO_GLVND%%%%X11%%libGL.so.1 libGL%%SUFFIX%%.so.1 +%%NO_GLVND%%libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1 +%%NO_GLVND%%libGLESv2.so.2 libGLESv2%%SUFFIX%%.so.2 -# EGL/GLX built with -Dglvnd=true -# Xorg sets GLX_EXT_libglvnd to "mesa" by default -libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0 -%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0 +%%GLVND%%# EGL/GLX built with -Dglvnd=true +%%GLVND%%# Xorg sets GLX_EXT_libglvnd to "mesa" by default +%%GLVND%%libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0 +%%GLVND%%%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0 -%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist -%%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0 +%%GLVND%%%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist +%%GLVND%%%%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0 # GBM clients like eglkms and wlroots fail otherwise libgbm.so.1 libgbm%%SUFFIX%%.so.1 %%VULKAN%%# Avoid different versions of the same driver showing up as multiple GPUs %%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so %%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so %%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/r600_drv_video.so %%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/radeonsi_drv_video.so %%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1 %%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1 Index: head/graphics/mesa-devel/pkg-plist =================================================================== --- head/graphics/mesa-devel/pkg-plist (revision 538570) +++ head/graphics/mesa-devel/pkg-plist (revision 538571) @@ -1,75 +1,82 @@ %%VULKAN%%bin/mesa-overlay-control.py -@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample -@comment include/EGL/egl.h -@comment include/EGL/eglext.h -@comment include/EGL/eglextchromium.h -@comment include/EGL/eglmesaext.h -@comment include/EGL/eglplatform.h -@comment include/GL/gl.h -@comment include/GL/glcorearb.h -@comment include/GL/glext.h -@comment include/GL/glx.h -@comment include/GL/glxext.h -@comment include/GL/internal/dri_interface.h -@comment include/GLES/egl.h -@comment include/GLES/gl.h -@comment include/GLES/glext.h -@comment include/GLES/glplatform.h -@comment include/GLES2/gl2.h -@comment include/GLES2/gl2ext.h -@comment include/GLES2/gl2platform.h -@comment include/GLES3/gl3.h -@comment include/GLES3/gl31.h -@comment include/GLES3/gl32.h -@comment include/GLES3/gl3ext.h -@comment include/GLES3/gl3platform.h -@comment include/KHR/khrplatform.h -@comment include/gbm.h -%%anv%%@comment include/vulkan/vulkan_intel.h +%%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample +%%NO_GLVND%%%%NO_COINST%%include/EGL/egl.h +%%NO_GLVND%%%%NO_COINST%%include/EGL/eglext.h +%%NO_COINST%%include/EGL/eglextchromium.h +%%NO_COINST%%include/EGL/eglmesaext.h +%%NO_GLVND%%%%NO_COINST%%include/EGL/eglplatform.h +%%NO_GLVND%%%%NO_COINST%%include/GL/gl.h +%%NO_GLVND%%%%NO_COINST%%include/GL/glcorearb.h +%%NO_GLVND%%%%NO_COINST%%include/GL/glext.h +%%NO_GLVND%%%%NO_COINST%%include/GL/glx.h +%%NO_GLVND%%%%NO_COINST%%include/GL/glxext.h +%%NO_COINST%%include/GL/internal/dri_interface.h +%%NO_GLVND%%%%NO_COINST%%include/GLES/egl.h +%%NO_GLVND%%%%NO_COINST%%include/GLES/gl.h +%%NO_GLVND%%%%NO_COINST%%include/GLES/glext.h +%%NO_GLVND%%%%NO_COINST%%include/GLES/glplatform.h +%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2.h +%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2ext.h +%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2platform.h +%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3.h +%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl31.h +%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl32.h +%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3ext.h +%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3platform.h +%%NO_GLVND%%%%NO_COINST%%include/KHR/khrplatform.h +%%NO_COINST%%include/gbm.h +%%anv%%%%NO_COINST%%include/vulkan/vulkan_intel.h %%i965%%lib/dri%%SUFFIX%%/i965_dri.so %%iris%%lib/dri%%SUFFIX%%/iris_dri.so %%r600%%lib/dri%%SUFFIX%%/r600_dri.so %%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_dri.so %%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so %%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so -@comment lib/libEGL%%SUFFIX%%.so -lib/libEGL%%SUFFIX%%.so.1 -lib/libEGL%%SUFFIX%%.so.1.0.0 -%%X11%%@comment lib/libGL%%SUFFIX%%.so -%%X11%%lib/libGL%%SUFFIX%%.so.1 -%%X11%%lib/libGL%%SUFFIX%%.so.1.2.0 -@comment lib/libGLESv1_CM%%SUFFIX%%.so -lib/libGLESv1_CM%%SUFFIX%%.so.1 -lib/libGLESv1_CM%%SUFFIX%%.so.1.1.0 -@comment lib/libGLESv2%%SUFFIX%%.so -lib/libGLESv2%%SUFFIX%%.so.2 -lib/libGLESv2%%SUFFIX%%.so.2.0.0 +%%NO_GLVND%%%%NO_COINST%%lib/libEGL%%SUFFIX%%.so +%%NO_GLVND%%lib/libEGL%%SUFFIX%%.so.1 +%%NO_GLVND%%lib/libEGL%%SUFFIX%%.so.1.0.0 +%%GLVND%%%%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so +%%GLVND%%lib/libEGL_mesa%%SUFFIX%%.so.0 +%%GLVND%%lib/libEGL_mesa%%SUFFIX%%.so.0.0.0 +%%NO_GLVND%%%%X11%%%%NO_COINST%%lib/libGL%%SUFFIX%%.so +%%NO_GLVND%%%%X11%%lib/libGL%%SUFFIX%%.so.1 +%%NO_GLVND%%%%X11%%lib/libGL%%SUFFIX%%.so.1.2.0 +%%NO_GLVND%%%%NO_COINST%%lib/libGLESv1_CM%%SUFFIX%%.so +%%NO_GLVND%%lib/libGLESv1_CM%%SUFFIX%%.so.1 +%%NO_GLVND%%lib/libGLESv1_CM%%SUFFIX%%.so.1.1.0 +%%NO_GLVND%%%%NO_COINST%%lib/libGLESv2%%SUFFIX%%.so +%%NO_GLVND%%lib/libGLESv2%%SUFFIX%%.so.2 +%%NO_GLVND%%lib/libGLESv2%%SUFFIX%%.so.2.0.0 +%%GLVND%%%%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so +%%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0 +%%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0 %%VULKAN%%lib/libVkLayer_MESA_device_select.so %%VULKAN%%lib/libVkLayer_MESA_overlay.so -@comment lib/libgbm%%SUFFIX%%.so +%%NO_COINST%%lib/libgbm%%SUFFIX%%.so lib/libgbm%%SUFFIX%%.so.1 lib/libgbm%%SUFFIX%%.so.1.0.0 -@comment lib/libglapi%%SUFFIX%%.so +%%NO_COINST%%lib/libglapi%%SUFFIX%%.so lib/libglapi%%SUFFIX%%.so.0 lib/libglapi%%SUFFIX%%.so.0.0.0 %%anv%%lib/libvulkan_intel%%SUFFIX%%.so %%radv%%lib/libvulkan_radeon%%SUFFIX%%.so %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1 %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0 %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0.0 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0.0 -@comment libdata/pkgconfig/dri.pc -@comment libdata/pkgconfig/egl.pc -@comment libdata/pkgconfig/gbm.pc -@comment libdata/pkgconfig/gl.pc -@comment libdata/pkgconfig/glesv1_cm.pc -@comment libdata/pkgconfig/glesv2.pc +%%NO_COINST%%libdata/pkgconfig/dri.pc +%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/egl.pc +%%NO_COINST%%libdata/pkgconfig/gbm.pc +%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/gl.pc +%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv1_cm.pc +%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv2.pc share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf +%%GLVND%%%%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json %%VULKAN%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json -%%anv%%@comment share/vulkan/icd.d/intel_icd.%%ARCH%%.json -%%radv%%@comment share/vulkan/icd.d/radeon_icd.%%ARCH%%.json +%%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json +%%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json %%VULKAN%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json