diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 54f4bcfbc504..9f4c7e33cefd 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,91 +1,91 @@ # 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/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services PATCH_SITES= https://gitlab.freedesktop.org/manu/drm/-/commit/ PATCHFILES+= e41ca0a00f88ef8.patch:-p1 LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS= libpciaccess.so:devel/libpciaccess USES= gnome meson pkgconfig tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= MANPAGES TESTS OPTIONS_SUB= yes TESTS_DESC= Install test programs (which are always built) .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= MANPAGES .endif MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_TRUE= man-pages TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) CONFIGURE_ARGS+= -Dcairo-tests=false # Disable some targets known to not work on FreeBSD MESON_ARGS+= -Domap=false \ -Dexynos=false \ -Dfreedreno=false \ -Dfreedreno-kgsl=false \ -Dvc4=false \ -Detnaviv=false \ -Dnouveau=false .include .if ${ARCH} == amd64 || ${ARCH} == i386 MESON_ARGS+= -Dvmwgfx=true \ -Dintel=true .else MESON_ARGS+= -Dvmwgfx=false \ -Dintel=false .endif .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="" .elif ${ARCH:Mpowerpc*} PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH:Marm*} PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " PLIST_SUB+= VMWGFX_DRIVERS="@comment " .else PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " PLIST_SUB+= VMWGFX_DRIVERS="@comment " .endif .include 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,70 +1,71 @@ +%%TESTS%%bin/drmdevice %%TESTS%%bin/kms-steal-crtc %%TESTS%%bin/kms-universal-planes %%TESTS%%bin/kmstest %%TESTS%%bin/modeprint %%TESTS%%bin/modetest %%TESTS%%bin/proptest %%TESTS%%bin/vbltest %%RADEON_DRIVERS%%include/libdrm/amdgpu.h %%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h include/libdrm/drm.h include/libdrm/drm_fourcc.h include/libdrm/drm_mode.h include/libdrm/drm_sarea.h include/libdrm/i915_drm.h %%INTEL_DRIVER%%include/libdrm/intel_aub.h %%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h %%INTEL_DRIVER%%include/libdrm/intel_debug.h include/libdrm/mach64_drm.h include/libdrm/mga_drm.h include/libdrm/msm_drm.h include/libdrm/nouveau_drm.h include/libdrm/qxl_drm.h include/libdrm/r128_drm.h %%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h include/libdrm/radeon_drm.h %%RADEON_DRIVERS%%include/libdrm/radeon_surface.h include/libdrm/savage_drm.h include/libdrm/sis_drm.h include/libdrm/tegra_drm.h include/libdrm/vc4_drm.h include/libdrm/via_drm.h include/libdrm/virtgpu_drm.h %%VMWGFX_DRIVERS%%include/libdrm/vmwgfx_drm.h include/libkms/libkms.h include/libsync.h include/xf86drm.h include/xf86drmMode.h lib/libdrm.so lib/libdrm.so.2 lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1.0.0 %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 %%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 lib/libkms.so lib/libkms.so.1 lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc libdata/pkgconfig/libkms.pc %%MANPAGES%%man/man3/drmAvailable.3.gz %%MANPAGES%%man/man3/drmHandleEvent.3.gz %%MANPAGES%%man/man3/drmModeGetResources.3.gz %%MANPAGES%%man/man7/drm-kms.7.gz %%MANPAGES%%man/man7/drm-memory.7.gz %%MANPAGES%%man/man7/drm.7.gz %%RADEON_DRIVERS%%%%DATADIR%%/amdgpu.ids 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; -