diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 406a28131a81..c7174bdf7870 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,157 +1,157 @@ PORTNAME= mesa -DISTVERSION= 22.0-branchpoint-599 -DISTVERSIONSUFFIX= -ga814a4f9dba +DISTVERSION= 22.0-branchpoint-752 +DISTVERSIONSUFFIX= -gb4bef890ee4 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 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) 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-opencl=disabled \ -Dgallium-xa=disabled \ -Dgallium-xvmc=disabled \ -Dglvnd=true \ -Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \ ${BINARY_ALIAS:D--native-file=binary_alias.ini} \ ${NULL} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= GALLIUM VULKAN OPTIONS_GROUP_GALLIUM= crocus 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:} # https://github.com/llvm/llvm-project/issues/46697 OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv crocus 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/radv/amd/} . endfor .endfor GALLIUM_DESC= Unified OpenGL drivers crocus_DESC= Broadwater, Eaglelake, Ironlake, Sandybridge, Ivybridge, Haswell 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_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= 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/14git/}.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 .include # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} LLVM_DEFAULT= 13 # bump if not latest release .endif 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 237ce0cf644b..a420af09feb7 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1645283815 -SHA256 (mesa3d-mesa-22.0-branchpoint-599-ga814a4f9dba_GH0.tar.gz) = d5980da0a157f873da0e26503200f6399720e2efbde8f626896747c3a6a733a2 -SIZE (mesa3d-mesa-22.0-branchpoint-599-ga814a4f9dba_GH0.tar.gz) = 23590174 +TIMESTAMP = 1645651522 +SHA256 (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = b2c8da58866ae27270a27607cff8745a60f93d067ed29eeccdeda8a02d16b2c1 +SIZE (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = 23598120 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 SIZE (50433886a3e3.patch) = 2008 diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.109 b/graphics/mesa-devel/files/patch-libdrm-2.4.109 new file mode 100644 index 000000000000..6d15483322a9 --- /dev/null +++ b/graphics/mesa-devel/files/patch-libdrm-2.4.109 @@ -0,0 +1,89 @@ +Disable https://gitlab.freedesktop.org/mesa/mesa/-/commit/5cf4f0cc9197 +until graphics/libdrm is updated to 2.4.110 or later. + +meson.build:1597:4: ERROR: Invalid version of dependency, need 'libdrm_amdgpu' ['>=2.4.110'] found '2.4.109'. + +../src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c:1603:11: error: implicit declaration of function 'amdgpu_cs_ctx_stable_pstate' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + return amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_SET_STABLE_PSTATE, amdgpu_pstate, NULL); + ^ + +--- meson.build.orig 2022-02-23 18:31:55 UTC ++++ meson.build +@@ -1567,7 +1567,7 @@ dep_libdrm_radeon = null_dep + dep_libdrm_nouveau = null_dep + dep_libdrm_intel = null_dep + +-_drm_amdgpu_ver = '2.4.110' ++_drm_amdgpu_ver = '2.4.109' + _drm_radeon_ver = '2.4.71' + _drm_nouveau_ver = '2.4.102' + _drm_intel_ver = '2.4.75' +--- src/amd/vulkan/radv_radeon_winsys.h.orig 2022-02-23 18:31:55 UTC ++++ src/amd/vulkan/radv_radeon_winsys.h +@@ -258,7 +258,9 @@ struct radeon_winsys { + + bool (*ctx_wait_idle)(struct radeon_winsys_ctx *ctx, enum ring_type ring_type, int ring_index); + ++#if 0 + int (*ctx_set_pstate)(struct radeon_winsys_ctx *ctx, uint32_t pstate); ++#endif + + enum radeon_bo_domain (*cs_domain)(const struct radeon_winsys *ws); + +--- src/amd/vulkan/radv_sqtt.c.orig 2022-02-23 18:31:55 UTC ++++ src/amd/vulkan/radv_sqtt.c +@@ -429,6 +429,7 @@ radv_thread_trace_finish_bo(struct radv_device *device + } + } + ++#if 0 + static int + radv_thread_trace_init_pstate(struct radv_device *device) + { +@@ -448,6 +449,7 @@ radv_thread_trace_init_pstate(struct radv_device *devi + + return true; + } ++#endif + + bool + radv_thread_trace_init(struct radv_device *device) +@@ -466,8 +468,10 @@ radv_thread_trace_init(struct radv_device *device) + if (!radv_thread_trace_init_bo(device)) + return false; + ++#if 0 + if (!radv_thread_trace_init_pstate(device)) + return false; ++#endif + + list_inithead(&thread_trace_data->rgp_pso_correlation.record); + simple_mtx_init(&thread_trace_data->rgp_pso_correlation.lock, mtx_plain); +--- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c.orig 2022-02-23 18:31:55 UTC ++++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +@@ -1576,6 +1576,7 @@ radv_amdgpu_ctx_wait_idle(struct radeon_winsys_ctx *rw + return true; + } + ++#if 0 + static uint32_t + radv_to_amdgpu_pstate(enum radeon_ctx_pstate radv_pstate) + { +@@ -1602,6 +1603,7 @@ radv_amdgpu_ctx_set_pstate(struct radeon_winsys_ctx *r + uint32_t amdgpu_pstate = radv_to_amdgpu_pstate(pstate); + return amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_SET_STABLE_PSTATE, amdgpu_pstate, NULL); + } ++#endif + + static void * + radv_amdgpu_cs_alloc_syncobj_chunk(struct radv_winsys_sem_counts *counts, uint32_t queue_syncobj, +@@ -1830,7 +1832,9 @@ radv_amdgpu_cs_init_functions(struct radv_amdgpu_winsy + ws->base.ctx_create = radv_amdgpu_ctx_create; + ws->base.ctx_destroy = radv_amdgpu_ctx_destroy; + ws->base.ctx_wait_idle = radv_amdgpu_ctx_wait_idle; ++#if 0 + ws->base.ctx_set_pstate = radv_amdgpu_ctx_set_pstate; ++#endif + ws->base.cs_domain = radv_amdgpu_cs_domain; + ws->base.cs_create = radv_amdgpu_cs_create; + ws->base.cs_destroy = radv_amdgpu_cs_destroy; diff --git a/graphics/mesa-devel/files/patch-no-inotify b/graphics/mesa-devel/files/patch-no-inotify deleted file mode 100644 index 0cc54a4db514..000000000000 --- a/graphics/mesa-devel/files/patch-no-inotify +++ /dev/null @@ -1,44 +0,0 @@ -Regressed by https://gitlab.freedesktop.org/mesa/mesa/-/commit/c50557d9612a - -../src/amd/vulkan/radv_device.c:39:10: fatal error: 'sys/inotify.h' file not found -#include - ^~~~~~~~~~~~~~~ - ---- src/amd/vulkan/radv_device.c.orig 2022-02-18 15:04:48 UTC -+++ src/amd/vulkan/radv_device.c -@@ -35,7 +35,7 @@ - #include - #endif - --#ifndef _WIN32 -+#ifdef __linux__ - #include - #endif - -@@ -2974,7 +2974,7 @@ radv_parse_force_vrs_config_file(const char *config_fi - return force_vrs; - } - --#ifndef _WIN32 -+#ifdef __linux__ - - #define BUF_LEN ((10 * (sizeof(struct inotify_event) + NAME_MAX + 1))) - -@@ -3020,7 +3020,7 @@ radv_notifier_thread_run(void *data) - static int - radv_device_init_notifier(struct radv_device *device) - { --#ifdef _WIN32 -+#ifndef __linux__ - return true; - #else - struct radv_notifier *notifier = &device->notifier; -@@ -3053,7 +3053,7 @@ fail_watch: - static void - radv_device_finish_notifier(struct radv_device *device) - { --#ifndef _WIN32 -+#ifdef __linux__ - struct radv_notifier *notifier = &device->notifier; - - if (!notifier->thread)