Commit 87523028 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Thomas Petazzoni
Browse files

gpu-viv-bin-mx6q: make fb/x11 choice explicit 



This approach is less error-prone during development.

Tested-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Reviewed-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: default avatarJérôme Pouiller <jezz@sysmic.org>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c9ecdd2b

package/freescale-imx/gpu-viv-bin-mx6q/Config.in

+21 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q 
	select BR2_PACKAGE_HAS_LIBEGL

	select BR2_PACKAGE_HAS_LIBGLES

	select BR2_PACKAGE_HAS_LIBOPENVG

	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7

	depends on BR2_arm # Only relevant for i.MX6

	# Library binaries are linked against libc.so.6

	depends on BR2_TOOLCHAIN_USES_GLIBC
@@ -25,6 +23,27 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q 


if BR2_PACKAGE_GPU_VIV_BIN_MX6Q



choice

	prompt "Output option"

	help

	  There are two versions of this library: one for

	  direct framebuffer access, one for X11 rendering.

	  Choose here which version to install.



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11

	bool "X11"

	depends on BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXDAMAGE

	select BR2_PACKAGE_XLIB_LIBXEXT



comment "X11 backend needs Xorg package"

	depends on !BR2_PACKAGE_XORG7



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB

	bool "Framebuffer"



endchoice



config BR2_PACKAGE_PROVIDES_LIBEGL

	default "gpu-viv-bin-mx6q"

package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO 
GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg



# DirectFB is not supported (wrong version)

ifeq ($(BR2_PACKAGE_XORG7),y)

ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)

GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext

GPU_VIV_BIN_MX6Q_LIB_TARGET = x11

else