From patchwork Mon Dec 9 19:15:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1206561 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=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.b="api/4NS3"; 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 47WtGJ6zrwz9s4Y for ; Tue, 10 Dec 2019 06:16:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 48A0886911; Mon, 9 Dec 2019 19:16: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 iwFuD2wEv3Kg; Mon, 9 Dec 2019 19:16:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0A18F868A6; Mon, 9 Dec 2019 19:16:19 +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 A8FE91BF380 for ; Mon, 9 Dec 2019 19:16:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A22B587770 for ; Mon, 9 Dec 2019 19:16:17 +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 VLNiLSJZa-EY for ; Mon, 9 Dec 2019 19:16:16 +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 3829186ACD for ; Mon, 9 Dec 2019 19:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1575918968; 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:references; bh=nrWJvAVrj2/dLrkUwEbnH5a46ZZE9U5IOpkRoRNE5+w=; b=api/4NS3EhA/F9AzsrUqFORUTSa5NMJdRLIX+mz46MpCvTSuEl9zSleCqKwtwVJQiSHOJf 7Xa7TfyKg995uWorwrRjJ/1ZisDh9LjjR5zo5cDGPnFqNL+kuqj10jzTkbFZ1Bgulpn0rC yXJaFdeafuj6J2ZY9mSMzFqbXClwslk= From: Paul Cercueil To: buildroot@busybox.net Date: Mon, 9 Dec 2019 20:15:53 +0100 Message-Id: <20191209191554.821230-1-paul@crapouillou.net> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis 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 , od@zcrc.me Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add a menu option to set the Vorbis decoding library to Tremor instead of libvorbis. Signed-off-by: Paul Cercueil --- package/sdl_mixer/Config.in | 13 +++++++++++++ package/sdl_mixer/sdl_mixer.mk | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in index 42dfe63c0a..94fcda7a0e 100644 --- a/package/sdl_mixer/Config.in +++ b/package/sdl_mixer/Config.in @@ -9,3 +9,16 @@ 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_USE_TREMOR + bool "Prefer Tremor for Vorbis decoding" + select BR2_PACKAGE_TREMOR + help + Prefer Tremor over libvorbis for Vorbis decoding. + Tremor is a fixed-point implementation of an Ogg Vorbis + decoder. Choose this option if the target CPU has no + FPU. + +endif diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index 9183a4aa8c..3159d0dee1 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -35,11 +35,16 @@ else SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl endif +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y) +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor +SDL_MIXER_DEPENDENCIES += tremor +else ifeq ($(BR2_PACKAGE_LIBVORBIS),y) SDL_MIXER_CONF_OPTS += --enable-music-ogg SDL_MIXER_DEPENDENCIES += libvorbis else SDL_MIXER_CONF_OPTS += --disable-music-ogg endif +endif $(eval $(autotools-package)) From patchwork Mon Dec 9 19:15:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1206562 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.b="jHcTyo/S"; 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 47WtGP3hkVz9s4Y for ; Tue, 10 Dec 2019 06:16:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F256387F52; Mon, 9 Dec 2019 19:16:25 +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 EnzJFbr6U9Z2; Mon, 9 Dec 2019 19:16:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E622C87F5D; Mon, 9 Dec 2019 19:16:24 +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 50FDD1BF380 for ; Mon, 9 Dec 2019 19:16:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4BC0586ACD for ; Mon, 9 Dec 2019 19:16:24 +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 TDP0S+0rmnIZ for ; Mon, 9 Dec 2019 19:16:23 +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 86C5A87770 for ; Mon, 9 Dec 2019 19:16:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1575918973; 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=4GnlgtMeU4lKQj/pJWizAf4kkA0U2gE1kX/unCXOVuQ=; b=jHcTyo/ST3udqwX7x+CeREK3N25kHBOO0ywVWr0Pzti2gUH1qBm8xaPgshvAvWiBQLcX3F Wx+xJn5zEl8Kxau4b0u9BgFVu6y5dVIqo0/HTSzMxCwBeRvhhrbWibtlMhXZ0guuFWdA3+ YcJFxpwI5g7EE8x/QUPr1jdmjbg7Ytw= From: Paul Cercueil To: buildroot@busybox.net Date: Mon, 9 Dec 2019 20:15:54 +0100 Message-Id: <20191209191554.821230-2-paul@crapouillou.net> In-Reply-To: <20191209191554.821230-1-paul@crapouillou.net> References: <20191209191554.821230-1-paul@crapouillou.net> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] SDL_mixer: Add support for libmodplug 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 , od@zcrc.me Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add support for playing back tracker modules using libmodplug. Signed-off-by: Paul Cercueil --- .../0003-Fix-include-of-modplug.h.patch | 33 +++++++++++++++++++ package/sdl_mixer/sdl_mixer.mk | 7 ++++ 2 files changed, 40 insertions(+) create mode 100644 package/sdl_mixer/0003-Fix-include-of-modplug.h.patch diff --git a/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch b/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch new file mode 100644 index 0000000000..841cef4ef5 --- /dev/null +++ b/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch @@ -0,0 +1,33 @@ +From fb8e7c535a88838cc8ae364cd2a099df6316d3b0 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Tue, 30 Apr 2019 23:12:15 +0200 +Subject: [PATCH] Fix include of modplug.h + +The include path should be , since the library +doesn't provide any specific include path in its pkg-config file. + +This patch was obtained from this bug report: +https://bugzilla.libsdl.org/show_bug.cgi?id=4893 + +Signed-off-by: Paul Cercueil + +--- + music_modplug.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/music_modplug.h b/music_modplug.h +index 92cbafd..49abbb0 100644 +--- a/music_modplug.h ++++ b/music_modplug.h +@@ -1,6 +1,7 @@ + #ifdef MODPLUG_MUSIC + +-#include "modplug.h" ++#include ++ + #include "SDL_rwops.h" + #include "SDL_audio.h" + #include "SDL_mixer.h" +-- +2.21.0.593.g511ec345e18 + diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index 3159d0dee1..1692054bd4 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -35,6 +35,13 @@ else SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl endif +ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) +SDL_MIXER_CONF_OPTS += --enable-music-mod-modplug +SDL_MIXER_DEPENDENCIES += libmodplug +else +SDL_MIXER_CONF_OPTS += --disable-music-mod-modplug +endif + ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y) SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor SDL_MIXER_DEPENDENCIES += tremor