Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -0,0 +1,57 @@
|
||||
From 5bf4d4f9c759fdb3c0db61a781042223236169c6 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Mon, 5 Jun 2017 12:40:16 +0200
|
||||
Subject: [PATCH] fix conflicting data types between GLES2/gl2.h and GLES/gl.h
|
||||
|
||||
When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the
|
||||
build fail since GLintptr and GLsizeiptr data type are not the same in
|
||||
GLES2/gl2.h and GLES/gl.h.
|
||||
|
||||
Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and
|
||||
GLfixed.
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
include/GLES/gl.h | 15 +++++++--------
|
||||
1 file changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/GLES/gl.h b/include/GLES/gl.h
|
||||
index a6bb591..799408b 100644
|
||||
--- a/include/GLES/gl.h
|
||||
+++ b/include/GLES/gl.h
|
||||
@@ -18,22 +18,21 @@ typedef void GLvoid;
|
||||
typedef unsigned int GLenum;
|
||||
typedef unsigned char GLboolean;
|
||||
typedef unsigned int GLbitfield;
|
||||
-typedef signed char GLbyte;
|
||||
+typedef khronos_int8_t GLbyte;
|
||||
typedef short GLshort;
|
||||
typedef int GLint;
|
||||
typedef int GLsizei;
|
||||
-typedef unsigned char GLubyte;
|
||||
+typedef khronos_uint8_t GLubyte;
|
||||
typedef unsigned short GLushort;
|
||||
typedef unsigned int GLuint;
|
||||
-typedef float GLfloat;
|
||||
-typedef float GLclampf;
|
||||
-typedef signed int GLfixed;
|
||||
+typedef khronos_float_t GLfloat;
|
||||
+typedef khronos_float_t GLclampf;
|
||||
+typedef khronos_int32_t GLfixed;
|
||||
typedef signed int GLclampx;
|
||||
typedef char GLchar;
|
||||
|
||||
-typedef int * GLintptr;
|
||||
-typedef int * GLsizeiptr;
|
||||
-
|
||||
+typedef khronos_intptr_t GLintptr;
|
||||
+typedef khronos_ssize_t GLsizeiptr;
|
||||
|
||||
/*************************************************************/
|
||||
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
config BR2_PACKAGE_SUNXI_MALI
|
||||
bool "sunxi-mali"
|
||||
depends on BR2_arm
|
||||
# libump package only provide libUMP.so.3 which is used by
|
||||
# libMali for r3p0 and r3p1 Mali kernel module. This version
|
||||
# is only available for ARM EABIhf.
|
||||
# libMali for r2p4 Mali kernel module (available for ARM EABI)
|
||||
# requires libUMP.so.2.
|
||||
depends on BR2_ARM_EABIHF # libUMP.so.3 only
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
select BR2_PACKAGE_HAS_LIBEGL
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
@@ -25,42 +31,29 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
config BR2_PACKAGE_SUNXI_MALI_DBG
|
||||
bool "install malitest and maliver tools"
|
||||
help
|
||||
Install 3D triangle demo malitest application and the maliver application
|
||||
which describes the kernel module version.
|
||||
Install 3D triangle demo malitest application and the
|
||||
maliver application which describes the kernel module
|
||||
version.
|
||||
|
||||
choice
|
||||
prompt "Version"
|
||||
default BR2_PACKAGE_SUNXI_MALI_R3P0
|
||||
help
|
||||
Select the version of the kernel module. For the sunxi-kernel, the
|
||||
appropriate version number is r3p0. For other kernels, use the maliver
|
||||
application to determine the appropriate version.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_MALI_R2P4
|
||||
bool "r2p4"
|
||||
depends on BR2_ARM_EABI
|
||||
|
||||
comment "r2p4 requires an EABI toolchain"
|
||||
depends on !BR2_ARM_EABI
|
||||
Select the version of the kernel module. For the
|
||||
sunxi-kernel, the appropriate version number is r3p0. For
|
||||
other kernels, use the maliver application to determine the
|
||||
appropriate version.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_MALI_R3P0
|
||||
bool "r3p0"
|
||||
depends on BR2_ARM_EABIHF
|
||||
|
||||
comment "r3p0 requires an EABIhf toolchain"
|
||||
depends on !BR2_ARM_EABIHF
|
||||
|
||||
config BR2_PACKAGE_SUNXI_MALI_R3P1
|
||||
depends on BR2_ARM_EABIHF
|
||||
bool "r3p1"
|
||||
|
||||
comment "r3p1 requires an EABIhf toolchain"
|
||||
depends on !BR2_ARM_EABIHF
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
|
||||
comment "sunxi-mali needs a glibc toolchain"
|
||||
comment "sunxi-mali needs an EABIhf glibc toolchain"
|
||||
depends on BR2_arm
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF
|
||||
|
||||
2
bsp/buildroot/package/sunxi-mali/sunxi-mali.hash
Normal file
2
bsp/buildroot/package/sunxi-mali/sunxi-mali.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 c5f58b2c0533a74f491634ddbd80d888781f4ea29ecc5c24bd7300c02bef1145 sunxi-mali-d343311efc8db166d8371b28494f0f27b6a5872.tar.gz
|
||||
@@ -28,17 +28,9 @@ SUNXI_MALI_MAKE_ENV = \
|
||||
CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \
|
||||
$(TARGET_MAKE_ENV)
|
||||
|
||||
ifeq ($(BR2_ARM_EABIHF),y)
|
||||
SUNXI_MALI_MAKE_OPTS += ABI=armhf
|
||||
else
|
||||
SUNXI_MALI_MAKE_OPTS += ABI=armel
|
||||
endif
|
||||
SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \
|
||||
ABI=armhf
|
||||
|
||||
SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y)
|
||||
SUNXI_MALI_MAKE_OPTS += VERSION=r2p4
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y)
|
||||
SUNXI_MALI_MAKE_OPTS += VERSION=r3p0
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user