diff --git a/graphics/drm_info/Makefile b/graphics/drm_info/Makefile index 6cf1191b576f..c543120bb16a 100644 --- a/graphics/drm_info/Makefile +++ b/graphics/drm_info/Makefile @@ -1,33 +1,37 @@ PORTNAME= drm_info DISTVERSIONPREFIX= v -DISTVERSION= 2.8.0 +DISTVERSION= 2.9.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Dump info about DRM devices WWW= https://gitlab.freedesktop.org/emersion/drm_info LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libjson-c.so:devel/json-c \ libdrm.so:graphics/libdrm USES= compiler:c11 meson pkgconfig USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= emersion PLIST_FILES= bin/${PORTNAME} -OPTIONS_DEFINE= MANPAGES PCI -OPTIONS_DEFAULT=MANPAGES PCI +OPTIONS_DEFINE= EDID MANPAGES PCI +OPTIONS_DEFAULT=EDID MANPAGES PCI + +EDID_DESC= Print EDID identification via libdisplay-info +EDID_LIB_DEPENDS= libdisplay-info.so:sysutils/libdisplay-info +EDID_MESON_ENABLED= libdisplay-info MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz PCI_DESC= Print PCI device names via libpci PCI_LIB_DEPENDS= libpci.so:devel/libpci PCI_MESON_ENABLED= libpci .include diff --git a/graphics/drm_info/distinfo b/graphics/drm_info/distinfo index 669eb55ffdb4..8fa5d13c34d0 100644 --- a/graphics/drm_info/distinfo +++ b/graphics/drm_info/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749473002 -SHA256 (drm_info-v2.8.0.tar.bz2) = 63b67be39c9b7b515b0b27b751fa1c6cc5707763a681d5797ad23914a2917634 -SIZE (drm_info-v2.8.0.tar.bz2) = 16998 +TIMESTAMP = 1763314559 +SHA256 (drm_info-v2.9.0.tar.bz2) = b684773e3ae48b9f9937b2078221fc4b46590c7c4130a55aa746918a03a0a1a2 +SIZE (drm_info-v2.9.0.tar.bz2) = 20575 diff --git a/graphics/drm_info/files/patch-libdrm-2.4.123 b/graphics/drm_info/files/patch-libdrm-2.4.123 index 1c3488aaa4da..9a2b1d298d0b 100644 --- a/graphics/drm_info/files/patch-libdrm-2.4.123 +++ b/graphics/drm_info/files/patch-libdrm-2.4.123 @@ -1,55 +1,55 @@ Drop after graphics/libdrm >= 2.4.125 update ---- meson.build.orig 2025-06-09 12:43:22 UTC +--- meson.build.orig 2025-11-16 17:35:59 UTC +++ meson.build -@@ -41,7 +41,7 @@ libdrm = dependency('libdrm', +@@ -45,7 +45,7 @@ libdrm = dependency( # # We need to make sure we don't use any new libdrm functions, but those # are added very infrequently, so this is unlikely to be an issue. -if libdrm.version().version_compare('<2.4.125') +if libdrm.version().version_compare('<2.4.123') if libdrm.type_name() == 'internal' error('libdrm subproject out of date. Run `meson subprojects update`.') endif -@@ -65,6 +65,11 @@ else - fourcc_h = meson.current_source_dir() / 'subprojects/libdrm/include/drm/drm_fourcc.h' - else +@@ -71,6 +71,11 @@ endif fourcc_h = libdrm.get_variable(pkgconfig: 'pc_sysrootdir') + libdrm.get_variable(pkgconfig: 'includedir') / 'libdrm/drm_fourcc.h' -+endif -+ + endif + +# DRM_FORMAT_MOD_VENDOR_MTK and its information is included in libdrm v2.4.125 +if libdrm.version().version_compare('>=2.4.125') + add_project_arguments('-DHAVE_MEDIATEK', language: 'c') - endif - - if libpci.found() ++endif ++ + # The DRM_BUS_FAUX bus and its information is included in libdrm v2.4.127 + if libdrm.version().version_compare('>=2.4.127') + add_project_arguments('-DHAVE_FAUX_BUS', language: 'c') --- modifiers.c.orig 2025-06-09 12:43:22 UTC +++ modifiers.c @@ -298,6 +298,7 @@ static void print_vivante_modifier(uint64_t mod) { printf(")"); } +#ifdef HAVE_MEDIATEK static const char *mediatek_tile_layout_str(uint64_t tile_layout) { switch (tile_layout) { case MTK_FMT_MOD_TILE_NONE: @@ -343,6 +344,7 @@ static void print_mediatek_modifier(uint64_t mod) { mediatek_compression_str(compression), mediatek_10bit_layout_str(layout_10bit)); } +#endif static uint8_t mod_vendor(uint64_t mod) { return (uint8_t)(mod >> 56); @@ -365,9 +367,11 @@ void print_modifier(uint64_t mod) { case DRM_FORMAT_MOD_VENDOR_VIVANTE: print_vivante_modifier(mod); break; +#ifdef HAVE_MEDIATEK case DRM_FORMAT_MOD_VENDOR_MTK: print_mediatek_modifier(mod); break; +#endif default: printf("%s", basic_modifier_str(mod)); }