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

[Buildroot] [PATCH v2 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/
in addition, incase BR2_PACKAGE_XLIB_LIBX11 is not set, update cflags in
egl.pc to pass -DMESA_EGL_NO_X11_HEADERS.

Reported By: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---

 v1 -> v2:
 	update egl.pc to pass -DMESA_EGL_NO_X11_HEADERS in cflags if libX11 is not installed (Thomas)

 package/odroid-mali/odroid-mali.hash | 2 +-
 package/odroid-mali/odroid-mali.mk   | 9 ++++++++-
 2 files changed, 9 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..4ebc31605 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
@@ -44,4 +44,11 @@ define ODROID_MALI_INSTALL_TARGET_CMDS
 	$(call ODROID_MALI_INSTALL_LIBS,$(TARGET_DIR))
 endef
 
+ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+define ODROID_MALI_FIX_EGL_PC
+	$(SED) "s/: -I/: -DMESA_EGL_NO_X11_HEADERS -I/" $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
+endef
+ODROID_MALI_POST_INSTALL_TARGET_HOOKS += ODROID_MALI_FIX_EGL_PC
+endif
+
 $(eval $(generic-package))
-- 
2.12.1

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

[Dagg Stompler]

This reverts commit e2ac546c1951ba8a3e88965d3023eb38a9493f28.
---
 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.1

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

[Thomas Petazzoni]

Hello,

On Sat, 25 Mar 2017 15:39:17 +0300, Dagg Stompler wrote:

> -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
> @@ -44,4 +44,11 @@ define ODROID_MALI_INSTALL_TARGET_CMDS
>  	$(call ODROID_MALI_INSTALL_LIBS,$(TARGET_DIR))
>  endef
>  
> +ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)

Rather than this condition, I've used the existing
BR2_PACKAGE_ODROID_MALI_X11 condition in odroid-mali.mk.

> +define ODROID_MALI_FIX_EGL_PC
> +	$(SED) "s/: -I/: -DMESA_EGL_NO_X11_HEADERS -I/" $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
> +endef
> +ODROID_MALI_POST_INSTALL_TARGET_HOOKS += ODROID_MALI_FIX_EGL_PC

Using a post-install *target* hook to tweak things in the staging
directory is not very clean. Instead, I've changed your patch to call
ODROID_MALI_FIX_EGL_PC from ODROID_MALI_INSTALL_STAGING_CMDS.

Applied with those fixes. Thanks!

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

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

[Thomas Petazzoni]

Hello,

On Sat, 25 Mar 2017 15:39:18 +0300, Dagg Stompler wrote:
> This reverts commit e2ac546c1951ba8a3e88965d3023eb38a9493f28.
> ---
>  package/odroid-mali/Config.in | 10 ----------
>  1 file changed, 10 deletions(-)

Applied to master, thanks.

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