diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 737dad87bd5e..324759a4e625 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,170 +1,170 @@ PORTNAME= mesa -DISTVERSION= 21.0-branchpoint-4390 -DISTVERSIONSUFFIX= -g51a812bb601 +DISTVERSION= 21.1-branchpoint-21 +DISTVERSIONSUFFIX= -g9b71154353d CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ 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 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/13git/}.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 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: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/distinfo b/graphics/mesa-devel/distinfo index 9a0574e3db72..14356a8836cc 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,23 +1,23 @@ -TIMESTAMP = 1618011926 -SHA256 (mesa3d-mesa-21.0-branchpoint-4390-g51a812bb601_GH0.tar.gz) = 0f2404e6dcf04208314ca42f1be48f7976ad7701729d7c44fd5f1ef8c35c613b -SIZE (mesa3d-mesa-21.0-branchpoint-4390-g51a812bb601_GH0.tar.gz) = 23300379 +TIMESTAMP = 1618435090 +SHA256 (mesa3d-mesa-21.1-branchpoint-21-g9b71154353d_GH0.tar.gz) = 91986a64beef2893d7856dd0e74b9dc7fa89a4bd6115d734df9841fc7bddde43 +SIZE (mesa3d-mesa-21.1-branchpoint-21-g9b71154353d_GH0.tar.gz) = 23357921 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109 SIZE (55822330540d.patch) = 1278 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b SIZE (f6c7569ad9ea.patch) = 1653 SHA256 (cb8f7a253934.patch) = 9e914ac8325ce15ab0cc38610e72b683f958114c57402d3a948c7533fce65393 SIZE (cb8f7a253934.patch) = 3512 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (9f99ac6e45eb.patch) = 2fdcb9e37fbb4d99b128e3da8e0096fde338783944877988311d6c11be4c88c6 SIZE (9f99ac6e45eb.patch) = 41217 SHA256 (167fa293d7b7.patch) = cc3ad8e59d5d4d7380917e715f676abba65549b07e377dbf6fcec5c294915360 SIZE (167fa293d7b7.patch) = 2496 SHA256 (19e001833ec1.patch) = 5ac28692c61dc3dcc5f7e74a8053d63365fc28fb28136ddb11791990a414f762 SIZE (19e001833ec1.patch) = 4057 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 SIZE (50433886a3e3.patch) = 2008 SHA256 (79a9c5e470c2.patch) = d6f5e0378d16864e21399c4e0b9192ea2de540ef1421e672b62c5e1c69252cab SIZE (79a9c5e470c2.patch) = 866 SHA256 (891152495cf7.patch) = e120e26688c1bfca76f4cb711814d1483693cbc66fcb130c88f98a8bf142f826 SIZE (891152495cf7.patch) = 1258 diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.104 b/graphics/mesa-devel/files/patch-libdrm-2.4.104 new file mode 100644 index 000000000000..5ce23670cb1c --- /dev/null +++ b/graphics/mesa-devel/files/patch-libdrm-2.4.104 @@ -0,0 +1,50 @@ +Until https://reviews.freebsd.org/D29734 lands revert +https://gitlab.freedesktop.org/mesa/mesa/-/commit/2c1e4c4baa81 +https://gitlab.freedesktop.org/mesa/mesa/-/commit/75a725e4c555 + +meson.build:1480:4: ERROR: Invalid version of dependency, need 'libdrm_amdgpu' ['>=2.4.105'] found '2.4.104'. + +../src/amd/common/ac_gpu_info.c:528:11: error: implicit declaration of function 'amdgpu_query_video_caps_info' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, + ^ +../src/amd/common/ac_gpu_info.c:528:11: note: did you mean 'amdgpu_query_heap_info'? +/usr/local/include/libdrm/amdgpu.h:1141:5: note: 'amdgpu_query_heap_info' declared here +int amdgpu_query_heap_info(amdgpu_device_handle dev, uint32_t heap, + ^ + +--- meson.build.orig 2021-04-14 06:35:30 UTC ++++ meson.build +@@ -1452,7 +1452,7 @@ dep_libdrm_radeon = null_dep + dep_libdrm_nouveau = null_dep + dep_libdrm_intel = null_dep + +-_drm_amdgpu_ver = '2.4.105' ++_drm_amdgpu_ver = '2.4.100' + _drm_radeon_ver = '2.4.71' + _drm_nouveau_ver = '2.4.102' + _drm_intel_ver = '2.4.75' +--- src/amd/common/ac_gpu_info.c.orig 2021-04-14 06:35:30 UTC ++++ src/amd/common/ac_gpu_info.c +@@ -524,22 +524,6 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct rad + info->gart_size_kb = DIV_ROUND_UP(info->gart_size, 1024); + info->vram_size_kb = DIV_ROUND_UP(info->vram_size, 1024); + +- if (info->drm_minor >= 41) { +- r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, +- sizeof(info->dec_caps), &(info->dec_caps)); +- if (r) { +- fprintf(stderr, "amdgpu: amdgpu_query_video_caps_info for decode failed.\n"); +- return r; +- } +- +- r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE, +- sizeof(info->enc_caps), &(info->enc_caps)); +- if (r) { +- fprintf(stderr, "amdgpu: amdgpu_query_video_caps_info for encode failed.\n"); +- return r; +- } +- } +- + /* Add some margin of error, though this shouldn't be needed in theory. */ + info->all_vram_visible = info->vram_size * 0.9 < info->vram_vis_size; +