Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@buildroot.org
Cc: Kory Maincent <kory.maincent@bootlin.com>
Subject: [Buildroot] [PATCH] package/drm-info: bump version to 2.10.0
Date: Fri, 13 Nov 2026 20:36:10 +0100	[thread overview]
Message-ID: <20261113193612.1229303-1-peter@korsgaard.com> (raw)

And drop now upstreamed patch:
https://gitlab.freedesktop.org/emersion/drm_info/-/commit/154d17ec47baa9f66528d81d73788ddbde5000e1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-Revert-Find-drm_fourcc.h-in-sysroot.patch | 47 -------------------
 package/drm-info/drm-info.hash                |  2 +-
 package/drm-info/drm-info.mk                  |  2 +-
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch

diff --git a/package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch b/package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch
deleted file mode 100644
index 3e70f3d1cf..0000000000
--- a/package/drm-info/0001-Revert-Find-drm_fourcc.h-in-sysroot.patch
+++ /dev/null
@@ -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
-
diff --git a/package/drm-info/drm-info.hash b/package/drm-info/drm-info.hash
index de852cb5eb..e53a98d807 100644
--- a/package/drm-info/drm-info.hash
+++ b/package/drm-info/drm-info.hash
@@ -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
diff --git a/package/drm-info/drm-info.mk b/package/drm-info/drm-info.mk
index 25deb18f00..25e96445aa 100644
--- a/package/drm-info/drm-info.mk
+++ b/package/drm-info/drm-info.mk
@@ -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
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2026-11-13 19:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-13 19:36 Peter Korsgaard [this message]
2026-11-14 12:32 ` [Buildroot] [PATCH] package/drm-info: bump version to 2.10.0 Julien Olivain via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261113193612.1229303-1-peter@korsgaard.com \
    --to=peter@korsgaard.com \
    --cc=buildroot@buildroot.org \
    --cc=kory.maincent@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox