diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index a41c345e4cc0..9b397d059d49 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,175 +1,175 @@ PORTNAME= mesa DISTVERSION= 23.0-branchpoint-1718 DISTVERSIONSUFFIX= -gadbe8b6c17a CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 700efacda59c.patch:-p1 -PATCHFILES+= 50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881 +PATCHFILES+= 3043f16d66bf.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881 PATCHFILES+= 4c7408374e3d.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21052 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan) WWW= https://www.mesa3d.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst 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 \ libOpenGL.so:graphics/libglvnd \ 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 cpe compiler:c++11-lib meson pkgconfig python:3.6+,build shebangfix CPE_VENDOR= mesa3d 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-xa=disabled \ -Dglvnd=true \ -Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \ ${NULL} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} OPTIONS_DEFINE= LIBUNWIND LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_DEFAULT= LIBUNWIND LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= GALLIUM VULKAN OPTIONS_GROUP_GALLIUM= crocus iris panfrost r600 radeonsi OPTIONS_GROUP_VULKAN= anv hasvk radv OPTIONS_EXCLUDE_DragonFly= LIBUNWIND anv hasvk OPTIONS_EXCLUDE_i386= LTO # anv: vkcube fails on vkCreateSwapchainKHR OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # https://github.com/llvm/llvm-project/issues/46697 OPTIONS_EXCLUDE+= ${ARCH:Naarch64:C/.+/panfrost/} OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv crocus hasvk iris/} OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/} OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:} OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:} 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/hasvk/intel_&/:S/radv/amd/} . endfor .endfor GALLIUM_DESC= Unified OpenGL drivers crocus_DESC= Broadwater, Eaglelake, Ironlake, Sandybridge, Ivybridge, Haswell iris_DESC= Broadwell and newer panfrost_DESC= Midgard, Bifrost r600_DESC= R600, R700, Evergreen, Northern Islands (implies LLVM) radeonsi_DESC= Southern Islands and newer (implies LLVM) VULKAN_DESC= Vulkan drivers anv_DESC= Skylake and newer hasvk_DESC= Ivy Bridge, Haswell, Broadwell radv_DESC= Southern Islands and newer (implies LLVM) radv_BUILD_DEPENDS= glslangValidator:graphics/glslang COINST_DESC= Allow co-installation with another Mesa port COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} COINST_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri # ICD COINST_PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} COINST_SUB_FILES= libmap.conf COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} COINST_PLIST_SUB_OFF= SUFFIX= 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_USES= llvm:min=11,lib LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} LLVM_MESON_ENABLED= llvm .for i in r600 radeonsi radv ${i}_IMPLIES+= LLVM .endfor LTO_MESON_TRUE= b_lto OPENCL_DESC= Heterogeneous computing via OpenCL (implies LLVM) OPENCL_BUILD_DEPENDS= bindgen:devel/rust-bindgen-cli \ libclc>0:devel/libclc \ spirv-tools>0:graphics/spirv-tools \ rustc:lang/${RUST_DEFAULT} OPENCL_LIB_DEPENDS= libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T} OPENCL_RUN_DEPENDS= libclc>0:devel/libclc OPENCL_CONFIGURE_ENV= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" OPENCL_MESON_FALSE= b_lundef # environ OPENCL_MESON_TRUE= gallium-rusticl OPENCL_MESON_ON= -Dgallium-opencl=icd OPENCL_MESON_OFF= -Dgallium-opencl=disabled OPENCL_VARS= LLVM_USES=llvm:15,lib # chase libclc + rust (LTO) .if ${MACHINE_ARCH} != aarch64 # XXX missing in ONLY_FOR_ARCHS OPENCL_VARS+= COINST_RUN_DEPENDS+=clover>0:lang/clover # ICD .endif OPENCL_IMPLIES= LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM VAAPI_DESC= Hardware encoding/decoding (only r600, radeonsi) VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va VAAPI_MESON_ON= -Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc VDPAU_DESC= Hardware decoding (only r600, radeonsi) (implies X11) VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau VDPAU_IMPLIES= X11 VKLAYERS_DESC= Vulkan layers: ${VKLAYERS_MESON_ON:C/.*=//} (implies ${VKLAYERS_IMPLIES}) VKLAYERS_BUILD_DEPENDS= glslangValidator:graphics/glslang VKLAYERS_MESON_ON= -Dvulkan-layers=device-select,overlay VKLAYERS_IMPLIES= ${"${PORT_OPTIONS:Manv}":?anv:radv} # 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 .include # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} LLVM_DEFAULT= 15 # chase mesa-dri .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/gallium/targets/opencl/MesaOpenCL.def.in \ ${WRKSRC}/src/gallium/targets/opencl/MesaOpenCL${PKGNAMESUFFIX}.def.in @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf @${MV} ${WRKSRC}/src/util/00-radv-defaults.conf \ ${WRKSRC}/src/util/00-radv${PKGNAMESUFFIX}-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/distinfo b/graphics/mesa-devel/distinfo index d2a6806f398f..6c5d557df431 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,9 +1,9 @@ TIMESTAMP = 1676678010 SHA256 (mesa3d-mesa-23.0-branchpoint-1718-gadbe8b6c17a_GH0.tar.gz) = cebec2eb63b1669c203f0c2a9da5fa652e93dd371013c32206bb701bd76b6763 SIZE (mesa3d-mesa-23.0-branchpoint-1718-gadbe8b6c17a_GH0.tar.gz) = 27900613 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 -SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 -SIZE (50433886a3e3.patch) = 2008 +SHA256 (3043f16d66bf.patch) = 7afdba18fc3041dc6e30bdb1409f5214e451e7e5ceaa3b21991d6b2f793d9c85 +SIZE (3043f16d66bf.patch) = 2050 SHA256 (4c7408374e3d.patch) = af40f013e152e2d0a22896ccf60f531b4c9616c651589d1f9eb1c4b01d334b2d SIZE (4c7408374e3d.patch) = 1433