From 630530831fbf560d4a856b1f4e45ed57d9d94d67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 7 Oct 2021 11:51:46 +0200 Subject: [PATCH] package/kmscube: use libgbm virtual package kmscube requires a libgbm implementation, which until now, only Mesa3D was providing, so kmscube had a direct dependency on Mesa3D. However, now that we have a proper libgbm virtual package, so this commit converts the kmscube package to use the libegl, libgbm and libgles virtual packages. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [ Kamel : add dependency on recent libgbm ] [Arnout: fix syntax of Config.in comment; order depends alphabetically] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kmscube/Config.in | 19 +++++++++++++++---- package/kmscube/kmscube.mk | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package/kmscube/Config.in b/package/kmscube/Config.in index b6ad305bfb..7379675609 100644 --- a/package/kmscube/Config.in +++ b/package/kmscube/Config.in @@ -1,9 +1,20 @@ config BR2_PACKAGE_KMSCUBE bool "kmscube" - # requires libgbm from mesa3d - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - depends on BR2_PACKAGE_MESA3D_OPENGL_ES + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + select BR2_PACKAGE_LIBDRM help kmscube is an application to test kms/drm drivers. - https://gitlab.freedesktop.org/mesa/kmscube + https://cgit.freedesktop.org/mesa/kmscube/ + +comment "kmscube needs EGL, GBM and OpenGL ES, and a toolchain w/ thread support" + depends on \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBGBM || \ + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT || \ + !BR2_PACKAGE_HAS_LIBGLES || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/kmscube/kmscube.mk b/package/kmscube/kmscube.mk index 7b458376dc..fc9a7f6f99 100644 --- a/package/kmscube/kmscube.mk +++ b/package/kmscube/kmscube.mk @@ -8,6 +8,6 @@ KMSCUBE_VERSION = 4660a7dca6512b6e658759d00cff7d4ad2a2059d KMSCUBE_SITE = https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION) KMSCUBE_LICENSE = MIT KMSCUBE_LICENSE_FILES = COPYING -KMSCUBE_DEPENDENCIES = host-pkgconf mesa3d libdrm +KMSCUBE_DEPENDENCIES = host-pkgconf libdrm libegl libgbm libgles $(eval $(meson-package))