From patchwork Thu Jul 13 12:40:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 787706 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 3x7b644tKnz9ryk for ; Thu, 13 Jul 2017 22:41:16 +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="gIW0QSoy"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 494908A27C; Thu, 13 Jul 2017 12:41:12 +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 t-MRL0esCIUc; Thu, 13 Jul 2017 12:41:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6910D8A28C; Thu, 13 Jul 2017 12:41:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 30ACD1BFB1F for ; Thu, 13 Jul 2017 12:41:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A97788BBD for ; Thu, 13 Jul 2017 12:41:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f+Px54V0-Kg8 for ; Thu, 13 Jul 2017 12:41:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 613038855B for ; Thu, 13 Jul 2017 12:41:02 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id 77so9143643wrb.3 for ; Thu, 13 Jul 2017 05:41:02 -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=LyAPAUB9QGnr8DhvcJxC4bDCSKotsx7mHhL2sfm+A1c=; b=gIW0QSoyJ3TflZppJ7MYG5u2xuo9ZHzV9FhNBtHzLuEumG2etb4kmPvRqUk8DxeOP9 CnHl5jIua3ZEahSWOmVS2esH54utoXsvv2UvskQz/Dxz8vd0U9ec7uqaMtzseOPN1Fa8 F7OrrNr40E85OLM8hks8AB+zuvTPgnveJrL5ZVRYuztA7T3w6LMLHBCjZ0PIBan+NfKW eNpEVtDz4I94ocETpp8TD37CSDMllg3fEwezttLF+rX7gcvKYSA9H234+piMcTCvCFdX ITUZ2mXQcueZKGTkyPJa8PxB7sbcQ6+8HiCBlFhKtJND6JDB2vNDD2gqgzo+uZqJD4MN m+tQ== 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=LyAPAUB9QGnr8DhvcJxC4bDCSKotsx7mHhL2sfm+A1c=; b=Eet9VWoT9UGWUF9b325sFT7HWcwtKw+5D208jTAImlH+0AEfTYYL4HahV2K9rBXqdH j6ZvVkK2ZqyGopF84IvXiRyKNWaRxim8e7PwZANEfrNyyw1QLMFtVKyVzRIqERFIxhJc fJpuBxZJbgFYOUtIMtikDyi6Z774xi2dIWmiFIb+icm8KP0vSDxKTxgEuHpAQSOZjbc2 ePVgOfj59tysBi8mG0eds91GhyZnmjO1+Z5a+niTf2T5BeKDpF4T8Jux3neoPSc/0Gpp 4kw7lAcAsGJcvBeF/XBfBIUPgn/3Onn+aKawJzbWn+7A9lCtdUgyLwiJbiJrP8CE+bis PQyQ== X-Gm-Message-State: AIVw112dmJYWy68FUDw1yhVl307/BTTXcEhgC+Z8Cd77zk5V/rMcQLta vvnb4gaiHhIAAl25DE0= X-Received: by 10.223.164.23 with SMTP id d23mr1519189wra.58.1499949660782; Thu, 13 Jul 2017 05:41:00 -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 67sm110047wrc.34.2017.07.13.05.41.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 05:41:00 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 14:40:47 +0200 Message-Id: <20170713124052.13708-5-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170713124052.13708-1-romain.naour@gmail.com> References: <20170713124052.13708-1-romain.naour@gmail.com> Cc: Romain Naour Subject: [Buildroot] [PATCH v3 05/10] package/minetest: enable sound support 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" Signed-off-by: Romain Naour --- v3: Add comment in Config.in (ThomasP) --- package/minetest/Config.in | 13 +++++++++++++ package/minetest/minetest.mk | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/package/minetest/Config.in b/package/minetest/Config.in index a76c319..4e8b1d0 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -37,6 +37,19 @@ config BR2_PACKAGE_MINETEST_SERVER help Build Minetest server. +config BR2_PACKAGE_MINETEST_SOUND + bool "enable sound" + depends on BR2_PACKAGE_MINETEST_CLIENT + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal + select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_OPENAL + +comment "sound support needs a toolchain w/ threads NPTL" + depends on BR2_PACKAGE_MINETEST_CLIENT + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + endif comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads" diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 528f140..44a28ce 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ - -DENABLE_SOUND=OFF \ -DENABLE_GLES=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ @@ -38,6 +37,13 @@ else MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF endif +ifeq ($(BR2_PACKAGE_MINETEST_SOUND),y) +MINETEST_DEPENDENCIES += libvorbis openal +MINETEST_CONF_OPTS += -DENABLE_SOUND=ON +else +MINETEST_CONF_OPTS += -DENABLE_SOUND=OFF +endif + ifeq ($(BR2_PACKAGE_FREETYPE),y) MINETEST_DEPENDENCIES += freetype MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON