Bump buidlroot version to 2018.02.6

2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
--- a/bsp/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch
+++ b/bsp/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch
@@ -0,0 +1,42 @@
+From a0acea5bcce3f47badbfeeab7bc2e36eba08fd84 Mon Sep 17 00:00:00 2001
+From: Sam Lantinga <slouken@libsdl.org>
+Date: Mon, 27 Aug 2018 11:51:05 -0700
+Subject: [PATCH] Fixed the DirectFB renderer not being enabled in autoconf
+ builds
+
+Upstream-url: https://hg.libsdl.org/SDL/raw-rev/751cdc74d55c
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ configure    | 3 +++
+ configure.in | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index e88b38001..40ac14d21 100755
+--- a/configure
+++ b/configure
+@@ -21501,6 +21501,9 @@ fi
+ 
+ $as_echo "#define SDL_VIDEO_DRIVER_DIRECTFB 1" >>confdefs.h
+ 
+
+$as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
+
+             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
+ 
+diff --git a/configure.in b/configure.in
+index 5bf5d717b..ce1d57ea1 100644
+--- a/configure.in
+++ b/configure.in
+@@ -2163,6 +2163,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
+                               , enable_directfb_shared=yes)
+ 
+             AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB, 1, [ ])
+            AC_DEFINE(SDL_VIDEO_RENDER_DIRECTFB, 1, [ ])
+             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
+ 
+-- 
+2.11.0
+
--- a/bsp/buildroot/package/sdl2/Config.in
+++ b/bsp/buildroot/package/sdl2/Config.in
@@ -29,6 +29,31 @@ comment "X11 video driver needs X.org"
 	depends on !BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU

+config BR2_PACKAGE_SDL2_KMSDRM
+	bool "KMS/DRM video driver"
+	depends on BR2_PACKAGE_LIBDRM
+
+comment "KMS/DRM video driver needs libdrm"
+	depends on !BR2_PACKAGE_LIBDRM
+
+config BR2_PACKAGE_SDL2_OPENGL
+	bool "OpenGL (GLX)"
+	depends on BR2_PACKAGE_HAS_LIBGL
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU # X11 video driver
+	select BR2_PACKAGE_SDL2_X11
+
+comment "OpenGL support needs X11 and an OpenGL provider"
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_SDL2_OPENGLES
+	bool "OpenGL ES"
+	depends on BR2_PACKAGE_HAS_LIBGLES
+
+comment "OpenGL ES support needs an OpenGL ES provider"
+	depends on !BR2_PACKAGE_HAS_LIBGLES
+
 endif

 comment "sdl2 needs a toolchain w/ dynamic library"
--- a/bsp/buildroot/package/sdl2/sdl2.hash
+++ b/bsp/buildroot/package/sdl2/sdl2.hash
@@ -1,4 +1,4 @@
-# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.7.tar.gz.sig
-sha256 ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e  SDL2-2.0.7.tar.gz
+# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.8.tar.gz.sig
+sha256 edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec  SDL2-2.0.8.tar.gz
 # Locally calculated
-sha256 bbd2edb1789c33de29bb9f8d1dbe2774584a9ce8c4e3162944b7a3a447f5e85d  COPYING.txt
+sha256 61e627031e1160bf8b9bdbc9cda27656d422ea8eaab199b64b4a4a4168437154  COPYING.txt
--- a/bsp/buildroot/package/sdl2/sdl2.mk
+++ b/bsp/buildroot/package/sdl2/sdl2.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################

-SDL2_VERSION = 2.0.7
+SDL2_VERSION = 2.0.8
 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
 SDL2_SITE = http://www.libsdl.org/release
-SDL2_LICENSE = zlib
+SDL2_LICENSE = Zlib
 SDL2_LICENSE_FILES = COPYING.txt
 SDL2_INSTALL_STAGING = YES
 SDL2_CONFIG_SCRIPTS = sdl2-config
@@ -18,10 +18,7 @@ SDL2_CONF_OPTS += \
 	--disable-esd \
 	--disable-dbus \
 	--disable-pulseaudio \
-	--disable-video-opengl \
-	--disable-video-opengles \
-	--disable-video-wayland \
-	--disable-video-rpi
+	--disable-video-wayland

 # We must enable static build to get compilation successful.
 SDL2_CONF_OPTS += --enable-static
@@ -41,6 +38,13 @@ else
 SDL2_CONF_OPTS += --disable-video-directfb
 endif

+ifeq ($(BR2_PACKAGE_SDL2_OPENGLES)$(BR2_PACKAGE_RPI_USERLAND),yy)
+SDL2_DEPENDENCIES += rpi-userland
+SDL2_CONF_OPTS += --enable-video-rpi
+else
+SDL2_CONF_OPTS += --disable-video-rpi
+endif
+
 # x-includes and x-libraries must be set for cross-compiling
 # By default x_includes and x_libraries contains unsafe paths.
 # (/usr/X11R6/include and /usr/X11R6/lib)
@@ -51,7 +55,7 @@ SDL2_DEPENDENCIES += xlib_libX11 xlib_libXext
 SDL2_CONF_OPTS += --enable-video-x11 \
 	--with-x=$(STAGING_DIR) \
 	--x-includes=$(STAGING_DIR)/usr/include \
-	--x-libraries=$(STAGING_DIR)/usr/lib  \
+	--x-libraries=$(STAGING_DIR)/usr/lib \
 	--enable-video-x11-xshape

 ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
@@ -100,6 +104,20 @@ else
 SDL2_CONF_OPTS += --disable-video-x11 --without-x
 endif

+ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y)
+SDL2_CONF_OPTS += --enable-video-opengl
+SDL2_DEPENDENCIES += libgl
+else
+SDL2_CONF_OPTS += --disable-video-opengl
+endif
+
+ifeq ($(BR2_PACKAGE_SDL2_OPENGLES),y)
+SDL2_CONF_OPTS += --enable-video-opengles
+SDL2_DEPENDENCIES += libgles
+else
+SDL2_CONF_OPTS += --disable-video-opengles
+endif
+
 ifeq ($(BR2_PACKAGE_TSLIB),y)
 SDL2_DEPENDENCIES += tslib
 SDL2_CONF_OPTS += --enable-input-tslib
@@ -114,4 +132,11 @@ else
 SDL2_CONF_OPTS += --disable-alsa
 endif

+ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y)
+SDL2_DEPENDENCIES += libdrm
+SDL2_CONF_OPTS += --enable-video-kmsdrm
+else
+SDL2_CONF_OPTS += --disable-video-kmsdrm
+endif
+
 $(eval $(autotools-package))