diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index c7d1e2d11973..5c88336a941f 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,89 +1,89 @@ PORTNAME= libdrm -PORTVERSION= 2.4.133 +PORTVERSION= 2.4.134 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= https://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Direct Rendering Manager library and headers WWW= https://dri.freedesktop.org/ LICENSE= MIT BUILD_DEPENDS= rst2man:textproc/py-docutils LIB_DEPENDS= libpciaccess.so:devel/libpciaccess USES= gnome meson pkgconfig tar:xz USE_LDCONFIG= yes MESON_ARGS= -Dvalgrind=disabled OPTIONS_DEFINE= TESTS OPTIONS_SUB= yes TESTS_DESC= Build and install test programs TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) MESON_ARGS+= -Dcairo-tests=disabled # Disable some targets known to not work on FreeBSD MESON_ARGS+= -Domap=disabled \ -Dexynos=disabled \ -Dfreedreno=disabled \ -Dfreedreno-kgsl=false \ -Dvc4=disabled \ -Detnaviv=disabled \ -Dnouveau=disabled MESON_ARGS+= -Dman-pages=enabled .include .if ${ARCH} == amd64 || ${ARCH} == i386 MESON_ARGS+= -Dvmwgfx=enabled \ -Dintel=enabled .else MESON_ARGS+= -Dvmwgfx=disabled \ -Dintel=disabled .endif .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="" .elif ${ARCH:Mpowerpc*} PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == aarch64 PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH:Marm*} PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == riscv64 PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .else PLIST_SUB+= AMD_DRIVERS="@comment " PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_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 6ab29dfb92b5..67f6feaa0507 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1778781336 -SHA256 (libdrm-2.4.133.tar.xz) = fc68f9d0ba2ea63c9432a299e14fea09fad7a8a66e8039fcd7802ca59f77b4f5 -SIZE (libdrm-2.4.133.tar.xz) = 436912 +TIMESTAMP = 1785921718 +SHA256 (libdrm-2.4.134.tar.xz) = ac5e74d157830eb8bee44c6a6bf3ad49774ef0dd2a72bdad74a8f20308b52a95 +SIZE (libdrm-2.4.134.tar.xz) = 437244 diff --git a/graphics/libdrm/files/patch-libsync.h b/graphics/libdrm/files/patch-libsync.h index 986dc2cc53e6..d9b287d87d0d 100644 --- a/graphics/libdrm/files/patch-libsync.h +++ b/graphics/libdrm/files/patch-libsync.h @@ -1,14 +1,14 @@ # define ETIME as ETIMEOUT same as done in Mesa # ---- libsync.h.orig 2017-04-14 23:29:46 UTC +--- libsync.h.orig 2026-05-29 08:49:42 UTC +++ libsync.h @@ -35,6 +35,9 @@ #include - #include + #include #include +#ifndef ETIME +#define ETIME ETIMEDOUT +#endif #if defined(__cplusplus) extern "C" { diff --git a/graphics/libdrm/files/patch-symbols-check.py b/graphics/libdrm/files/patch-symbols-check.py new file mode 100644 index 000000000000..f41193fa68aa --- /dev/null +++ b/graphics/libdrm/files/patch-symbols-check.py @@ -0,0 +1,19 @@ +--- symbols-check.py.orig 2026-05-29 08:49:42 UTC ++++ symbols-check.py +@@ -11,6 +11,7 @@ PLATFORM_SYMBOLS = [ + '__bss_end__', + '__bss_start__', + '__bss_start', ++ '__cxa_finalize', + '__end__', + '_bss_end__', + '_edata', +@@ -36,7 +37,7 @@ def get_symbols(nm, lib): + if len(fields) == 2 or fields[1] == 'U': + continue + symbol_name = fields[0] +- if platform_name == 'Linux': ++ if platform_name == 'Linux' or platform_name == 'FreeBSD': + if symbol_name in PLATFORM_SYMBOLS: + continue + elif platform_name == 'Darwin': diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index c52ff14f5bda..a7de260aab13 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -1,64 +1,76 @@ %%TESTS%%bin/amdgpu_stress %%TESTS%%bin/drmdevice %%TESTS%%bin/modeprint %%TESTS%%bin/modetest %%TESTS%%bin/proptest +%%TESTS%%bin/tegra-gr2d-fill +%%TESTS%%bin/tegra-openclose +%%TESTS%%bin/tegra-syncpt-timeout +%%TESTS%%bin/tegra-syncpt-wait +%%TESTS%%bin/tegra-vic-blit +%%TESTS%%bin/tegra-vic-clear +%%TESTS%%bin/tegra-vic-flip %%TESTS%%bin/vbltest %%AMD_DRIVERS%%include/libdrm/amdgpu.h %%AMD_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.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/libsync.h include/xf86drm.h include/xf86drmMode.h lib/libdrm.so lib/libdrm.so.2 -lib/libdrm.so.2.133.0 +lib/libdrm.so.2.134.0 %%AMD_DRIVERS%%lib/libdrm_amdgpu.so %%AMD_DRIVERS%%lib/libdrm_amdgpu.so.1 -%%AMD_DRIVERS%%lib/libdrm_amdgpu.so.1.133.0 +%%AMD_DRIVERS%%lib/libdrm_amdgpu.so.1.134.0 %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 -%%INTEL_DRIVER%%lib/libdrm_intel.so.1.133.0 +%%INTEL_DRIVER%%lib/libdrm_intel.so.1.134.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 -%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.133.0 +%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.134.0 +lib/libdrm_tegra.so +lib/libdrm_tegra.so.0 +lib/libdrm_tegra.so.0.134.0 libdata/pkgconfig/libdrm.pc %%AMD_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc +libdata/pkgconfig/libdrm_tegra.pc +%%DATADIR%%/amdgpu.ids share/man/man3/drmAvailable.3.gz share/man/man3/drmHandleEvent.3.gz share/man/man3/drmModeGetResources.3.gz share/man/man7/drm-kms.7.gz share/man/man7/drm-memory.7.gz share/man/man7/drm.7.gz -%%AMD_DRIVERS%%%%DATADIR%%/amdgpu.ids