From a67a66508efe8fbc98d39e2c0013c281c818a388 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 21 Aug 2025 10:01:13 +0200 Subject: [PATCH] subprojects: Remove libdisplay-info wrap file When building as subproject, this will include libdisplay-info tests when running `meson test` and they incorrectly detect edid-decode binary being available causing the tests to fail. There are also issues with 32bit build. Updating to latest libdisplay-info doesn't seem like a good solution as that pulls in additional build dependencies. Since this is an optional dependency, drop the wrap file. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13657 Part-of: --- meson.build | 1 - subprojects/libdisplay-info.wrap | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 subprojects/libdisplay-info.wrap diff --git a/meson.build b/meson.build index 3b483682b31..9cc75f6636e 100644 --- a/meson.build +++ b/meson.build @@ -1575,7 +1575,6 @@ if host_machine.system() == 'windows' or with_platform_android dep_display_info = null_dep else dep_display_info = dependency('libdisplay-info', version : '>= 0.1.1', - fallback : ['libdisplay-info', 'di_dep'], required : get_option('display-info')) if dep_display_info.found() pre_args += '-DHAVE_LIBDISPLAY_INFO' diff --git a/subprojects/libdisplay-info.wrap b/subprojects/libdisplay-info.wrap deleted file mode 100644 index cf3cf1e6529..00000000000 --- a/subprojects/libdisplay-info.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-git] -directory = libdisplay-info - -url = https://gitlab.freedesktop.org/emersion/libdisplay-info -revision = 92b031749c0fe84ef5cdf895067b84a829920e25