diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 31803bee1cc4..ea251998768f 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,169 +1,172 @@ # $FreeBSD$ PORTNAME= mesa DISTVERSION= 21.0-branchpoint-2294 DISTVERSIONSUFFIX= -g05d0514a8fc CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 9f52b5177728.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+= cb8f7a253934.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3568 PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 9f99ac6e45eb.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512 PATCHFILES+= 167fa293d7b7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5464 PATCHFILES+= 19e001833ec1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7778 PATCHFILES+= 50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881 PATCHFILES+= 79a9c5e470c2.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8221 PATCHFILES+= 891152495cf7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9168 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) LICENSE= MIT ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le 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 MESON_ARGS= -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-xa=disabled \ -Dgallium-xvmc=disabled \ -Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \ ${BINARY_ALIAS:D--native-file=binary_alias.ini} \ ${NULL} 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= LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD -OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD +OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD +OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= DRI GALLIUM VULKAN OPTIONS_GROUP_DRI= i965 OPTIONS_GROUP_GALLIUM= iris r600 radeonsi OPTIONS_GROUP_VULKAN= anv radv OPTIONS_EXCLUDE_DragonFly= LIBUNWIND anv OPTIONS_EXCLUDE_i386= LTO # anv: vkcube fails on vkCreateSwapchainKHR OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLVM bug 47353 OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv i965 iris/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64: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_GROUP} MESON_ARGS+= -D${i:tl}-drivers=${${i}_DRIVERS:ts,} . for j in ${OPTIONS_GROUP_${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 (implies LLVM) radeonsi_DESC= Southern Islands and newer (implies LLVM) +VULKAN_DESC= Vulkan drivers +anv_DESC= Haswell and newer +radv_DESC= Southern Islands and newer (implies LLVM) + COINST_DESC= Allow co-installation with another Mesa port COINST_VARS= LLVM_DEFAULT=10 # chase mesa-dri 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>=1.3.2: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 (see implies) LLVM_LIB_DEPENDS= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/12/}.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 LTO_MESON_TRUE= b_lto VAAPI_DESC= Hardware encoding/decoding (only r600, radeonsi) VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va VDPAU_DESC= Hardware decoding (only r600, radeonsi) (implies X11) VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau VDPAU_IMPLIES= X11 -VULKAN_DESC= Vulkan layers: ${VULKAN_MESON_TRUE:S/vulkan-//:S/-layer//:ts,} -VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang -VULKAN_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer -anv_DESC= Haswell and newer -radv_DESC= Southern Islands and newer (implies LLVM) +VKLAYERS_DESC= Vulkan layers: ${VKLAYERS_MESON_TRUE:S/vulkan-//:S/-layer//:ts,} (implies ${VKLAYERS_IMPLIES}) +VKLAYERS_BUILD_DEPENDS= glslangValidator:graphics/glslang +VKLAYERS_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer +VKLAYERS_IMPLIES= ${"${PORT_OPTIONS:Mradv}":?radv:anv} # any from OPTIONS_GROUP_VULKAN WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland WAYLAND_VARS= PLATFORMS+=wayland X11_USES= xorg X11_USE= XORG=x11,xcb,xdamage,xext,xfixes,xorgproto,xrandr,xshmfence,xxf86vm X11_VARS= PLATFORMS+=x11 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 post-patch-COINST-on: @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample .include diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in index 559e58aa5895..97623e35bcab 100644 --- a/graphics/mesa-devel/files/libmap.conf.in +++ b/graphics/mesa-devel/files/libmap.conf.in @@ -1,25 +1,24 @@ %%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 %%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 %%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 diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index f4344b5fb10d..706f0fc9f3b5 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -1,82 +1,82 @@ -%%VULKAN%%bin/mesa-overlay-control.py +%%VKLAYERS%%bin/mesa-overlay-control.py %%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%%%%X11%%include/GL/glx.h %%NO_GLVND%%%%NO_COINST%%%%X11%%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 %%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 +%%VKLAYERS%%lib/libVkLayer_MESA_device_select.so +%%VKLAYERS%%lib/libVkLayer_MESA_overlay.so %%NO_COINST%%lib/libgbm%%SUFFIX%%.so lib/libgbm%%SUFFIX%%.so.1 lib/libgbm%%SUFFIX%%.so.1.0.0 %%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 %%NO_COINST%%libdata/pkgconfig/dri.pc %%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/egl.pc %%NO_COINST%%libdata/pkgconfig/gbm.pc %%NO_GLVND%%%%NO_COINST%%%%X11%%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 +%%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.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 +%%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json