diff options
Diffstat (limited to 'meta-multimedia/recipes-multimedia/fluidsynth')
6 files changed, 52 insertions, 94 deletions
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb deleted file mode 100644 index a95c4c42a8..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth-native_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -inherit native - -OECMAKE_SOURCEPATH = "${S}/src/gentables" - -do_install() { - install -d ${D}/${bindir} - install -m 755 ${B}/make_tables.exe ${D}/${bindir}/ -} diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc deleted file mode 100644 index 234be02caf..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Fluidsynth is a software synthesizer" -HOMEPAGE = "http://www.fluidsynth.org/" -SECTION = "libs/multimedia" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" - -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "7f11a9bf5c7304e04309a6ec9fc515ee815524bf" -S = "${WORKDIR}/git" -PV = "2.0.5" - -inherit cmake pkgconfig lib_package diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch deleted file mode 100644 index 44612275c1..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 81ea820b155e887b13ea5986c3407cf93b2737f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Wed, 2 Jan 2019 18:42:46 +0100 -Subject: [PATCH] Do not build gentables helper - we have to use native variant -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - src/CMakeLists.txt | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a0ba53d1..1c626717 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -359,14 +359,3 @@ else ( MACOSX_FRAMEWORK ) - ) - install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) - endif ( MACOSX_FRAMEWORK ) -- --# ******* Auto Generated Lookup Tables ****** -- --include(ExternalProject) --ExternalProject_Add(gentables -- DOWNLOAD_COMMAND "" -- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables -- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables -- INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" --) --add_dependencies(libfluidsynth-OBJ gentables) --- -2.14.5 - diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch index 94daa951c6..f7debc5ad4 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch @@ -17,15 +17,15 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++++++++--------------- + src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c -index 0df620d3..379f8216 100644 +index 1eb5d737..6c876efa 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c -@@ -3306,10 +3306,10 @@ fluid_synth_program_reset(fluid_synth_t *synth) - * Synthesize a block of floating point audio to separate audio buffers (multichannel rendering). First effect channel used by reverb, second for chorus. +@@ -3628,10 +3628,10 @@ fluid_synth_program_reset(fluid_synth_t *synth) + * * @param synth FluidSynth instance * @param len Count of audio frames to synthesize - * @param left Array of float buffers to store left channel of planar audio (as many as \c synth.audio-channels buffers, each of \c len in size) @@ -38,8 +38,8 @@ index 0df620d3..379f8216 100644 + * @param fx_right Since 1.1.7: If not \c NULL, array of float buffers to store right effect channels (size: dito). Since 2.0.3: NULL allowed for array entry * @return #FLUID_OK on success, #FLUID_FAILED otherwise * - * @note Should only be called from synthesis thread. -@@ -3386,15 +3386,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, + * First effect channel used by reverb, second for chorus. +@@ -3719,15 +3719,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, for(i = 0; i < synth->audio_channels; i++) { #ifdef WITH_FLOAT @@ -71,7 +71,7 @@ index 0df620d3..379f8216 100644 } #endif //WITH_FLOAT -@@ -3404,12 +3416,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3737,12 +3749,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, { #ifdef WITH_FLOAT @@ -86,7 +86,7 @@ index 0df620d3..379f8216 100644 { FLUID_MEMCPY(fx_right[i], &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes); } -@@ -3417,7 +3429,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3750,7 +3762,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, #else //WITH_FLOAT int j; @@ -95,7 +95,7 @@ index 0df620d3..379f8216 100644 { for(j = 0; j < num; j++) { -@@ -3425,7 +3437,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3758,7 +3770,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, } } @@ -104,7 +104,7 @@ index 0df620d3..379f8216 100644 { for(j = 0; j < num; j++) { -@@ -3456,15 +3468,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3789,15 +3801,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, for(i = 0; i < synth->audio_channels; i++) { #ifdef WITH_FLOAT @@ -140,7 +140,7 @@ index 0df620d3..379f8216 100644 } #endif //WITH_FLOAT -@@ -3474,12 +3501,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3807,12 +3834,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, { #ifdef WITH_FLOAT @@ -155,7 +155,7 @@ index 0df620d3..379f8216 100644 { FLUID_MEMCPY(fx_right[i] + count, &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes); } -@@ -3487,7 +3514,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3820,7 +3847,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, #else //WITH_FLOAT int j; @@ -164,7 +164,7 @@ index 0df620d3..379f8216 100644 { for(j = 0; j < num; j++) { -@@ -3495,7 +3522,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, +@@ -3828,7 +3855,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len, } } diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb new file mode 100644 index 0000000000..dc05832e80 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb @@ -0,0 +1,39 @@ +SUMMARY = "Fluidsynth is a software synthesizer" +HOMEPAGE = "http://www.fluidsynth.org/" +SECTION = "libs/multimedia" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" + +DEPENDS = "glib-2.0" + +SRC_URI = " \ + git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https \ + file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \ + file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ +" +SRCREV = "5ecdc4568e45123216c6888892caad07918ef127" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package + +EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" + +do_install:append() { + sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/pkgconfig/fluidsynth.pc + sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/cmake/fluidsynth/FluidSynthTargets.cmake +} + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio pipewire systemd alsa dbus', d)}" +PACKAGECONFIG[alsa] = "-Denable-alsa=ON,-Denable-alsa=OFF,alsa-lib" +PACKAGECONFIG[dbus] = "-Denable-dbus=ON,-Denable-dbus=OFF,dbus" +PACKAGECONFIG[jack] = "-Denable-jack=ON,-Denable-jack=OFF,jack" +PACKAGECONFIG[oss] = "-Denable-oss=ON,-Denable-oss=OFF" +PACKAGECONFIG[pipewire] = "-Denable-pipewire=ON,-Denable-pipewire=OFF,pipewire" +PACKAGECONFIG[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19" +PACKAGECONFIG[profiling] = "-Denable-profiling=ON,-Denable-profiling=OFF" +PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" +PACKAGECONFIG[readline] = "-Denable-readline=ON,-Denable-readline=OFF,readline" +PACKAGECONFIG[sdl] = "-Denable-sdl2=ON,-Denable-sdl2=OFF,libsdl2" +PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1" +PACKAGECONFIG[systemd] = "-Denable-systemd=ON,-Denable-systemd=OFF,systemd" diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb deleted file mode 100644 index 4f600a218d..0000000000 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require ${BPN}.inc - -DEPENDS = "${BPN}-native alsa-lib ncurses glib-2.0" - -SRC_URI += " \ - file://0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch \ - file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \ - file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ -" - -EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" - -do_configure_append() { - make_tables.exe ${B}/ -} - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1" -PACKAGECONFIG[jack] = "-Denable-jack=ON,-Denable-jack=OFF,jack" -PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" -PACKAGECONFIG[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19" -PACKAGECONFIG[profiling] = "-Denable-profiling=ON,-Denable-profiling=OFF" |