Index: head/graphics/mesa-devel/Makefile =================================================================== --- head/graphics/mesa-devel/Makefile (revision 537573) +++ head/graphics/mesa-devel/Makefile (revision 537574) @@ -1,150 +1,150 @@ # $FreeBSD$ PORTNAME= mesa DISTVERSION= 20.1-branchpoint-1363 DISTVERSIONSUFFIX= -gfb62e642ae6 -PORTREVISION= 1 +PORTREVISION= 2 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=false \ -Dgallium-xvmc=false \ -Dplatforms=${PLATFORMS:ts,} \ ${PKGNAMESUFFIX:S/^/-Degl-lib-suffix=/} \ ${NULL} SUB_FILES= libmap.conf SUB_LIST= PKGNAMESUFFIX=${PKGNAMESUFFIX} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} PKGNAMESUFFIX=${PKGNAMESUFFIX} .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 VAAPI VDPAU WAYLAND X11 ZSTD OPTIONS_DEFAULT= ${OPTIONS_MULTI} 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_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 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 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-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) @${MV} ${WRKSRC}/src/egl/main/50_${PORTNAME}.json \ ${WRKSRC}/src/egl/main/50_${PKGBASE}.json @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf .endif post-install: .if defined(PKGNAMESUFFIX) @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample .endif .include Index: head/graphics/mesa-devel/files/patch-libdrm-2.4.99 =================================================================== --- head/graphics/mesa-devel/files/patch-libdrm-2.4.99 (revision 537573) +++ head/graphics/mesa-devel/files/patch-libdrm-2.4.99 (nonexistent) @@ -1,107 +0,0 @@ -Revert libdrm 2.4.100 dependencies: -https://gitlab.freedesktop.org/mesa/mesa/commit/9edcce2a32ed -https://gitlab.freedesktop.org/mesa/mesa/commit/f9fe86e02ada - ---- meson.build.orig 2020-05-30 21:28:01 UTC -+++ meson.build -@@ -1319,7 +1319,7 @@ dep_libdrm_radeon = null_dep - dep_libdrm_nouveau = null_dep - dep_libdrm_intel = null_dep - --_drm_amdgpu_ver = '2.4.100' -+_drm_amdgpu_ver = '2.4.99' - _drm_radeon_ver = '2.4.71' - _drm_nouveau_ver = '2.4.66' - _drm_intel_ver = '2.4.75' ---- src/amd/common/ac_gpu_info.c.orig 2020-05-30 21:28:01 UTC -+++ src/amd/common/ac_gpu_info.c -@@ -516,14 +516,9 @@ bool ac_query_gpu_info(int fd, void *dev_p, - } - if (info->chip_class >= GFX10) { - info->tcc_cache_line_size = 128; -- -- if (info->drm_minor >= 35) { -- info->tcc_harvested = device_info.tcc_disabled_mask != 0; -- } else { -- /* This is a hack, but it's all we can do without a kernel upgrade. */ -- info->tcc_harvested = -- (info->vram_size / info->num_tcc_blocks) != 512*1024*1024; -- } -+ /* This is a hack, but it's all we can do without a kernel upgrade. */ -+ info->tcc_harvested = -+ (info->vram_size / info->num_tcc_blocks) != 512*1024*1024; - } else { - info->tcc_cache_line_size = 64; - } ---- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c.orig 2020-05-30 21:28:01 UTC -+++ src/gallium/winsys/amdgpu/drm/amdgpu_cs.c -@@ -341,49 +341,32 @@ static enum pipe_reset_status - amdgpu_ctx_query_reset_status(struct radeon_winsys_ctx *rwctx) - { - struct amdgpu_ctx *ctx = (struct amdgpu_ctx*)rwctx; -+ uint32_t result, hangs; - int r; - - /* Return a failure due to a GPU hang. */ -- if (ctx->ws->info.drm_minor >= 24) { -- uint64_t flags; -+ r = amdgpu_cs_query_reset_state(ctx->ctx, &result, &hangs); -+ if (r) { -+ fprintf(stderr, "amdgpu: amdgpu_cs_query_reset_state failed. (%i)\n", r); -+ return PIPE_NO_RESET; -+ } - -- r = amdgpu_cs_query_reset_state2(ctx->ctx, &flags); -- if (r) { -- fprintf(stderr, "amdgpu: amdgpu_cs_query_reset_state failed. (%i)\n", r); -- return PIPE_NO_RESET; -+ switch (result) { -+ case AMDGPU_CTX_GUILTY_RESET: -+ return PIPE_GUILTY_CONTEXT_RESET; -+ case AMDGPU_CTX_INNOCENT_RESET: -+ return PIPE_INNOCENT_CONTEXT_RESET; -+ case AMDGPU_CTX_UNKNOWN_RESET: -+ return PIPE_UNKNOWN_CONTEXT_RESET; -+ case AMDGPU_CTX_NO_RESET: -+ default: -+ /* Return a failure due to a rejected command submission. */ -+ if (ctx->ws->num_total_rejected_cs > ctx->initial_num_total_rejected_cs) { -+ return ctx->num_rejected_cs ? PIPE_GUILTY_CONTEXT_RESET : -+ PIPE_INNOCENT_CONTEXT_RESET; - } -- -- if (flags & AMDGPU_CTX_QUERY2_FLAGS_RESET) { -- if (flags & AMDGPU_CTX_QUERY2_FLAGS_GUILTY) -- return PIPE_GUILTY_CONTEXT_RESET; -- else -- return PIPE_INNOCENT_CONTEXT_RESET; -- } -- } else { -- uint32_t result, hangs; -- -- r = amdgpu_cs_query_reset_state(ctx->ctx, &result, &hangs); -- if (r) { -- fprintf(stderr, "amdgpu: amdgpu_cs_query_reset_state failed. (%i)\n", r); -- return PIPE_NO_RESET; -- } -- -- switch (result) { -- case AMDGPU_CTX_GUILTY_RESET: -- return PIPE_GUILTY_CONTEXT_RESET; -- case AMDGPU_CTX_INNOCENT_RESET: -- return PIPE_INNOCENT_CONTEXT_RESET; -- case AMDGPU_CTX_UNKNOWN_RESET: -- return PIPE_UNKNOWN_CONTEXT_RESET; -- } -+ return PIPE_NO_RESET; - } -- -- /* Return a failure due to a rejected command submission. */ -- if (ctx->ws->num_total_rejected_cs > ctx->initial_num_total_rejected_cs) { -- return ctx->num_rejected_cs ? PIPE_GUILTY_CONTEXT_RESET : -- PIPE_INNOCENT_CONTEXT_RESET; -- } -- return PIPE_NO_RESET; - } - - /* COMMAND SUBMISSION */ Property changes on: head/graphics/mesa-devel/files/patch-libdrm-2.4.99 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property