Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -0,0 +1,35 @@
|
||||
From 73e56ba8e91b6bae59220e6f25c1b7c15817edb5 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sun, 12 Feb 2017 21:17:44 +0100
|
||||
Subject: [PATCH] ImageIO: fix invalid conversion
|
||||
|
||||
Fixes:
|
||||
Source/Utils/ImageIO.cpp:125:27: error: invalid conversion from 'int' to 'boolean' [-fpermissive]
|
||||
cinfo.quantize_colors = 0;
|
||||
^
|
||||
|
||||
quantize_colors type is bool, so it must be initialized to TRUE or FALSE.
|
||||
|
||||
Patch status: upsteam
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
Source/Utils/ImageIO.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/Utils/ImageIO.cpp b/Source/Utils/ImageIO.cpp
|
||||
index 706c201..c19a63e 100644
|
||||
--- a/Source/Utils/ImageIO.cpp
|
||||
+++ b/Source/Utils/ImageIO.cpp
|
||||
@@ -122,7 +122,7 @@ static bool load_jpg(const char* file_name, ImageRec& tex)
|
||||
(void)jpeg_read_header(&cinfo, TRUE);
|
||||
|
||||
cinfo.out_color_space = JCS_RGB;
|
||||
- cinfo.quantize_colors = 0;
|
||||
+ cinfo.quantize_colors = FALSE;
|
||||
(void)jpeg_calc_output_dimensions(&cinfo);
|
||||
(void)jpeg_start_decompress(&cinfo);
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From 5a0c9f6358169b447840acdb721250ce932cb180 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Erik Werner <martinerikwerner@gmail.com>
|
||||
Date: Wed, 8 Mar 2017 22:51:16 +0100
|
||||
Subject: [PATCH] Fix mismatched usage length, build fail on g++
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The length of const option::Descriptor usage[] is intended to be
|
||||
inferred based on the initialisation in Source/main.cpp, however, the
|
||||
extern declaration in Source/Game.hpp hard-codes it to 13.
|
||||
|
||||
Remove the hard-coded 13 in the extern declaration, in favour of the
|
||||
inferred length.
|
||||
|
||||
This also fixes the follwoing build failure with g++ (Debian 4.9.2-10)
|
||||
4.9.2:
|
||||
(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::index’
|
||||
};
|
||||
^
|
||||
(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::index’ [-Wmissing-field-initializers]
|
||||
(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::type’
|
||||
(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::type’ [-Wmissing-field-initializers]
|
||||
(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::shortopt’
|
||||
(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::shortopt’ [-Wmissing-field-initializers]
|
||||
(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::longopt’
|
||||
(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::longopt’ [-Wmissing-field-initializers]
|
||||
(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::check_arg’
|
||||
(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::check_arg’ [-Wmissing-field-initializers]
|
||||
(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::help’ [-Wmissing-field-initializers]
|
||||
CMakeFiles/lugaru.dir/build.make:54: recipe for target 'CMakeFiles/lugaru.dir/Source/main.cpp.o' failed
|
||||
|
||||
Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
|
||||
|
||||
[Romain: backport to v1.2]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
|
||||
(cherry picked from commit dd685fe9080c2853422d8272792691358ea07dfc)
|
||||
---
|
||||
Source/Game.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/Game.hpp b/Source/Game.hpp
|
||||
index 51232cc..9bb6adb 100644
|
||||
--- a/Source/Game.hpp
|
||||
+++ b/Source/Game.hpp
|
||||
@@ -234,7 +234,7 @@ enum optionIndex
|
||||
/* Number of options + 1 */
|
||||
const int commandLineOptionsNumber = 10;
|
||||
|
||||
-extern const option::Descriptor usage[13];
|
||||
+extern const option::Descriptor usage[];
|
||||
|
||||
extern option::Option commandLineOptions[commandLineOptionsNumber];
|
||||
extern option::Option* commandLineOptionsBuffer;
|
||||
--
|
||||
2.9.4
|
||||
|
||||
38
bsp/buildroot/package/lugaru/Config.in
Normal file
38
bsp/buildroot/package/lugaru/Config.in
Normal file
@@ -0,0 +1,38 @@
|
||||
config BR2_PACKAGE_LUGARU
|
||||
bool "lugaru"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_HAS_LIBGL # libglu
|
||||
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX)
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
|
||||
depends on BR2_USE_MMU # SDL2 OpenGL (GLX)
|
||||
depends on !BR2_STATIC_LIBS # SDL2
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_LIBGLU # GL/glu.h
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_LIBVORBIS
|
||||
select BR2_PACKAGE_OPENAL
|
||||
select BR2_PACKAGE_SDL2
|
||||
select BR2_PACKAGE_SDL2_OPENGL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Lugaru (pronounced Loo-GAH-roo) is a cross-platform
|
||||
third-person action game. The main character, Turner, is an
|
||||
anthropomorphic rebel bunny rabbit with impressive combat
|
||||
skills. In his quest to find those responsible for
|
||||
slaughtering his village, he uncovers a far-reaching
|
||||
conspiracy involving the corrupt leaders of the rabbit
|
||||
republic and the starving wolves from a nearby den. Turner
|
||||
takes it upon himself to fight against their plot and save
|
||||
his fellow rabbits from slavery.
|
||||
|
||||
https://osslugaru.gitlab.io/
|
||||
|
||||
comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.7, NPTL, dynamic library"
|
||||
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
BR2_STATIC_LIBS
|
||||
2
bsp/buildroot/package/lugaru/lugaru.hash
Normal file
2
bsp/buildroot/package/lugaru/lugaru.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 lugaru-1.2.tar.xz
|
||||
30
bsp/buildroot/package/lugaru/lugaru.mk
Normal file
30
bsp/buildroot/package/lugaru/lugaru.mk
Normal file
@@ -0,0 +1,30 @@
|
||||
################################################################################
|
||||
#
|
||||
# lugaru
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LUGARU_VERSION = 1.2
|
||||
LUGARU_SITE = https://bitbucket.org/osslugaru/lugaru/downloads
|
||||
LUGARU_SOURCE = lugaru-$(LUGARU_VERSION).tar.xz
|
||||
|
||||
LUGARU_LICENSE = GPL-2.0+, CC-BY-SA-3.0 (Wolfire and Slib assets), \
|
||||
CC-BY-SA-4.0 (OSS Lugaru, Jendraz and Philtron R. assets)
|
||||
LUGARU_LICENSE_FILES = COPYING.txt CONTENT-LICENSE.txt
|
||||
|
||||
LUGARU_DEPENDENCIES = host-pkgconf jpeg libgl libglu libpng libvorbis \
|
||||
openal sdl2 zlib
|
||||
|
||||
# Avoid incompatible posix_memalign declaration on x86 and x86_64 with
|
||||
# musl.
|
||||
# https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_i386)$(BR2_x86_64),y:y)
|
||||
define LUGARU_REMOVE_PEDANTIC
|
||||
$(SED) 's% -pedantic%%' $(@D)/CMakeLists.txt
|
||||
endef
|
||||
LUGARU_POST_PATCH_HOOKS += LUGARU_REMOVE_PEDANTIC
|
||||
endif
|
||||
|
||||
LUGARU_CONF_OPTS = -DSYSTEM_INSTALL=ON
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user