package/fluidsynth: install to staging
PATCH 1/5 package/fluidsynth: install to staging
Install fluidsynth to staging to be able to use it in vlc, sdl2_mixer and gst1-plugins-bad
--- package/fluidsynth/fluidsynth.mk | 1 + 1 file changed, 1 insertion(+)
package/fluidsynth/fluidsynth.mk +1 -0
@@ -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)
Signature · 1 line
2.24.1
PATCH 2/5 package/vlc: add fluidsynth optional dependency
--- package/vlc/vlc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/vlc/vlc.mk +7 -1
@@ -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
Signature · 1 line
2.24.1
PATCH 3/5 package/sdl2_mixer: fix fluidsynth option
In reply to Fabrice FontaineOption 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)
--- package/sdl2_mixer/sdl2_mixer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/sdl2_mixer/sdl2_mixer.mk +1 -1
@@ -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)
Signature · 1 line
2.24.1
PATCH 4/5 package/sdl2_mixer: add optional fluidsynth dependency
In reply to Fabrice Fontaine--- package/sdl2_mixer/sdl2_mixer.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
package/sdl2_mixer/sdl2_mixer.mk +8 -3
@@ -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
Signature · 1 line
2.24.1
PATCH 5/5 package/gstreamer1/gst1-plugins-bad: add fluidsynth option
In reply to Fabrice Fontaine--- package/gstreamer1/gst1-plugins-bad/Config.in | 13 +++++++++++++ .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-bad/Config.in +13 -0
@@ -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
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +7 -1
@@ -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
Signature · 1 line
2.24.1
PATCH 1/5 package/fluidsynth: install to staging
In reply to Fabrice FontaineQuoted 7 lines · On Fri, 10 Jan 2020 23:02:35 +0100 Fabrice Fontaine…
Install fluidsynth to staging to be able to use it in vlc,
sdl2_mixerand gst1-plugins-badSigned-off-by Fabrice Fontaine <[email protected]>--- package/fluidsynth/fluidsynth.mk | 1 + 1 file changed, 1 insertion(+)
Series applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com