From 38fff19e020b77ec63ecd72303f76b643a3ba858 Mon Sep 17 00:00:00 2001
From: heitbaum <6086324+heitbaum@users.noreply.github.com>
Date: Wed, 18 Nov 2020 10:17:54 +0000
Subject: [PATCH] fluidsynth: update to 2.2.3

update 1.1.6 (25 Jun 2017) to 2.2.3 (12 Sep 2021)
changelog: https://github.com/FluidSynth/fluidsynth/releases
release notes:
- https://github.com/FluidSynth/fluidsynth/releases/tag/v2.1.8
- https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.0
- https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.1
- https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.2
- https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.3

- enable linking with libsndfile
- use static libraries during build
---
 packages/audio/fluidsynth/package.mk                | 13 +++++++------
 .../patches/libsndfile-use-static-libraries.patch   | 10 ++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch

diff --git a/packages/audio/fluidsynth/package.mk b/packages/audio/fluidsynth/package.mk
index d56a877982..e4d3d4a693 100644
--- a/packages/audio/fluidsynth/package.mk
+++ b/packages/audio/fluidsynth/package.mk
@@ -3,17 +3,18 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="fluidsynth"
-PKG_VERSION="1.1.6"
-PKG_SHA256="d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601"
+PKG_VERSION="2.2.3"
+PKG_SHA256="b31807cb0f88e97f3096e2b378c9815a6acfdc20b0b14f97936d905b536965c4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://fluidsynth.org/"
-PKG_URL="${SOURCEFORGE_SRC}/project/fluidsynth/fluidsynth-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain glib"
+PKG_URL="https://github.com/FluidSynth/fluidsynth/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain glib libsndfile"
 PKG_LONGDESC="FluidSynth renders midi music files as raw audio data, for playing or conversion."
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 \
                        -DLIB_SUFFIX= \
-                       -Denable-readline=0 \
+                       -Denable-libsndfile=1 \
+                       -Denable-pkgconfig=1 \
                        -Denable-pulseaudio=0 \
-                       -Denable-libsndfile=0"
+                       -Denable-readline=0"
diff --git a/packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch b/packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch
new file mode 100644
index 0000000000..ae11905f93
--- /dev/null
+++ b/packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2021-09-12 13:53:14.192948082 +1000
++++ b/CMakeLists.txt	2021-09-12 13:54:27.389413149 +1000
+@@ -535,6 +535,7 @@
+              LIBSNDFILE_STATIC_LDFLAGS MATCHES "vorbis" OR
+              LIBSNDFILE_STATIC_LDFLAGS_OTHER MATCHES "vorbis" )
+           set ( LIBSNDFILE_HASVORBIS 1 )
++          set ( LIBSNDFILE_LIBRARIES ${LIBSNDFILE_STATIC_LIBRARIES} )
+         else ()
+           message ( NOTICE "Seems like libsndfile was compiled without OGG/Vorbis support." )
+         endif ()