Date: Sat, 06 Jun 2026 00:14:17 +0000 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: 93c10861410c - main - graphics/drm_info: drop libdrm workaround after 993b7e19ec5b Message-ID: <6a236659.325a4.413aeb95@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=93c10861410c25cb149ac153fce6bea2037c668c commit 93c10861410c25cb149ac153fce6bea2037c668c Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2026-06-04 18:59:52 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2026-06-06 00:12:19 +0000 graphics/drm_info: drop libdrm workaround after 993b7e19ec5b --- graphics/drm_info/files/patch-libdrm-2.4.123 | 55 ---------------------------- 1 file changed, 55 deletions(-) diff --git a/graphics/drm_info/files/patch-libdrm-2.4.123 b/graphics/drm_info/files/patch-libdrm-2.4.123 deleted file mode 100644 index 9a2b1d298d0b..000000000000 --- a/graphics/drm_info/files/patch-libdrm-2.4.123 +++ /dev/null @@ -1,55 +0,0 @@ -Drop after graphics/libdrm >= 2.4.125 update - ---- meson.build.orig 2025-11-16 17:35:59 UTC -+++ meson.build -@@ -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 -@@ -71,6 +71,11 @@ endif - fourcc_h = libdrm.get_variable(pkgconfig: 'pc_sysrootdir') + libdrm.get_variable(pkgconfig: 'includedir') / 'libdrm/drm_fourcc.h' - 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 -+ - # 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)); - }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a236659.325a4.413aeb95>