[Buildroot] [PATCH 1/5] package/fluidsynth: install to staging

[Buildroot] [PATCH 1/5] package/fluidsynth: install to staging

[Fabrice Fontaine]

Install fluidsynth to staging to be able to use it in vlc, sdl2_mixer
and gst1-plugins-bad

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/fluidsynth/fluidsynth.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk
index 4ef0a6f40d..7681e906b1 100644
--- a/package/fluidsynth/fluidsynth.mk
+++ b/package/fluidsynth/fluidsynth.mk
@@ -8,6 +8,7 @@ FLUIDSYNTH_VERSION = 2.1.0
 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION))
 FLUIDSYNTH_LICENSE = LGPL-2.1+
 FLUIDSYNTH_LICENSE_FILES = LICENSE
+FLUIDSYNTH_INSTALL_STAGING = YES
 FLUIDSYNTH_DEPENDENCIES = libglib2
 
 ifeq ($(BR2_PACKAGE_FLUIDSYNTH_ALSA_LIB),y)
-- 
2.24.1

[Buildroot] [PATCH 2/5] package/vlc: add fluidsynth optional dependency

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/vlc/vlc.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index ae12e89b8a..4b1cd68d8b 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -55,7 +55,6 @@ VLC_CONF_OPTS += \
 	--disable-dsm \
 	--disable-dv1394 \
 	--disable-fluidlite \
-	--disable-fluidsynth \
 	--disable-gme \
 	--disable-goom \
 	--disable-jack \
@@ -164,6 +163,13 @@ else
 VLC_CONF_OPTS += --disable-flac
 endif
 
+ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
+VLC_CONF_OPTS += --enable-fluidsynth
+VLC_DEPENDENCIES += fluidsynth
+else
+VLC_CONF_OPTS += --disable-fluidsynth
+endif
+
 ifeq ($(BR2_PACKAGE_FREERDP),y)
 VLC_CONF_OPTS += --enable-freerdp
 VLC_DEPENDENCIES += freerdp
-- 
2.24.1

[Buildroot] [PATCH 3/5] package/sdl2_mixer: fix fluidsynth option

[Fabrice Fontaine]

Option to disable fluidsynth is --disable-music-midi-fluidsynth since
version 2.0.0 and
https://github.com/SDL-mirror/SDL_mixer/commit/9fe78ec49f083e4f85e10abb9f1cbe7d6187d6b0

Before this commit, the configure option was
--disable-music-fluidsynth-midi (and not --disable-fluidsynth)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/sdl2_mixer/sdl2_mixer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk
index c990847974..198333854e 100644
--- a/package/sdl2_mixer/sdl2_mixer.mk
+++ b/package/sdl2_mixer/sdl2_mixer.mk
@@ -13,7 +13,7 @@ SDL2_MIXER_INSTALL_STAGING = YES
 SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf
 
 SDL2_MIXER_CONF_OPTS = \
-	--disable-fluidsynth \
+	--disable-music-midi-fluidsynth \
 	--disable-music-mp3
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
-- 
2.24.1

[Buildroot] [PATCH 4/5] package/sdl2_mixer: add optional fluidsynth dependency

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/sdl2_mixer/sdl2_mixer.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk
index 198333854e..34bba5772d 100644
--- a/package/sdl2_mixer/sdl2_mixer.mk
+++ b/package/sdl2_mixer/sdl2_mixer.mk
@@ -12,9 +12,7 @@ SDL2_MIXER_LICENSE_FILES = COPYING.txt
 SDL2_MIXER_INSTALL_STAGING = YES
 SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf
 
-SDL2_MIXER_CONF_OPTS = \
-	--disable-music-midi-fluidsynth \
-	--disable-music-mp3
+SDL2_MIXER_CONF_OPTS = --disable-music-mp3
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
 SDL2_MIXER_CONF_OPTS += --enable-music-flac
@@ -23,6 +21,13 @@ else
 SDL2_MIXER_CONF_OPTS += --disable-music-flac
 endif
 
+ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y)
+SDL2_MIXER_CONF_OPTS += --enable-music-midi-fluidsynth
+SDL2_MIXER_DEPENDENCIES += fluidsynth
+else
+SDL2_MIXER_CONF_OPTS += --disable-music-midi-fluidsynth
+endif
+
 ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
 SDL2_MIXER_CONF_OPTS += --enable-music-mod-modplug
 SDL2_MIXER_DEPENDENCIES += libmodplug
-- 
2.24.1

[Buildroot] [PATCH 5/5] package/gstreamer1/gst1-plugins-bad: add fluidsynth option

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/gstreamer1/gst1-plugins-bad/Config.in       | 13 +++++++++++++
 .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 393950ef2f..d831f8072e 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -397,6 +397,19 @@ comment "fdk-aac needs a toolchain w/ C++"
 	depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH
+	bool "fluidsynth"
+	depends on BR2_USE_WCHAR # fluidsynth
+	depends on BR2_TOOLCHAIN_HAS_THREADS # fluidsynth
+	depends on BR2_USE_MMU # fluidsynth
+	select BR2_PACKAGE_FLUIDSYNTH
+	help
+	  Fluidsynth MIDI decoder plugin
+
+comment "fluidsynth needs a toolchain w/ threads, wchar"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL
 	bool "gl"
 	default y
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 259f00cdbb..ef36e4dc0a 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -42,7 +42,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
 	-Dfaac=disabled \
 	-Dflite=disabled \
 	-Dgsm=disabled \
-	-Dfluidsynth=disabled \
 	-Dkate=disabled \
 	-Dladspa=disabled \
 	-Dlv2=disabled \
@@ -526,6 +525,13 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH),y)
+GST1_PLUGINS_BAD_CONF_OPTS += -Dfluidsynth=enabled
+GST1_PLUGINS_BAD_DEPENDENCIES += fluidsynth
+else
+GST1_PLUGINS_BAD_CONF_OPTS += -Dfluidsynth=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y)
 GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=enabled
 else
-- 
2.24.1

[Buildroot] [PATCH 1/5] package/fluidsynth: install to staging

[Thomas Petazzoni]

On Fri, 10 Jan 2020 23:02:35 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Install fluidsynth to staging to be able to use it in vlc, sdl2_mixer
> and gst1-plugins-bad
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/fluidsynth/fluidsynth.mk | 1 +
>  1 file changed, 1 insertion(+)

Series applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com