* [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support
@ 2020-07-02 15:25 Paul Cercueil
2020-07-02 15:25 ` [Buildroot] [PATCH 2/2] sdl_mixer: add MIDI support using Timidity Paul Cercueil
2020-07-12 13:56 ` [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Thomas Petazzoni
0 siblings, 2 replies; 6+ messages in thread
From: Paul Cercueil @ 2020-07-02 15:25 UTC (permalink / raw)
To: buildroot
Add support for MIDI playback using FluidSynth.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
package/sdl_mixer/sdl_mixer.mk | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 73eb821ff3..a35b184a23 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -23,10 +23,21 @@ SDL_MIXER_CONF_OPTS = \
--without-x \
--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_FLUIDSYNTH),y)
+SDL_MIXER_DEPENDENCIES += fluidsynth
+SDL_MIXER_CONF_OPTS += \
+ --enable-music-midi \
+ --enable-music-fluidsynth-midi
+else
+SDL_MIXER_CONF_OPTS += --disable-music-fluidsynth-midi
+endif
+
ifeq ($(BR2_PACKAGE_LIBMAD),y)
SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl
SDL_MIXER_DEPENDENCIES += libmad
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] sdl_mixer: add MIDI support using Timidity
2020-07-02 15:25 [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Paul Cercueil
@ 2020-07-02 15:25 ` Paul Cercueil
2020-07-12 13:56 ` [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Thomas Petazzoni
1 sibling, 0 replies; 6+ messages in thread
From: Paul Cercueil @ 2020-07-02 15:25 UTC (permalink / raw)
To: buildroot
Add MIDI playback support using SDL_mixer' built-in Timidity synth.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
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 += \
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support
2020-07-02 15:25 [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Paul Cercueil
2020-07-02 15:25 ` [Buildroot] [PATCH 2/2] sdl_mixer: add MIDI support using Timidity Paul Cercueil
@ 2020-07-12 13:56 ` Thomas Petazzoni
2020-07-12 17:39 ` Paul Cercueil
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2020-07-12 13:56 UTC (permalink / raw)
To: buildroot
On Thu, 2 Jul 2020 17:25:46 +0200
Paul Cercueil <paul@crapouillou.net> wrote:
> Add support for MIDI playback using FluidSynth.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
> package/sdl_mixer/sdl_mixer.mk | 11 +++++++++++
> 1 file changed, 11 insertions(+)
I've applied both patches, but I've changed a bit how the .mk file
handles the option. After both patches, it looks like this:
ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
SDL_MIXER_DEPENDENCIES += fluidsynth
SDL_MIXER_CONF_OPTS += \
--enable-music-midi \
--enable-music-fluidsynth-midi
SDL_MIXER_HAS_MIDI = YES
endif
ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
SDL_MIXER_CONF_OPTS += \
--enable-music-midi \
--enable-music-timidity-midi
SDL_MIXER_HAS_MIDI = YES
endif
ifneq ($(SDL_MIXER_HAS_MIDI),YES)
SDL_MIXER_CONF_OPTS += --disable-music-midi
endif
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support
2020-07-12 13:56 ` [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Thomas Petazzoni
@ 2020-07-12 17:39 ` Paul Cercueil
2020-07-12 19:06 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2020-07-12 17:39 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Le dim. 12 juil. 2020 ? 15:56, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
> On Thu, 2 Jul 2020 17:25:46 +0200
> Paul Cercueil <paul@crapouillou.net> wrote:
>
>> Add support for MIDI playback using FluidSynth.
>>
>> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
>> ---
>> package/sdl_mixer/sdl_mixer.mk | 11 +++++++++++
>> 1 file changed, 11 insertions(+)
>
> I've applied both patches, but I've changed a bit how the .mk file
> handles the option. After both patches, it looks like this:
>
> ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
> SDL_MIXER_DEPENDENCIES += fluidsynth
> SDL_MIXER_CONF_OPTS += \
> --enable-music-midi \
> --enable-music-fluidsynth-midi
> SDL_MIXER_HAS_MIDI = YES
> endif
>
> ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
> SDL_MIXER_CONF_OPTS += \
> --enable-music-midi \
> --enable-music-timidity-midi
> SDL_MIXER_HAS_MIDI = YES
> endif
>
> ifneq ($(SDL_MIXER_HAS_MIDI),YES)
> SDL_MIXER_CONF_OPTS += --disable-music-midi
> endif
It won't work then. --enable-music-midi automatically enables
--enable-music-{native,fluidsynth,timidity}-midi, so these need to be
manually disabled. Otherwise when you enable e.g. Fluidsynth, it will
also enable Timidity even though the SDL_MIXER_MIDI_TIMIDITY option is
OFF.
Cheers,
-Paul
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support
2020-07-12 17:39 ` Paul Cercueil
@ 2020-07-12 19:06 ` Thomas Petazzoni
2020-07-12 19:15 ` Paul Cercueil
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2020-07-12 19:06 UTC (permalink / raw)
To: buildroot
On Sun, 12 Jul 2020 19:39:36 +0200
Paul Cercueil <paul@crapouillou.net> wrote:
> > I've applied both patches, but I've changed a bit how the .mk file
> > handles the option. After both patches, it looks like this:
> >
> > ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
> > SDL_MIXER_DEPENDENCIES += fluidsynth
> > SDL_MIXER_CONF_OPTS += \
> > --enable-music-midi \
> > --enable-music-fluidsynth-midi
> > SDL_MIXER_HAS_MIDI = YES
> > endif
> >
> > ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
> > SDL_MIXER_CONF_OPTS += \
> > --enable-music-midi \
> > --enable-music-timidity-midi
> > SDL_MIXER_HAS_MIDI = YES
> > endif
> >
> > ifneq ($(SDL_MIXER_HAS_MIDI),YES)
> > SDL_MIXER_CONF_OPTS += --disable-music-midi
> > endif
>
> It won't work then. --enable-music-midi automatically enables
> --enable-music-{native,fluidsynth,timidity}-midi, so these need to be
> manually disabled. Otherwise when you enable e.g. Fluidsynth, it will
> also enable Timidity even though the SDL_MIXER_MIDI_TIMIDITY option is
> OFF.
So, I guess we need this instead:
ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
SDL_MIXER_DEPENDENCIES += fluidsynth
SDL_MIXER_CONF_OPTS += --enable-music-fluidsynth-midi
SDL_MIXER_HAS_MIDI = YES
else
SDL_MIXER_CONF_OPTS += --disable-music-fluidsynth-midi
endif
ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
SDL_MIXER_CONF_OPTS += --enable-music-timidity-midi
SDL_MIXER_HAS_MIDI = YES
else
SDL_MIXER_CONF_OPTS += --disable-music-timidity-midi
endif
ifeq ($(SDL_MIXER_HAS_MIDI),YES)
SDL_MIXER_CONF_OPTS += --disable-music-midi
else
SDL_MIXER_CONF_OPTS += --disable-music-midi
endif
what do you think ?
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support
2020-07-12 19:06 ` Thomas Petazzoni
@ 2020-07-12 19:15 ` Paul Cercueil
0 siblings, 0 replies; 6+ messages in thread
From: Paul Cercueil @ 2020-07-12 19:15 UTC (permalink / raw)
To: buildroot
Le dim. 12 juil. 2020 ? 21:06, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
> On Sun, 12 Jul 2020 19:39:36 +0200
> Paul Cercueil <paul@crapouillou.net> wrote:
>
>> > I've applied both patches, but I've changed a bit how the .mk file
>> > handles the option. After both patches, it looks like this:
>> >
>> > ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
>> > SDL_MIXER_DEPENDENCIES += fluidsynth
>> > SDL_MIXER_CONF_OPTS += \
>> > --enable-music-midi \
>> > --enable-music-fluidsynth-midi
>> > SDL_MIXER_HAS_MIDI = YES
>> > endif
>> >
>> > ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
>> > SDL_MIXER_CONF_OPTS += \
>> > --enable-music-midi \
>> > --enable-music-timidity-midi
>> > SDL_MIXER_HAS_MIDI = YES
>> > endif
>> >
>> > ifneq ($(SDL_MIXER_HAS_MIDI),YES)
>> > SDL_MIXER_CONF_OPTS += --disable-music-midi
>> > endif
>>
>> It won't work then. --enable-music-midi automatically enables
>> --enable-music-{native,fluidsynth,timidity}-midi, so these need to
>> be
>> manually disabled. Otherwise when you enable e.g. Fluidsynth, it
>> will
>> also enable Timidity even though the SDL_MIXER_MIDI_TIMIDITY option
>> is
>> OFF.
>
> So, I guess we need this instead:
>
> ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
> SDL_MIXER_DEPENDENCIES += fluidsynth
> SDL_MIXER_CONF_OPTS += --enable-music-fluidsynth-midi
> SDL_MIXER_HAS_MIDI = YES
> else
> SDL_MIXER_CONF_OPTS += --disable-music-fluidsynth-midi
> endif
>
> ifeq ($(BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY),y)
> SDL_MIXER_CONF_OPTS += --enable-music-timidity-midi
> SDL_MIXER_HAS_MIDI = YES
> else
> SDL_MIXER_CONF_OPTS += --disable-music-timidity-midi
> endif
>
> ifeq ($(SDL_MIXER_HAS_MIDI),YES)
> SDL_MIXER_CONF_OPTS += --disable-music-midi
> else
> SDL_MIXER_CONF_OPTS += --disable-music-midi
> endif
>
> what do you think ?
That would work.
-Paul
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-12 19:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-02 15:25 [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Paul Cercueil
2020-07-02 15:25 ` [Buildroot] [PATCH 2/2] sdl_mixer: add MIDI support using Timidity Paul Cercueil
2020-07-12 13:56 ` [Buildroot] [PATCH 1/2] sdl_mixer: add FluidSynth support Thomas Petazzoni
2020-07-12 17:39 ` Paul Cercueil
2020-07-12 19:06 ` Thomas Petazzoni
2020-07-12 19:15 ` Paul Cercueil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.