[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Dagg Stompler]

upstream has updated the headers, (https://github.com/mdrjr/c2_mali/issues/1)
it should fix failures such as http://autobuild.buildroot.net/results/ed8/ed8d562ae5fdb472a83f9a07b2f755c80c972c34/

Reported By: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
 package/odroid-mali/odroid-mali.hash | 2 +-
 package/odroid-mali/odroid-mali.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/odroid-mali/odroid-mali.hash b/package/odroid-mali/odroid-mali.hash
index 4d2482422..b71ebab13 100644
--- a/package/odroid-mali/odroid-mali.hash
+++ b/package/odroid-mali/odroid-mali.hash
@@ -1,2 +1,2 @@
 # Locally computed hash
-sha256 29d98ed4b8694b860d9289787c416faa847b0de26d36580a53add1752b4c2e9a  odroid-mali-46fe49f37e3506c6205ad8c50980eca9bfff11e3.tar.gz
+sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-mali-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
diff --git a/package/odroid-mali/odroid-mali.mk b/package/odroid-mali/odroid-mali.mk
index 142fd97c6..d012c92ed 100644
--- a/package/odroid-mali/odroid-mali.mk
+++ b/package/odroid-mali/odroid-mali.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ODROID_MALI_VERSION = 46fe49f37e3506c6205ad8c50980eca9bfff11e3
+ODROID_MALI_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9
 ODROID_MALI_SITE = $(call github,mdrjr,c2_mali,$(ODROID_MALI_VERSION))
 ODROID_MALI_LICENSE = Hardkernel EULA
 ODROID_MALI_LICENSE_FILES = README.md
-- 
2.12.0

[Buildroot] [PATCH 2/2] Revert "odroid-mali: mark package as BROKEN"

[Dagg Stompler]

This reverts commit e2ac546c1951ba8a3e88965d3023eb38a9493f28.

as upstream fixed the reported issue, unmark this pkg as BROKEN.

Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
 package/odroid-mali/Config.in | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package/odroid-mali/Config.in b/package/odroid-mali/Config.in
index 5a6af7504..e5c07f237 100644
--- a/package/odroid-mali/Config.in
+++ b/package/odroid-mali/Config.in
@@ -5,16 +5,6 @@ config BR2_PACKAGE_ODROID_MALI
 	select BR2_PACKAGE_ODROID_SCRIPTS # runtime
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_aarch64 || BR2_ARM_EABIHF
-	# The version of the khrplatform.h header bundled with
-	# odroid-mali has a definition of the khronos_intptr_t and
-	# khronos_ssize_t that doesn't match the official Khronos
-	# registry headers or the Mesa3D headers. Due to this, it
-	# causes conflicts with some packages that redefines those
-	# types (with the correct definitions), such as libepoxy.
-	#
-	# Issue reported upstream at:
-	# https://github.com/mdrjr/c2_mali/issues/1
-	depends on BROKEN
 	help
 	  Install the ARM Mali drivers for odroidc2 based systems.
 
-- 
2.12.0

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Thomas Petazzoni]

Hello,

On Mon, 13 Mar 2017 11:08:33 +0200, Dagg Stompler wrote:

> upstream has updated the headers, (https://github.com/mdrjr/c2_mali/issues/1)
> it should fix failures such as http://autobuild.buildroot.net/results/ed8/ed8d562ae5fdb472a83f9a07b2f755c80c972c34/

Did you actually test building libepoxy with this bump, to verify that
not only it "should fix", but that it "really fixes".

Thanks!

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

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[daggs]

Greetings,

> Hello,
> 
> On Mon, 13 Mar 2017 11:08:33 +0200, Dagg Stompler wrote:
> 
> > upstream has updated the headers, (https://github.com/mdrjr/c2_mali/issues/1)
> > it should fix failures such as http://autobuild.buildroot.net/results/ed8/ed8d562ae5fdb472a83f9a07b2f755c80c972c34/
> 
> Did you actually test building libepoxy with this bump, to verify that
> not only it "should fix", but that it "really fixes".
> 
> Thanks!
> 
> Thomas

yes, I did verified.
what I did encountered (not sure it is a bug), is the following:
1. checkout a clean buildroot.
2. run make odroidc2_defconfig.
3. run make menuconfig
    1. set libc to glibc.
    2. select odroid-mali.
    3. select libepoxy.
4. run build.

the above will fail libepoxy on Xlib.h no such file or directory found.
for that xorg + libX11 needs to be enabled.

Dagg.

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Thomas Petazzoni]

Hello,

On Mon, 13 Mar 2017 15:17:00 +0100, daggs wrote:

> yes, I did verified.
> what I did encountered (not sure it is a bug), is the following:
> 1. checkout a clean buildroot.
> 2. run make odroidc2_defconfig.
> 3. run make menuconfig
>     1. set libc to glibc.
>     2. select odroid-mali.
>     3. select libepoxy.
> 4. run build.

Thanks!

> the above will fail libepoxy on Xlib.h no such file or directory found.
> for that xorg + libX11 needs to be enabled.

Then there is still a problem with odroid-mali, because with the
rpi-userland OpenGL ES/EGL provider, libepoxy builds just fine. Try the
following defconfig:

BR2_arm=y
BR2_cortex_a8=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_RPI_USERLAND=y
BR2_PACKAGE_LIBEPOXY=y
# BR2_TARGET_ROOTFS_TAR is not set

I've tested your patches, and indeed I've been able to reproduce this
issue. It's because they have re-used the mesa3d headers as-is it
seems, and therefore MESA_EGL_NO_X11_HEADERS needs to be defined when
X11 is not used.

So I guess this would need to be adjust in the pkg-config files
installed by odroid-mali... even though that will only work with the
packages that then use pkg-config to detect OpenGL ES/EGL.

Adding in Cc Peter Seiderer, who also mentioned MESA_EGL_NO_X11_HEADERS
in another thread recently.

Best regards,

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

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[daggs]

Greetings,

>
> Hello,
> 
> On Mon, 13 Mar 2017 15:17:00 +0100, daggs wrote:
> 
> > yes, I did verified.
> > what I did encountered (not sure it is a bug), is the following:
> > 1. checkout a clean buildroot.
> > 2. run make odroidc2_defconfig.
> > 3. run make menuconfig
> >     1. set libc to glibc.
> >     2. select odroid-mali.
> >     3. select libepoxy.
> > 4. run build.
> 
> Thanks!
> 
> > the above will fail libepoxy on Xlib.h no such file or directory found.
> > for that xorg + libX11 needs to be enabled.
> 
> Then there is still a problem with odroid-mali, because with the
> rpi-userland OpenGL ES/EGL provider, libepoxy builds just fine. Try the
> following defconfig:
> 
> BR2_arm=y
> BR2_cortex_a8=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_INIT_NONE=y
> BR2_SYSTEM_BIN_SH_NONE=y
> # BR2_PACKAGE_BUSYBOX is not set
> BR2_PACKAGE_RPI_USERLAND=y
> BR2_PACKAGE_LIBEPOXY=y
> # BR2_TARGET_ROOTFS_TAR is not set
> 
> I've tested your patches, and indeed I've been able to reproduce this
> issue. It's because they have re-used the mesa3d headers as-is it
> seems, and therefore MESA_EGL_NO_X11_HEADERS needs to be defined when
> X11 is not used.
> 
> So I guess this would need to be adjust in the pkg-config files
> installed by odroid-mali... even though that will only work with the
> packages that then use pkg-config to detect OpenGL ES/EGL.
> 
> Adding in Cc Peter Seiderer, who also mentioned MESA_EGL_NO_X11_HEADERS
> in another thread recently.
> 
> Best regards,
> 
> Thomas

not sure I follow, I was able to compile libepoxy with odroid-mali without any problem, what issue have you encountered?
how can I reproduce it?

Thanks,

Dagg.

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Thomas Petazzoni]

Hello,

On Wed, 15 Mar 2017 07:37:14 +0100, daggs wrote:

> not sure I follow, I was able to compile libepoxy with odroid-mali without any problem, what issue have you encountered?

Exactly the issue you mentioned in your e-mail: "the above will fail
libepoxy on Xlib.h no such file or directory found".

You solved it by enabling X11, but this is wrong. When you're doing
OpenGL ES + EGL, you don't necessarily need X11, so it shouldn't be
necessary to enable X11.

Best regards,

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

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[daggs]

Greetings,

>
> Hello,
> 
> On Wed, 15 Mar 2017 07:37:14 +0100, daggs wrote:
> 
> > not sure I follow, I was able to compile libepoxy with odroid-mali without any problem, what issue have you encountered?
> 
> Exactly the issue you mentioned in your e-mail: "the above will fail
> libepoxy on Xlib.h no such file or directory found".
> 
> You solved it by enabling X11, but this is wrong. When you're doing
> OpenGL ES + EGL, you don't necessarily need X11, so it shouldn't be
> necessary to enable X11.
> 
> Best regards,
> 
> Thomas

I think I understand, if no xlib was selected, the pc files should MESA_EGL_NO_X11_HEADERS should be defined, correct?

Thanks,

Dagg.

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Thomas Petazzoni]

Hello,

On Wed, 15 Mar 2017 10:52:40 +0100, daggs wrote:

> I think I understand, if no xlib was selected, the pc files should MESA_EGL_NO_X11_HEADERS should be defined, correct?

Yes, that's one way to fix it, but:

 * It is strange for odroid-mali headers to look at a MESA_xyz
   definition. It smells like mesa headers were copy/pasted into
   odroid-mali.

 * This will only work for packages that look at the .pc files.
   Hopefully, this should be the majority, and we can fix the few
   packages that don't use .pc files to find the OpenGLES/EGL libraries.

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

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[daggs]

Greetings,

> Hello,
> 
> On Wed, 15 Mar 2017 10:52:40 +0100, daggs wrote:
> 
> > I think I understand, if no xlib was selected, the pc files should MESA_EGL_NO_X11_HEADERS should be defined, correct?
> 
> Yes, that's one way to fix it, but:
> 
>  * It is strange for odroid-mali headers to look at a MESA_xyz
>    definition. It smells like mesa headers were copy/pasted into
>    odroid-mali.
> 
>  * This will only work for packages that look at the .pc files.
>    Hopefully, this should be the majority, and we can fix the few
>    packages that don't use .pc files to find the OpenGLES/EGL libraries.
> 
> Thomas

a question, does the latest gl related patch to libepoxy is relevant for this issue? if so, can you comment on how?

Thanks,

Dagg.

[Buildroot] [PATCH 1/2] odroid-mali: fix broken headers.

[Thomas Petazzoni]

Hello,

On Sun, 19 Mar 2017 09:10:05 +0100, daggs wrote:

> a question, does the latest gl related patch to libepoxy is relevant
> for this issue? if so, can you comment on how?

It is indeed relevant: if the egl.pc provided by odroid-mali defines
the appropriate -DMESA_EGL_NO_X11_HEADERS in its Cflags when the
non-X11 version of odroid-mali is installed.

That being said, upstream feedback
(https://github.com/anholt/libepoxy/pull/113) on Gustavo patch wasn't
entirely positive, so a different solution might be needed. But in the
mean time, a patch for odroid-mali egl.pc should resolve the issue.

Thanks!

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