Головна сторінка Огляд Довідка
Увійти
PUBLIC_REPOS
/
buildroot
дзеркало git://git.buildroot.net/buildroot
2
1
Відгалуження 0
Файли
Переглянути джерело

package/mesa3d: fix gbm config warning

Fixes for the following defconfig:

  BR2_x86_64=y
  BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
  BR2_TOOLCHAIN_BUILDROOT_CXX=y
  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
  BR2_TARGET_GENERIC_GETTY_PORT="tty1"
  BR2_PACKAGE_MESA3D=y
  BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y
  BR2_PACKAGE_MESA3D_OPENGL_EGL=y
  BR2_PACKAGE_MESA3D_OPENGL_ES=y

this warning:

  WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM
    Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y])
    Selected by [y]:
    - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y]

  WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM
    Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y])
    Selected by [y]:
    - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y]

as BR2_PACKAGE_MESA3D_VULKAN_DRIVER selects BR2_PACKAGE_MESA3D_DRIVER which
enables possible selection of BR2_PACKAGE_MESA3D_OPENGL_EGL selecting
BR2_PACKAGE_MESA3D_GBM.

Selecting EGL with only a vulkan driver selected gives the following configure
failure:

  .../build/mesa3d-20.3.2/meson.build:424:4: ERROR: Problem encountered: EGL requires dri

Note dri means here an dri or gallium driver (see meson.build and look
for with_dri).

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Arnout: convert if to depends]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Peter Seiderer 4 роки тому
батько
e5c69dc19f
коміт
69d5165bc4
1 змінених файлів з 1 додано та 0 видалено
Об'єднаний вигляд Показати статистику Diff
  1. 1 0
      package/mesa3d/Config.in

+ 1 - 0
package/mesa3d/Config.in
Переглянути файл 

@@ -432,6 +432,7 @@ comment "OpenGL GLX support needs X11"
 
 
 
 config BR2_PACKAGE_MESA3D_OPENGL_EGL
 
 config BR2_PACKAGE_MESA3D_OPENGL_EGL
 
 	bool "OpenGL EGL"
 
 	bool "OpenGL EGL"
 
+	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 
 	select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND
 
 	select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND
 
 	select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND
 
 	select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND
 
 	select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
 
 	select BR2_PACKAGE_HAS_LIBEGL_WAYLAND