From patchwork Sun Dec 15 13:13:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1209915 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FBueku0g"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47bPwf3M9pz9sPJ for ; Mon, 16 Dec 2019 00:13:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 02A6F2041B; Sun, 15 Dec 2019 13:13:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JB7ujSQ07z6i; Sun, 15 Dec 2019 13:13:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2F91B203B4; Sun, 15 Dec 2019 13:13:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 94C8B1BF2A5 for ; Sun, 15 Dec 2019 13:13:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 92144203B4 for ; Sun, 15 Dec 2019 13:13:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1xOwjoJJhfsD for ; Sun, 15 Dec 2019 13:13:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by silver.osuosl.org (Postfix) with ESMTPS id C5438203AE for ; Sun, 15 Dec 2019 13:13:17 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id t2so3948999wrr.1 for ; Sun, 15 Dec 2019 05:13:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7nOzcwChWj4+6gjAYSxRT8ALLT+6joEwxDdC21HwYIo=; b=FBueku0gTPs+BmS5c2Vw5xU4Klson32AEYAnplkc2NpTqrYZfrjPbOQyL/iZYHnamE lOkwoI68b4ywFEbXvxxuiwPNT/vKSNloMtVN7kXG4mF5/XEa/5vrypE//oL9DeZ0UNDO 2NcuuXdxuRD/PUh6CoBH8aKOY1nx4EarKm6M4tIOJucj9GuLOLmKHfyc5L2U7V3tGOQN c8bc8B/TUiedNVWV0rVMkLwCUIK9MGprYHQjnlHpr1lnz08a7yCw0NE7Ld0eu6c5FXf+ MCE5fll2cN1qpjHfDG9AmVrwCGFkOGIgx22IXWE3x0EBw2mpkTiKw5YlyA11j2wTennP bofA== 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:mime-version :content-transfer-encoding; bh=7nOzcwChWj4+6gjAYSxRT8ALLT+6joEwxDdC21HwYIo=; b=FamcbPLYyqazMdn+agyi+A0JaOoFsyr06HT/TLiEyYRIMbcaVSRrzF49nT31mCgUVz Nw20RDJGJ3ie18V4awErbRb7+iTD6OqZUM48CipN5tsP/09mACogr2+/j/gghuqbLdR+ Uhf1w0CUJ5P/th4x2maynJeKaRiudPiqyYDWCTtjnIHZA8EK9eKZI8xDHD9oZjSlDDTe 1LJ5WeuyjVlY7wRdjzQmBy9lIKNanoQSZyCMdOR3HP3gXqtpzSF4cEm1KfwuB5ZFrg3m QS4nOrbh6O55Ixe2s6txIVFfaR5Z2xmE/Sb3o83/lPTbdCcd8b1a1fRRPjaiIS5RFiNB Jdpg== X-Gm-Message-State: APjAAAXzBChatFlO8r2Abu1XZNR2ezFG7mNQch15q61c9nNX3jcqSvy+ Aor4mM6cvj+IiVe+KAXQq6b6Ye2e X-Google-Smtp-Source: APXvYqx9UhfaPsOJxiTt4LX4lwuDksP9QRkZYQWIjFGrYLPKT1fneQauHugdTEfHgS03cUTgUBvJUQ== X-Received: by 2002:adf:df90:: with SMTP id z16mr26246445wrl.273.1576415596055; Sun, 15 Dec 2019 05:13:16 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id 2sm17826280wrq.31.2019.12.15.05.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 05:13:15 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 15 Dec 2019 14:13:56 +0100 Message-Id: <20191215131358.3637959-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3,1/3] package/solarus: bump to version 1.6.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Switch to gitlab to retrieve latest version Signed-off-by: Fabrice Fontaine --- Changes v2 -> v3: - Use tar.bz2 tarball Changes v1 -> v2 (after review of Thomas Petazzoni): - Fix SOLARUS_SITE (missing '-/' in URL) package/solarus/solarus.hash | 2 +- package/solarus/solarus.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/solarus/solarus.hash b/package/solarus/solarus.hash index dab8d1a1fa..3092b13507 100644 --- a/package/solarus/solarus.hash +++ b/package/solarus/solarus.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751 solarus-1.6.0-src.tar.gz +sha256 c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b solarus-v1.6.2.tar.bz2 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk index fd7bbea2c7..c1c2519693 100644 --- a/package/solarus/solarus.mk +++ b/package/solarus/solarus.mk @@ -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.2 +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) From patchwork Sun Dec 15 13:13:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1209916 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="igqSJvKe"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47bPwl5J9Kz9sPJ for ; Mon, 16 Dec 2019 00:13:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 713622043F; Sun, 15 Dec 2019 13:13:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mUxP-ROMVd9x; Sun, 15 Dec 2019 13:13:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 05A782044F; Sun, 15 Dec 2019 13:13:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 127E31BF2A5 for ; Sun, 15 Dec 2019 13:13:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0F67A85725 for ; Sun, 15 Dec 2019 13:13:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dR5Dio8kosQG for ; Sun, 15 Dec 2019 13:13:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 17CE085660 for ; Sun, 15 Dec 2019 13:13:20 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z3so3935586wru.3 for ; Sun, 15 Dec 2019 05:13:20 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=H5mBZt97uKADCyDxfBRsKpjl8Wzq8G2rzugQTY9KH4U=; b=igqSJvKeN4vQQDPiIsPIeNXD94NuENtGmAkxulOpemEUQGStmvId5b4RGJAYwScnL9 UDh7Nbgz12BVJZrWkn0eMV69UMsj76NCVNqGVHwUMJjT+lrtRD5YA3XabgZP1vnRitp3 ASmft7zlXyzd1NnbKxuba3DsrqPNOVHcJLhbCGCphBAVcpNrFzPxqnuO9amD+RZGV/6g rFgpDvtNSUjV1t+nXfRJzm5DDyu277AfLFdUtMgfP0XhpRMTEPcnk1gvEnYm+cZI0mNT S97l+1+4A+hMeT2AxKQSeXJELBuOyVQfc85NQgZaSR0EY7SKbbST/PU/j3UcT2A5Z4xa e0EA== 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:mime-version:content-transfer-encoding; bh=H5mBZt97uKADCyDxfBRsKpjl8Wzq8G2rzugQTY9KH4U=; b=CXcH1UJ28kyqNdFoiFx1YH0oZXJm4uLP6p01Cm26OBwiUVQYAuNWHIY9FrZZAP0CPZ 1B3eHAH0MgOgDoRfkZ/PpbsufXjVahSK/7miLU5wAF2MC+wvJ/cllk0RTveK6x5y4Lev rEnnbGrQJ2a54FYDmxFmLfJQ7ErVKOib77MFgKw0VLzAlIn5IC8jETXMzzzWwW1UjhUJ 6sztrrsOh598nhjntWz1B1gfUhEI/kdEP3N4tLdQNB2yiiXnhzdh6oOGn9Y3qtO+wnQH umcbigzz7FU87iE51sc1soOifmWYXb7jedUiLKiEmq3qInoe4NfAJ9l6jI493cAGaoVl m86Q== X-Gm-Message-State: APjAAAWbMLNsX1FcfSymH5c77Qi51uYS+3VYEylDJ5NZYiT6mG9diXUL WeC2w+fXMCUsNkD5SW62+s9Bzj+O X-Google-Smtp-Source: APXvYqxKD23mPtCygP49JI5bXkgPhO6O+5qCxd8W85m4Hb6oNzlInEAfEf7riwZ7hUPogzX9LHhTRQ== X-Received: by 2002:a5d:4044:: with SMTP id w4mr24554722wrp.322.1576415598049; Sun, 15 Dec 2019 05:13:18 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id 2sm17826280wrq.31.2019.12.15.05.13.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 05:13:17 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 15 Dec 2019 14:13:57 +0100 Message-Id: <20191215131358.3637959-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191215131358.3637959-1-fontaine.fabrice@gmail.com> References: <20191215131358.3637959-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3, 2/3] package/solarus: allow building with lua 5.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Build with lua 5.1 has been fixed since version 1.6.1 and https://gitlab.com/solarus-games/solarus/commit/611f81a90d42692e986c78c67090541ffd1c5973 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Romain Naour and Peter Korsgaard): - Update commit title - Move lua dependency under !BR2_PACKAGE_LUAJIT statement package/solarus/Config.in | 9 ++++----- package/solarus/solarus.mk | 10 +++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/solarus/Config.in b/package/solarus/Config.in index 359ad15e02..290d5a756c 100644 --- a/package/solarus/Config.in +++ b/package/solarus/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT 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 @@ -11,7 +11,6 @@ config BR2_PACKAGE_SOLARUS 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 +24,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, a Lua 5.1 interpreter and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" 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 \ - || !BR2_PACKAGE_HAS_LIBGL + || !BR2_PACKAGE_HAS_LIBGL \ + || !(BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT) diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk index c1c2519693..d522128c33 100644 --- a/package/solarus/solarus.mk +++ b/package/solarus/solarus.mk @@ -16,10 +16,18 @@ SOLARUS_LICENSE_FILES = license.txt # Install libsolarus.so SOLARUS_INSTALL_STAGING = YES -SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \ +SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \ sdl2_image sdl2_ttf # Disable launcher GUI (requires Qt5) SOLARUS_CONF_OPTS = -DSOLARUS_GUI=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)) From patchwork Sun Dec 15 13:13:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1209917 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c7JZWVOg"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47bPwn5zkrz9sPJ for ; Mon, 16 Dec 2019 00:13:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DC22C85A4B; Sun, 15 Dec 2019 13:13:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wkRooLAR0tK7; Sun, 15 Dec 2019 13:13:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AE02A85725; Sun, 15 Dec 2019 13:13:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4AB221BF2A5 for ; Sun, 15 Dec 2019 13:13:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 44E6420478 for ; Sun, 15 Dec 2019 13:13:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cn+8PojEQXTu for ; Sun, 15 Dec 2019 13:13:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by silver.osuosl.org (Postfix) with ESMTPS id 6A9142041E for ; Sun, 15 Dec 2019 13:13:21 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id d16so3911690wre.10 for ; Sun, 15 Dec 2019 05:13:21 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=rANlheIbidP3X6rJGGoE6BmN2YxSoHi8jpK/hFRHtZA=; b=c7JZWVOgTg6TLmoyxW8YPx9lOBgACg0U4hpEec6CoxAgNpQJvhckBvDDegmZKQgRVC YkRQe1pVgcSHCxFBnbWjGEck7ScJzO4mkiImGqZjzMoVMYnsLO4R5+3VGQaNKaMkzPxe ThU1OpFCH6ApwtSPmj98Kowc7UgnWYvxz0FL1L+FARK7ltEHogpdglmenzkJ1S36+SQ4 +AQ10yRu1AwVaA1rWWtGzN+6x5ysnY2Zy9n0yQ5p4FByp41XX1sgPVTRUz7t1FCehrdQ AL4B0nuYUz7LX/v29SGIgBDN3ssrT7CMDL6/N1rBcEcSlzosJCxRA+jvXW4Q8yStOTlo /zug== 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:mime-version:content-transfer-encoding; bh=rANlheIbidP3X6rJGGoE6BmN2YxSoHi8jpK/hFRHtZA=; b=ordJROFb9D36KJ8QxyOc2ySTmWxjrJI9G1qhjSXGsJzzNNLgeODzp46vv6MZ/AW5oh V+OJhqpJkIi/l1OmLgDGdfXncE5GE9KxE5IS/QA1ZPLIr6WK7yXYM4GrYUrC5vCMihfU GUS4DMdxbDNn4E765O3tGk3s+sod+Z1frtkRvKR7ZnDKjTelr/CiXkvBx7wORYQS4crJ nFg+K8if5s43YdHHYYFqWgBq4jNKXtXiHOXyAZJxLeX4nqZyLLsLhYW9KSIu5xwNA9Zy yHspK0IqnleZTECh1TBtIGQiNxVFptt69e1BwETS8c9RYkpjVC5nCkH2yurjAKVudv/N cIww== X-Gm-Message-State: APjAAAUnPJvT6IauQGmA4imwoRLVFJkaI7QnLITrtHP9kvsL/ZSdChNP Crj0CRIoTv8EHH4GGSyBl6ue0CvP X-Google-Smtp-Source: APXvYqyDVhtxqDwUDePHQHAaRllnh3aQyS0IE8FlW3Uqr7GO735uqCk77Qhh7VqdxvnFJvK5b9dRFw== X-Received: by 2002:a5d:6350:: with SMTP id b16mr25130187wrw.132.1576415599694; Sun, 15 Dec 2019 05:13:19 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id 2sm17826280wrq.31.2019.12.15.05.13.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 05:13:19 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 15 Dec 2019 14:13:58 +0100 Message-Id: <20191215131358.3637959-3-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191215131358.3637959-1-fontaine.fabrice@gmail.com> References: <20191215131358.3637959-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3,3/3] package/solarus: disable tests X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Set -DSOLARUS_TESTS=OFF to disable tests (option added in version 1.6.1 with: https://gitlab.com/solarus-games/solarus/commit/1829189c6050e36086b12c3806932e8657265467) Reviewed-by: Romain Naour Signed-off-by: Fabrice Fontaine --- package/solarus/solarus.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk index d522128c33..6f5853e909 100644 --- a/package/solarus/solarus.mk +++ b/package/solarus/solarus.mk @@ -20,7 +20,9 @@ SOLARUS_DEPENDENCIES = 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