diff options
| author | David Rosca <david.rosca@amd.com> | 2025-08-21 10:01:13 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@fdo.invalid> | 2025-08-21 14:42:07 +0000 |
| commit | a67a66508efe8fbc98d39e2c0013c281c818a388 (patch) | |
| tree | a0b056bebf19844d19b07c5b8429434213be15e9 | |
| parent | f0c52fee25aef828cb01ff6fdd2d53d6062efd83 (diff) | |
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36897>
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | subprojects/libdisplay-info.wrap | 5 |
2 files changed, 0 insertions, 6 deletions
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 |