Date: Wed, 12 May 2021 15:24:58 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 22fb29c5df0e - main - graphics/libdrm: update to 2.4.105 Message-ID: <202105121524.14CFOw1X096552@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=22fb29c5df0e7384ae4987efd38bb2e65547d1b6 commit 22fb29c5df0e7384ae4987efd38bb2e65547d1b6 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-04-07 14:09:24 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-05-12 15:21:31 +0000 graphics/libdrm: update to 2.4.105 Changes: https://lists.freedesktop.org/archives/dri-devel/2021-April/302515.html Tested by: Greg V (via DankBSD) Approved by: manu Differential Revision: https://reviews.freebsd.org/D29734 --- graphics/libdrm/Makefile | 2 +- graphics/libdrm/distinfo | 6 ++-- graphics/libdrm/pkg-plist | 1 + graphics/mesa-devel/files/patch-libdrm-2.4.104 | 50 -------------------------- 4 files changed, 5 insertions(+), 54 deletions(-) diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 54f4bcfbc504..9f4c7e33cefd 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,7 +1,7 @@ # Created by: lesi@FreeBSD.org PORTNAME= libdrm -PORTVERSION= 2.4.104 +PORTVERSION= 2.4.105 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= https://dri.freedesktop.org/libdrm/ diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 7d2429dce33f..9c90be31f564 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1610447995 -SHA256 (libdrm-2.4.104.tar.xz) = d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb -SIZE (libdrm-2.4.104.tar.xz) = 419372 +TIMESTAMP = 1617804564 +SHA256 (libdrm-2.4.105.tar.xz) = 1d1d024b7cadc63e2b59cddaca94f78864940ab440843841113fbac6afaf2a46 +SIZE (libdrm-2.4.105.tar.xz) = 420376 SHA256 (e41ca0a00f88ef8.patch) = ad3ae7b964f226c05ceb8e3628a084aa9f1631f552f8957aed57fa6298cb8a5f SIZE (e41ca0a00f88ef8.patch) = 789 diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 8452ec9feefa..a152ac735bda 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -1,3 +1,4 @@ +%%TESTS%%bin/drmdevice %%TESTS%%bin/kms-steal-crtc %%TESTS%%bin/kms-universal-planes %%TESTS%%bin/kmstest diff --git a/graphics/mesa-devel/files/patch-libdrm-2.4.104 b/graphics/mesa-devel/files/patch-libdrm-2.4.104 deleted file mode 100644 index 5ce23670cb1c..000000000000 --- a/graphics/mesa-devel/files/patch-libdrm-2.4.104 +++ /dev/null @@ -1,50 +0,0 @@ -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; -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105121524.14CFOw1X096552>