mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
63364f0814
drm_info is a small utility to dump info about DRM devices. Link: https://gitlab.freedesktop.org/emersion/drm_info Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> [Julien: - sort selected packages in Config.in alphabetically - remove comment for license in hash file - move "v" from _VERSION to _SITE - switch _SITE to use gitlab release archives and add _SOURCE ] Signed-off-by: Julien Olivain <ju.o@free.fr>
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From c94d00730d0c25a4a4c46abfcf27823919ac9854 Mon Sep 17 00:00:00 2001
|
|
From: Kory Maincent <kory.maincent@bootlin.com>
|
|
Date: Mon, 16 Mar 2026 18:50:09 +0100
|
|
Subject: [PATCH] Revert "Find drm_fourcc.h in sysroot"
|
|
|
|
This reverts commit cde94140f08775dc4df7eaac766556218d9e1321
|
|
|
|
When cross-compiling, pkg-config's includedir variable already returns
|
|
an absolute path that includes the sysroot prefix (e.g.
|
|
/sysroot/usr/include). Prepending pc_sysrootdir to it duplicates the
|
|
prefix and produces a broken path.
|
|
|
|
The reverted commit introduced the double-prefix issue. Drop pc_sysrootdir
|
|
and use includedir directly, which already carries the correct absolute
|
|
path.
|
|
|
|
The workaround was only needed for the legacy pkg-config 0.29 (2017)
|
|
project, which did not apply PKG_CONFIG_SYSROOT_DIR to includedir.
|
|
The actively maintained pkgconf project handles this correctly, and
|
|
the legacy tool is no longer in widespread use.
|
|
|
|
You can verify the behavior with:
|
|
$ PKG_CONFIG_SYSROOT_DIR="/bla" pkg-config --variable=includedir libdrm
|
|
/bla/usr/include
|
|
|
|
Upstream: https://gitlab.freedesktop.org/emersion/drm_info/-/merge_requests/114
|
|
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
|
|
---
|
|
meson.build | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 1f80024..e4ce03e 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -68,7 +68,7 @@ if libdrm.version().version_compare('<2.4.130')
|
|
elif libdrm.type_name() == 'internal'
|
|
fourcc_h = meson.current_source_dir() / 'subprojects/libdrm/include/drm/drm_fourcc.h'
|
|
else
|
|
- fourcc_h = libdrm.get_variable(pkgconfig: 'pc_sysrootdir') + libdrm.get_variable(pkgconfig: 'includedir') / 'libdrm/drm_fourcc.h'
|
|
+ fourcc_h = libdrm.get_variable(pkgconfig: 'includedir') / 'libdrm/drm_fourcc.h'
|
|
endif
|
|
|
|
# The DRM_BUS_FAUX bus and its information is included in libdrm v2.4.127
|
|
--
|
|
2.43.0
|
|
|