iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/solarus/Config.in
View File

@@ -1,17 +1,17 @@
config BR2_PACKAGE_SOLARUS
bool "solarus"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
depends on !BR2_STATIC_LIBS # SDL2
depends on BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_GLM
select BR2_PACKAGE_LIBMODPLUG
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBPNG # runtime
select BR2_PACKAGE_LIBVORBIS
select BR2_PACKAGE_LUAJIT
select BR2_PACKAGE_OPENAL
select BR2_PACKAGE_PHYSFS
select BR2_PACKAGE_SDL2
@@ -25,9 +25,9 @@ config BR2_PACKAGE_SOLARUS
http://www.solarus-games.org
https://github.com/solarus-games/solarus
comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1"
depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_PACKAGE_HAS_LIBGL

4
package/solarus/solarus.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated
sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751 solarus-1.6.0-src.tar.gz
sha256 b2e00a7df8953903ba022a8f392038e86f675cee714da19cf9a5f8535c42f349 solarus-v1.6.4.tar.bz2
sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt
sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt

23
package/solarus/solarus.mk
View File

@@ -4,9 +4,10 @@
#
################################################################################
SOLARUS_VERSION = 1.6.0
SOLARUS_SITE = http://www.solarus-games.org/downloads/solarus
SOLARUS_SOURCE = solarus-$(SOLARUS_VERSION)-src.tar.gz
SOLARUS_VERSION = 1.6.4
SOLARUS_SITE = \
https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION)
SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.bz2
SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
CC-BY-SA-3.0 (GUI icons)
@@ -15,10 +16,20 @@ SOLARUS_LICENSE_FILES = license.txt
# Install libsolarus.so
SOLARUS_INSTALL_STAGING = YES
SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \
sdl2_image sdl2_ttf
SOLARUS_DEPENDENCIES = glm libgl libmodplug libogg libvorbis openal physfs \
sdl2 sdl2_image sdl2_ttf
# Disable launcher GUI (requires Qt5)
SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF
SOLARUS_CONF_OPTS = \
-DSOLARUS_GUI=OFF \
-DSOLARUS_TESTS=OFF
ifeq ($(BR2_PACKAGE_LUAJIT),y)
SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=ON
SOLARUS_DEPENDENCIES += luajit
else
SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=OFF
SOLARUS_DEPENDENCIES += lua
endif
$(eval $(cmake-package))