From patchwork Thu Jul 13 13:04:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 787717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7bdq0MGjz9ryk for ; Thu, 13 Jul 2017 23:05:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LAC9sCku"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A1A8E8A2AD; Thu, 13 Jul 2017 13:05:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UKORCSHWytPN; Thu, 13 Jul 2017 13:05:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0A21E8A2CB; Thu, 13 Jul 2017 13:05:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7AF4F1C1777 for ; Thu, 13 Jul 2017 13:05:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1360089F7E for ; Thu, 13 Jul 2017 13:05:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JQB7Mfet2yjH for ; Thu, 13 Jul 2017 13:05:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id C496C8A2AC for ; Thu, 13 Jul 2017 13:04:59 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id k67so9192338wrc.1 for ; Thu, 13 Jul 2017 06:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y0GKHD66sLEgAr6+L3+ongsRVxcFUchTu4c13MUDfiI=; b=LAC9sCkuKbaKh3P4hQ6jPzUM1JWc7I3z5BJthiOW5npzY8Bu16+LG9EvylPmpZ2tWH sYIlqiClEOCcD1Oclatqh0b3dWRy6rU6Fd/BSTz3Znw9DlQkCD9qSTtHTPrm3Kj2UiTA 2g8ZxN1glp4M/zpQoYaMmJrP7FbCbUS9D9pq0dnBXVNeFLcsM6AEDKgmaSvVPsNexq2J zz6/0u6S//cWu70Qalt4gdZS7mGkq2vUbWV1axihsxPNvS+UhvXHSZO88GiUpf4IrcAM +X+TMaCxOtukV0bly76QyrrOsNu4F9CMMe0n1X5hf7d3zeGtR1FDukC4dFs5pIRU5Neh LgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y0GKHD66sLEgAr6+L3+ongsRVxcFUchTu4c13MUDfiI=; b=RC+zm981en0Q0C4Df/jxaHdUIPcTPxIwafua+bVlwI7gTvmlQACuFC7CCy5VqVPlmd Kj3S2oqxVLgQl37zeCiUB9CTSOdvPLFg9wF5HsfxM40YQE2GFytk1bl9wttbgYRh1fOf cJS89ZMikh9pkXdrTba8FYHN/Tg3n36ttSbOwatsruYNNA7cN7QQTFJuqz+b4X5Gtq// I5yNyS+7D1UTnZEf1KeqJTlABTJDDXqlYyWBGKNQ7pwSG/AOcQf8DWW03h8XfIW/8Lhz BAlNz7XahuF5sIilt1Ime0426pCmOWkRaCibuL4FYTqOrOL7239nLWafpsSriCoOtmMt xORQ== X-Gm-Message-State: AIVw112YUy16Qxxw2FOdxQ5EaNObmJuXWkN4TZeivjcOq5AYSDAEfHmN kTbCq9+Fz+iqt8zhvCI= X-Received: by 10.223.165.10 with SMTP id i10mr1563739wrb.59.1499951098071; Thu, 13 Jul 2017 06:04:58 -0700 (PDT) Received: from localhost.localdomain (gam75-1-81-57-22-125.fbx.proxad.net. [81.57.22.125]) by smtp.gmail.com with ESMTPSA id l14sm3124798wrb.19.2017.07.13.06.04.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 06:04:57 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 15:04:45 +0200 Message-Id: <20170713130445.28410-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170713130445.28410-1-romain.naour@gmail.com> References: <20170713130445.28410-1-romain.naour@gmail.com> Cc: Romain Naour Subject: [Buildroot] [PATCH v3 3/3] package/solarus: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Sample quest and testing quest are not included in SOLARUS_LICENSE since it's notinstalled by default. Remove Werror when building with debugging symbols. Signed-off-by: Romain Naour --- v2: add DEVELOPERS entry Add a note in help text about Salarus games Add license hash. --- DEVELOPERS | 1 + package/Config.in | 1 + package/solarus/0001-cmake-remove-Werror.patch | 27 ++++++++++++++++++++ package/solarus/Config.in | 34 ++++++++++++++++++++++++++ package/solarus/solarus.hash | 5 ++++ package/solarus/solarus.mk | 23 +++++++++++++++++ 6 files changed, 91 insertions(+) create mode 100644 package/solarus/0001-cmake-remove-Werror.patch create mode 100644 package/solarus/Config.in create mode 100644 package/solarus/solarus.hash create mode 100644 package/solarus/solarus.mk diff --git a/DEVELOPERS b/DEVELOPERS index 80c3dd2..57ba028 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1440,6 +1440,7 @@ F: package/mcelog/ F: package/openpowerlink/ F: package/physfs/ F: package/stress-ng/ +F: package/solarus/ F: package/supertux/ F: package/terminology/ F: package/upower/ diff --git a/package/Config.in b/package/Config.in index b48ab5e..78a9b0d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -233,6 +233,7 @@ menu "Games" source "package/prboom/Config.in" source "package/rubix/Config.in" source "package/sl/Config.in" + source "package/solarus/Config.in" source "package/stella/Config.in" source "package/supertux/Config.in" source "package/supertuxkart/Config.in" diff --git a/package/solarus/0001-cmake-remove-Werror.patch b/package/solarus/0001-cmake-remove-Werror.patch new file mode 100644 index 0000000..b27908c --- /dev/null +++ b/package/solarus/0001-cmake-remove-Werror.patch @@ -0,0 +1,27 @@ +From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 22 Jun 2017 00:19:56 +0200 +Subject: [PATCH] cmake: remove Werror + +Signed-off-by: Romain Naour +--- + cmake/AddCompilationFlags.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake +index 5159ff9..a506033 100644 +--- a/cmake/AddCompilationFlags.cmake ++++ b/cmake/AddCompilationFlags.cmake +@@ -24,9 +24,6 @@ endif() + # Be less pedantic in release builds for users. + set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}") + +-# Be more pedantic in debug mode for developers. +-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}") +- + # Platform-specific flags. + if(WIN32) + # MinGW: disable the console by default. +-- +2.9.4 + diff --git a/package/solarus/Config.in b/package/solarus/Config.in new file mode 100644 index 0000000..0307ff0 --- /dev/null +++ b/package/solarus/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_SOLARUS + bool "solarus" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal + depends on !BR2_STATIC_LIBS # SDL2 + select BR2_PACKAGE_LIBMODPLUG + select BR2_PACKAGE_LIBOGG + select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_LUAJIT + select BR2_PACKAGE_OPENAL + select BR2_PACKAGE_PHYSFS + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_IMAGE + select BR2_PACKAGE_SDL2_TTF + help + Solarus is an open-source Zelda-like 2D game engine written + in C++. It can run games scripted in Lua. This engine is used + by Solarus Zelda fangames. + + Note: This package doesn't contain any game data file in it. + The user should provide these data files using an rootfs + overlay or using an custom external package. + + http://www.solarus-games.org + https://github.com/solarus-games/solarus + +comment "solarus needs a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/solarus/solarus.hash b/package/solarus/solarus.hash new file mode 100644 index 0000000..8ed5caf --- /dev/null +++ b/package/solarus/solarus.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 5930584e7c333089a2c1bf372ccc25ad3fb5c1d973189d2bf67f2308189af94d solarus-v1.5.3.tar.gz + +sha256 09cb24006b6a3f2698d8851dc5df4f413c1a98e20d4008bffd76ec236f14244d license.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 license_gpl.txt diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk new file mode 100644 index 0000000..af37f81 --- /dev/null +++ b/package/solarus/solarus.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# solarus +# +################################################################################ + +SOLARUS_VERSION = v1.5.3 +SOLARUS_SITE = $(call github,solarus-games,solarus,$(SOLARUS_VERSION)) + +SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \ + CC-BY-SA-3.0 (GUI icons) +SOLARUS_LICENSE_FILES = license.txt license_gpl.txt + +# Install libsolarus.so +SOLARUS_INSTALL_STAGING = YES + +SOLARUS_DEPENDENCIES = libmodplug libogg libvorbis luajit openal physfs sdl2 \ + sdl2_image sdl2_ttf + +# Disable launcher GUI (requires Qt5) +SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF + +$(eval $(cmake-package))