Merge from bittboy/buildroot@db180c0

package/sdl2_ttf/0001-fix-opengl-detection.patch

@@ -0,0 +1,37 @@
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1485568474 28800
+# Node ID 3b93536d291a34183592fd29ef1df9cf1416ac09
+# Parent  184c34c673d479477d34194e3c0b1abe7ca5d828
+Make sure we can link with OpenGL libraries in the OpenGL configure test
+
+[yann.morin.1998@free.fr:
+  - backported from upstream
+  - drop the configure hunk for autoreconf
+]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -r 184c34c673d4 -r 3b93536d291a configure.in
+--- a/configure.in	Sun Jan 01 18:46:38 2017 -0800
++++ b/configure.in	Fri Jan 27 17:54:34 2017 -0800
+@@ -164,14 +164,17 @@
+ esac
+ AC_MSG_CHECKING(for OpenGL support)
+ have_opengl=no
+-AC_TRY_COMPILE([
++save_LIBS="$LIBS"
++LIBS="$LIBS $SYS_GL_LIBS"
++AC_TRY_LINK([
+  #include "SDL_opengl.h"
+ ],[
+- GLuint texture;
++ glOrtho( -2.0, 2.0, -2.0, 2.0, -20.0, 20.0 );
+ ],[
+ have_opengl=yes
+ ])
+ AC_MSG_RESULT($have_opengl)
++LIBS="$save_LIBS"
+ if test x$have_opengl = xyes; then
+     CFLAGS="$CFLAGS -DHAVE_OPENGL"
+     GL_LIBS="$SYS_GL_LIBS"
+

package/sdl2_ttf/0002-fix-autoreconf.patch

@@ -0,0 +1,30 @@
+# HG changeset patch
+# User "Yann E. MORIN" <yann.morin.1998@free.fr>
+# Date 1485597428 -3600
+# Node ID 26376ce4a3e6565885fd984b3fe5a39a6895dcdd
+# Parent  3b93536d291a34183592fd29ef1df9cf1416ac09
+configure: fix autoreconf
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -1,5 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(README.txt)
++dnl The version string must be a literal
++AC_INIT([SDL2_ttf],[2.0.14])
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
+@@ -42,7 +42,7 @@
+ AC_CANONICAL_HOST
+ 
+ dnl Setup for automake
+-AM_INIT_AUTOMAKE(SDL2_ttf, $VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ dnl Check for tools
+ AC_PROG_LIBTOOL
+

package/sdl2_ttf/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SDL2_TTF
+	bool "sdl2_ttf"
+	depends on BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_FREETYPE
+	help
+	  SDL2_ttf is a sample TrueType font library. It allows you to
+	  use TrueType fonts in your SDL2 applications.
+
+	  http://www.libsdl.org/projects/SDL_ttf/

package/sdl2_ttf/sdl2_ttf.hash

@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276  SDL2_ttf-2.0.14.tar.gz

package/sdl2_ttf/sdl2_ttf.mk

@@ -0,0 +1,34 @@
+################################################################################
+#
+# sdl2_ttf
+#
+################################################################################
+
+SDL2_TTF_VERSION = 2.0.14
+SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz
+SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release
+SDL2_TTF_LICENSE = Zlib
+SDL2_TTF_LICENSE_FILES = COPYING.txt
+SDL2_TTF_INSTALL_STAGING = YES
+SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf
+
+# Two patches touching configure.in
+SDL2_TTF_AUTORECONF = YES
+
+SDL2_TTF_CONF_ENV = \
+	FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+
+# x-includes and x-libraries must be set for cross-compiling
+# By default x_includes and x_libraries contains unsafe paths.
+# (/usr/include and /usr/lib)
+ifeq ($(BR2_PACKAGE_SDL2_X11),y)
+SDL2_TTF_CONF_OPTS += \
+	--with-x \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
+else
+SDL2_TTF_CONF_OPTS += \
+	--without-x
+endif
+
+$(eval $(autotools-package))