浏览代码

package/mesa3d: Refactor XA support to prepare support for ATI drivers

[Thomas:
  - move the new blind option next to the other existing blind options
    in the package.
  - edit the commit log to remove the changelog.]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Bernd Kuhls 10 年之前
父节点
当前提交
2dde40081c
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5 0
      package/mesa3d/Config.in
  2. 1 1
      package/mesa3d/mesa3d.mk

+ 5 - 0
package/mesa3d/Config.in

@@ -36,6 +36,9 @@ config BR2_PACKAGE_PROVIDES_LIBGL
 config BR2_PACKAGE_MESA3D_DRIVER
 	bool
 
+config BR2_PACKAGE_MESA3D_NEEDS_XA
+	bool
+
 comment "Gallium drivers"
 
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
@@ -43,6 +46,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	select BR2_PACKAGE_LIBDRM_NOUVEAU
+	select BR2_PACKAGE_MESA3D_NEEDS_XA
 	help
 	  Supports all Nvidia GPUs.
 
@@ -51,6 +55,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	select BR2_PACKAGE_LIBDRM_VMWGFX
+	select BR2_PACKAGE_MESA3D_NEEDS_XA
 	help
 	  This is a virtual GPU driver for VMWare virtual machines.
 

+ 1 - 1
package/mesa3d/mesa3d.mk

@@ -36,7 +36,7 @@ MESA3D_DEPENDENCIES += \
 	libxcb
 MESA3D_CONF_OPTS += --enable-glx
 # quote from mesa3d configure "Building xa requires at least one non swrast gallium driver."
-ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA),)
+ifneq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),)
 MESA3D_CONF_OPTS += --enable-xa
 else
 MESA3D_CONF_OPTS += --disable-xa