mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-11-14 16:52:08 -10:00
package/drm-info: bump version to 2.10.0
For release notes, see:
https://gitlab.freedesktop.org/emersion/drm_info/-/tags/v2.10.0
And drop now upstreamed patch:
154d17ec47
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Julien: add link to release notes in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
43f47f795c
commit
f207f3e549
@@ -1,47 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 53ef974ac657a0b4b9d7424a65b7f92e6ca26c15e8356f4146ae8bb9cae2db44 drm_info-2.9.0.tar.gz
|
||||
sha256 4841dad87b00d9760430c9537dab7ff8102828878d972ffc25f48f6b7a16173a drm_info-2.10.0.tar.gz
|
||||
sha256 05a54b690d8851143a8b923cfe8ac48f49050f9d2166e7eb0c1d340242d7f46a LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DRM_INFO_VERSION = 2.9.0
|
||||
DRM_INFO_VERSION = 2.10.0
|
||||
DRM_INFO_SITE = https://gitlab.freedesktop.org/emersion/drm_info/-/releases/v$(DRM_INFO_VERSION)/downloads
|
||||
DRM_INFO_SOURCE = drm_info-$(DRM_INFO_VERSION).tar.gz
|
||||
DRM_INFO_LICENSE = MIT
|
||||
|
||||
Reference in New Issue
Block a user