From patchwork Thu Jul 2 15:25:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1321561 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=crapouillou.net header.i=@crapouillou.net header.a=rsa-sha256 header.s=mail header.b=waSr0VLR; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49yMQT1hw1z9sDX for ; Fri, 3 Jul 2020 01:26:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0EFA08A6A9; Thu, 2 Jul 2020 15:26:53 +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 7K3AgG3Z5lvd; Thu, 2 Jul 2020 15:26:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7CCE88A695; Thu, 2 Jul 2020 15:26:51 +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 4319C1BF989 for ; Thu, 2 Jul 2020 15:26:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 341CB8A150 for ; Thu, 2 Jul 2020 15:26:09 +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 WK78mHXabwQ8 for ; Thu, 2 Jul 2020 15:26:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from crapouillou.net (outils.crapouillou.net [89.234.176.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5F8C28B061 for ; Thu, 2 Jul 2020 15:26:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1593703557; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J6b0Iw0wWlBXrHha6UdXg3ArqxqpV1dJ1Q5yFzPuplA=; b=waSr0VLREkfkbcaGPU5Tz0p/ONvAWcBPsPnrjpJGRosGl1ZoNKWIEDEVsKc90SDZFTLB9C /KvBXXE5qsgXmpcT883LhRM3hSEYugsZ4iX2RbAXAGQ6gjSFxNs9U4v+WZAuCtbfnwrOCn y9xGZRA6PV6z14+v4Q617jmVHu/2DT0= From: Paul Cercueil To: buildroot@busybox.net Date: Thu, 2 Jul 2020 17:25:47 +0200 Message-Id: <20200702152547.258093-2-paul@crapouillou.net> In-Reply-To: <20200702152547.258093-1-paul@crapouillou.net> References: <20200702152547.258093-1-paul@crapouillou.net> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] sdl_mixer: add MIDI support using Timidity 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: Paul Cercueil Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add MIDI playback support using SDL_mixer' built-in Timidity synth. Signed-off-by: Paul Cercueil --- package/sdl_mixer/Config.in | 10 ++++++++++ package/sdl_mixer/sdl_mixer.mk | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in index 42dfe63c0a..a886b7c1ac 100644 --- a/package/sdl_mixer/Config.in +++ b/package/sdl_mixer/Config.in @@ -9,3 +9,13 @@ config BR2_PACKAGE_SDL_MIXER SMPEG MP3 libraries. http://www.libsdl.org/projects/SDL_mixer/ + +if BR2_PACKAGE_SDL_MIXER + +config BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY + bool "MIDI support with built-in Timidity synth" + help + Support MIDI audio using the built-in synth based on Timidity. + You will need MIDI instruments installed in the filesystem. + +endif diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index a35b184a23..c415f837b1 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -24,11 +24,18 @@ SDL_MIXER_CONF_OPTS = \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --disable-music-midi \ --disable-music-native-midi \ - --disable-music-timidity-midi \ --disable-music-mod \ --disable-music-mp3 \ --disable-music-flac # configure script fails when cross compiling +ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y) +SDL_MIXER_CONF_OPTS += \ + --enable-music-midi \ + --enable-music-timidity-midi +else +SDL_MIXER_CONF_OPTS += --disable-music-timidity-midi +endif + ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y) SDL_MIXER_DEPENDENCIES += fluidsynth SDL_MIXER_CONF_OPTS += \