[Buildroot] [PATCH 1/3] package/mesa3d: disable libva support

[Buildroot] [PATCH 1/3] package/mesa3d: disable libva support

[Bernd Kuhls]

Informations about the circular dependency can be found here:
http://linuxfromscratch.org/blfs/view/systemd/multimedia/libva.html

Fixes
http://autobuild.buildroot.net/results/b51/b516676ca0e695b3dbc3c33622d527b89a227932/
http://autobuild.buildroot.net/results/035/03588be2fbd71bfc68619297dace52a909ffe261/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d/mesa3d.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index e5afed2..82b1001 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -121,6 +121,10 @@ endif
 #     remove dri.pc and gl.pc in this case (MESA3D_REMOVE_OPENGL_PC)
 MESA3D_CONF_OPTS += --enable-opengl
 
+# libva and mesa3d have a circular dependency
+# we do not need libva support in mesa3d, therefore disable this option
+MESA3D_CONF_OPTS += --disable-va
+
 ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
 MESA3D_PROVIDES += libegl
 MESA3D_EGL_PLATFORMS = drm
-- 
2.1.4

[Buildroot] [PATCH 2/3] package/mesa3d: disable broken toolchains on nios2

[Bernd Kuhls]

mesa3d configure triggers the _gp bug:
http://autobuild.buildroot.net/results/8be/8be577dae511f82d45ab3b0a9bba370b81ad2ff9//mesa3d-10.6.1/config.log

/home/test/autobuild/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/4.8.3/../../../../nios2-linux-gnu/bin/ld: /home/test/autobuild/instance-1/output/host/usr/nios2-buildroot-linux-gnu/sysroot/usr/lib/crt1.o: undefined reference to symbol '_gp'
/home/test/autobuild/instance-1/output/host/usr/nios2-buildroot-linux-gnu/sysroot/usr/lib/libgpg-error.so.0: error adding symbols: DSO missing from command line

Fixes
http://autobuild.buildroot.net/results/8be/8be577dae511f82d45ab3b0a9bba370b81ad2ff9/

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

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index c702d0d..2926c89 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -11,6 +11,9 @@ menuconfig BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	# Triggers the _gp link issue in nios2
+	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
+	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
 	help
 	  Mesa 3D, an open-source implementation of the OpenGL specification.
 
-- 
2.1.4

[Buildroot] [PATCH 3/3] package/mesa3d: Fix dri config option

[Bernd Kuhls]

The option is constructed by AC_ARG_ENABLE and not AC_ARG_WITH:
http://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=10.6#n726

Fixes
http://autobuild.buildroot.net/results/6e3/6e313e2a4b2ff092d187ac564f25c14aaaceb0dd/
http://autobuild.buildroot.net/results/e3c/e3c3e441038b72c78c8e94370baa036ab1effb6b/
http://autobuild.buildroot.net/results/11f/11f09260428a766d1f274843a9aebe220fd0e988/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d/mesa3d.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 82b1001..800d2f9 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -93,7 +93,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 MESA3D_CONF_OPTS += \
-	--without-dri-drivers --without-dri --disable-dri3
+	--without-dri-drivers --disable-dri --disable-dri3
 MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
 else
 ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
-- 
2.1.4

[Buildroot] [PATCH 1/3] package/mesa3d: disable libva support

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Wed, 29 Jul 2015 21:42:54 +0200, Bernd Kuhls wrote:
> Informations about the circular dependency can be found here:
> http://linuxfromscratch.org/blfs/view/systemd/multimedia/libva.html
> 
> Fixes
> http://autobuild.buildroot.net/results/b51/b516676ca0e695b3dbc3c33622d527b89a227932/
> http://autobuild.buildroot.net/results/035/03588be2fbd71bfc68619297dace52a909ffe261/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mesa3d/mesa3d.mk | 4 ++++
>  1 file changed, 4 insertions(+)

Applied, thanks.

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

[Buildroot] [PATCH 2/3] package/mesa3d: disable broken toolchains on nios2

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Wed, 29 Jul 2015 21:42:55 +0200, Bernd Kuhls wrote:

> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index c702d0d..2926c89 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -11,6 +11,9 @@ menuconfig BR2_PACKAGE_MESA3D
>  	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
>  	depends on BR2_INSTALL_LIBSTDCPP
>  	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
> +	# Triggers the _gp link issue in nios2
> +	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
> +	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

You forgot to propagate these new dependencies to the comment about
toolchain dependencies. I've done that and applied, thanks!

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

[Buildroot] [PATCH 3/3] package/mesa3d: Fix dri config option

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Wed, 29 Jul 2015 21:42:56 +0200, Bernd Kuhls wrote:
> The option is constructed by AC_ARG_ENABLE and not AC_ARG_WITH:
> http://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=10.6#n726
> 
> Fixes
> http://autobuild.buildroot.net/results/6e3/6e313e2a4b2ff092d187ac564f25c14aaaceb0dd/
> http://autobuild.buildroot.net/results/e3c/e3c3e441038b72c78c8e94370baa036ab1effb6b/
> http://autobuild.buildroot.net/results/11f/11f09260428a766d1f274843a9aebe220fd0e988/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mesa3d/mesa3d.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

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