X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fupdate_fluidsynth.sh;h=1fc43f50b00fb70c1dbdcd04906ce31c8163ac88;hb=a8d62ce056fe260792d4e72bf8cf2fbff0e8b39b;hp=c64e8adf6f23e1931a45d30204ff3fd898ae1578;hpb=abf7905d5f82ad796544aa664cf3abaf20385cf7;p=ardour.git

diff --git a/tools/update_fluidsynth.sh b/tools/update_fluidsynth.sh
index c64e8adf6f..1fc43f50b0 100755
--- a/tools/update_fluidsynth.sh
+++ b/tools/update_fluidsynth.sh
@@ -23,6 +23,11 @@ cd $TMP
 #git clone git://git.code.sf.net/p/fluidsynth/code-git fs-git
 git clone git://github.com/FluidSynth/fluidsynth.git fs-git
 
+cd fs-git;
+git describe --tags
+git log | head
+cd $TMP
+
 FSR=fs-git/
 
 rsync -auc --info=progress2 \
@@ -71,6 +76,7 @@ rsync -auc --info=progress2 \
 	${FSR}src/synth/fluid_voice.h \
 	${FSR}src/utils/fluid_conv.c \
 	${FSR}src/utils/fluid_conv.h \
+	${FSR}src/utils/fluid_conv_tables.h \
 	${FSR}src/utils/fluid_hash.c \
 	${FSR}src/utils/fluid_hash.h \
 	${FSR}src/utils/fluid_list.c \
@@ -102,4 +108,12 @@ rsync -auc --info=progress2 \
 	"$ASRC/libs/fluidsynth/fluidsynth/"
 
 cd "$ASRC"
-patch -p1 < tools/ardour_fluidsynth.diff
+## 1st: apply patch below, fix up any merge-conflicts and git commit the result.
+## 2nd run (after commiting the new version): re-create the patch to upstream & amend:
+# git diff -R libs/fluidsynth/ > tools/fluid-patches/ardour_fluidsynth.diff
+#exit
+patch -p1 < tools/fluid-patches/ardour_fluidsynth.diff
+
+# auto-generated files
+cp tools/fluid-patches/fluid_conv_tables.c  libs/fluidsynth/src/
+cp tools/fluid-patches/fluid_rvoice_dsp_tables.c  libs/fluidsynth/src/