From 81f2dd7b489b73985c13db91ae958833ae84cb4f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 May 2022 19:55:57 +0200 Subject: [PATCH] package/x11r7/xdriver_xf86-video-amdgpu: needs libgbm The package depends on gbm: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/blob/master/configure.ac#L75 This dependency was always there. However, previously it was implicit from the mesa3d dependencies. Since we made libgbm a virtual package, it is possible that libgbm is selected in another way. Note that the original dependencies would always for libgbm in mesa3d, so this was not causing any build failures. Also explicitly add libgbm to _DEPENDENCIES. Previously, this was implied by the mesa3d dependency in xserver, but this is no longer true for other gbm providers. For details see http://lists.busybox.net/pipermail/buildroot/2022-April/641451.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 8 +++----- .../xdriver_xf86-video-amdgpu.mk | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in index c42255f55c..fb23fc1fdf 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU bool "xf86-video-amdgpu" depends on BR2_USE_MMU # libdrm - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_AMDGPU select BR2_PACKAGE_LIBEPOXY @@ -11,7 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU help AMD GPU video driver -comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" +comment "xf86-video-amdgpu needs GBM" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 23452fe417..adba21dd62 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server