Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
From 07309a49ad6c3e18c8c84fe54f1fdb9e103c4cc5 Mon Sep 17 00:00:00 2001
|
||||
From: Francois Perrad <francois.perrad@gadz.org>
|
||||
Date: Sun, 22 Oct 2017 13:00:01 +0200
|
||||
Subject: [PATCH] Do not reference host directory for headers
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
---
|
||||
cmake/FindSDL2.cmake | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
|
||||
index 5cf4115..5e17919 100644
|
||||
--- a/cmake/FindSDL2.cmake
|
||||
+++ b/cmake/FindSDL2.cmake
|
||||
@@ -73,11 +73,6 @@ find_path(SDL2_INCLUDE_DIR SDL.h
|
||||
PATH_SUFFIXES include/SDL2 include
|
||||
)
|
||||
|
||||
-# On FreeBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, which is
|
||||
-# located in ${LOCALBASE}/include. Append {LOCALBASE}/include to
|
||||
-# the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box.
|
||||
-list(APPEND SDL2_INCLUDE_DIR /usr/local/include)
|
||||
-
|
||||
find_library(SDL_LIBRARY_TEMP
|
||||
NAMES SDL2 SDL2-2.0
|
||||
HINTS
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From 5732174debfe027f7620af55c283060201f0ad03 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 2 Nov 2017 22:54:51 +0100
|
||||
Subject: [PATCH] CMakeLists: do not require C++
|
||||
|
||||
The project doesn't use C++, so don't let CMake check for a C++
|
||||
compiler by explicitly specifying that this is a C-only project.
|
||||
|
||||
Submitted-upstream: https://github.com/Tangent128/luasdl2/pull/69
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
common/CMakeLists.txt | 2 +-
|
||||
examples/CMakeLists.txt | 2 +-
|
||||
tutorials/CMakeLists.txt | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
|
||||
index 9e19709..8cfb748 100644
|
||||
--- a/common/CMakeLists.txt
|
||||
+++ b/common/CMakeLists.txt
|
||||
@@ -15,7 +15,7 @@
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
-project(common)
|
||||
+project(common C)
|
||||
|
||||
set(
|
||||
SOURCES
|
||||
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
|
||||
index 572b3b7..4e3af4d 100644
|
||||
--- a/examples/CMakeLists.txt
|
||||
+++ b/examples/CMakeLists.txt
|
||||
@@ -16,7 +16,7 @@
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
|
||||
-project(examples)
|
||||
+project(examples C)
|
||||
|
||||
# Option to enable / disable examples installation
|
||||
option(WITH_DOCS "Installation of documentation and examples" On)
|
||||
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
|
||||
index adefbc9..6ec069e 100644
|
||||
--- a/tutorials/CMakeLists.txt
|
||||
+++ b/tutorials/CMakeLists.txt
|
||||
@@ -16,7 +16,7 @@
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
|
||||
-project(tutorials)
|
||||
+project(tutorials C)
|
||||
|
||||
# Option to enable / disable examples installation
|
||||
option(WITH_DOCS "Installation of tutorials" On)
|
||||
--
|
||||
2.13.6
|
||||
|
||||
12
bsp/buildroot/package/lua-sdl2/Config.in
Normal file
12
bsp/buildroot/package/lua-sdl2/Config.in
Normal file
@@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_LUA_SDL2
|
||||
bool "lua-sdl2"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_SDL2
|
||||
help
|
||||
Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2,
|
||||
Lua 5.3, and LuaJIT.
|
||||
|
||||
https://github.com/Tangent128/luasdl2
|
||||
|
||||
comment "lua-sdl2 needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
2
bsp/buildroot/package/lua-sdl2/lua-sdl2.hash
Normal file
2
bsp/buildroot/package/lua-sdl2/lua-sdl2.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 cee7875106062fbc00cf8acb3b2738e336e2327df73ede011968cb060c094bfb lua-sdl2-v2.0.5-6.0.tar.gz
|
||||
39
bsp/buildroot/package/lua-sdl2/lua-sdl2.mk
Normal file
39
bsp/buildroot/package/lua-sdl2/lua-sdl2.mk
Normal file
@@ -0,0 +1,39 @@
|
||||
################################################################################
|
||||
#
|
||||
# lua-sdl2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LUA_SDL2_VERSION = v2.0.5-6.0
|
||||
LUA_SDL2_SITE = $(call github,Tangent128,luasdl2,$(LUA_SDL2_VERSION))
|
||||
LUA_SDL2_LICENSE = ISC
|
||||
LUA_SDL2_LICENSE_FILES = LICENSE
|
||||
LUA_SDL2_DEPENDENCIES = luainterpreter sdl2
|
||||
|
||||
LUA_SDL2_CONF_OPTS += -DWITH_LUAVER=user -DLUA_INCLUDE_DIR=$(STAGING_DIR)/usr/include
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y)
|
||||
LUA_SDL2_DEPENDENCIES += sdl2_image
|
||||
else
|
||||
LUA_SDL2_CONF_OPTS += -DWITH_IMAGE=Off
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL2_MIXER),y)
|
||||
LUA_SDL2_DEPENDENCIES += sdl2_mixer
|
||||
else
|
||||
LUA_SDL2_CONF_OPTS += -DWITH_MIXER=Off
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL2_NET),y)
|
||||
LUA_SDL2_DEPENDENCIES += sdl2_net
|
||||
else
|
||||
LUA_SDL2_CONF_OPTS += -DWITH_NET=Off
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL2_TTF),y)
|
||||
LUA_SDL2_DEPENDENCIES += sdl2_ttf
|
||||
else
|
||||
LUA_SDL2_CONF_OPTS += -DWITH_TTF=Off
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user