Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drm_info: fix broken build #262

Merged
merged 1 commit into from
Oct 6, 2023
Merged

drm_info: fix broken build #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bootstrap.d/sys-apps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ packages:
DESTDIR: '@THIS_COLLECT_DIR@'

- name: drm_info
stability_level: 'broken' # Unsure what happened, leo must fix this
architecture: '@OPTION:arch@'
metadata:
summary: Small utility to dump info about DRM devices.
Expand All @@ -215,6 +214,7 @@ packages:
git: 'https://gitlab.freedesktop.org/emersion/drm_info.git'
tag: 'v2.5.0'
version: '2.5.0'
revision: 2
tools_required:
- system-gcc
- virtual: pkgconfig-for-target
Expand All @@ -230,7 +230,7 @@ packages:
- '--cross-file'
- '@SOURCE_ROOT@/scripts/meson-@OPTION:[email protected]'
- '--prefix=/usr'
- '--buildtype=release'
- '--buildtype=debugoptimized'
- '--wrap-mode=nofallback'
- '@THIS_SOURCE_DIR@'
build:
Expand Down
25 changes: 25 additions & 0 deletions patches/drm_info/0001-fix-libdrm-pkgconfig-issue.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 75c75ec1b2732d700922749fba3a82c08fcc17a4 Mon Sep 17 00:00:00 2001
From: no92 <[email protected]>
Date: Wed, 4 Oct 2023 00:58:35 +0200
Subject: [PATCH] fix libdrm pkgconfig issue

---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 1943e4c..e107c6e 100644
--- a/meson.build
+++ b/meson.build
@@ -62,7 +62,7 @@ if libdrm.version().version_compare('<2.4.115')
elif libdrm.type_name() == 'internal'
fourcc_h = meson.current_source_dir() / 'subprojects/libdrm/include/drm/drm_fourcc.h'
else
- fourcc_h = libdrm.get_pkgconfig_variable('pc_sysrootdir') + libdrm.get_pkgconfig_variable('includedir') / 'libdrm/drm_fourcc.h'
+ fourcc_h = libdrm.get_pkgconfig_variable('includedir') / 'libdrm/drm_fourcc.h'
endif

if libpci.found()
--
2.42.0

Loading