[Buildroot] [PATCH 1/1] package/glmark2: Fix mesa3d dependency

[Buildroot] [PATCH 1/1] package/glmark2: Fix mesa3d dependency

[Bernd Kuhls]

Compilation fails with this defconfig, provided by Thomas

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2014.11.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17=y
BR2_TOOLCHAIN_EXTERNAL_LARGEFILE=y
BR2_TOOLCHAIN_EXTERNAL_INET_IPV6=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_GLMARK2=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_RPI_USERLAND=y

because rpi-userland is used a provider for libegl/gles.
Fix this by depending on the corresponding mesa3d suboptions.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/glmark2/Config.in |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
index 2d799fe..65e077b 100644
--- a/package/glmark2/Config.in
+++ b/package/glmark2/Config.in
@@ -1,15 +1,13 @@
 config BR2_PACKAGE_GLMARK2_EGL_GLES
 	bool
 	default y
-	depends on BR2_PACKAGE_HAS_LIBEGL
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on BR2_PACKAGE_MESA3D
+	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
+	depends on BR2_PACKAGE_MESA3D_OPENGL_ES
 
 config BR2_PACKAGE_GLMARK2_GL
 	bool
 	default y
-	depends on BR2_PACKAGE_HAS_LIBGL
-	depends on BR2_PACKAGE_MESA3D
+	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
 
 comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d"
 	depends on BR2_LARGEFILE
-- 
1.7.10.4

[Buildroot] [PATCH 1/1] package/glmark2: Fix mesa3d dependency

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 10 Jan 2015 20:16:40 +0100, Bernd Kuhls wrote:
> Compilation fails with this defconfig, provided by Thomas
> 
> BR2_arm=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
> BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
> BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2014.11.tar.bz2"
> BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17=y
> BR2_TOOLCHAIN_EXTERNAL_LARGEFILE=y
> BR2_TOOLCHAIN_EXTERNAL_INET_IPV6=y
> BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
> BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
> BR2_TOOLCHAIN_EXTERNAL_CXX=y
> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
> BR2_PACKAGE_GLMARK2=y
> BR2_PACKAGE_MESA3D=y
> BR2_PACKAGE_RPI_USERLAND=y
> 
> because rpi-userland is used a provider for libegl/gles.
> Fix this by depending on the corresponding mesa3d suboptions.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

I don't really understand: this means that we can't use glmark2 with an
OpenGL implementation other than Mesa3D ?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] package/glmark2: Fix mesa3d dependency

[Bernd Kuhls]

Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20150110210259.6bbf4373 at free-electrons.com:

> I don't really understand: this means that we can't use glmark2 with an
> OpenGL implementation other than Mesa3D ?

Hi Thomas,

yes:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/65288/
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/101953/

Small note:
Since mesa3d is currently the only package activating
BR2_PACKAGE_HAS_LIBGL, the part of the patch which contains
BR2_PACKAGE_MESA3D_DRI_DRIVER could be omitted.

Regards, Bernd

[Buildroot] [PATCH 1/1] package/glmark2: Fix mesa3d dependency

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 10 Jan 2015 20:16:40 +0100, Bernd Kuhls wrote:
> Compilation fails with this defconfig, provided by Thomas
> 
> BR2_arm=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
> BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
> BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2014.11.tar.bz2"
> BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17=y
> BR2_TOOLCHAIN_EXTERNAL_LARGEFILE=y
> BR2_TOOLCHAIN_EXTERNAL_INET_IPV6=y
> BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
> BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
> BR2_TOOLCHAIN_EXTERNAL_CXX=y
> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
> BR2_PACKAGE_GLMARK2=y
> BR2_PACKAGE_MESA3D=y
> BR2_PACKAGE_RPI_USERLAND=y
> 
> because rpi-userland is used a provider for libegl/gles.
> Fix this by depending on the corresponding mesa3d suboptions.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/glmark2/Config.in |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com