From 3cf36ae941b410d8e4185563b76bac45584f61f8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 10 Nov 2016 18:23:59 +0000 Subject: [PATCH] fluidlite: patches are upstreamed. --- media-sound/fluidlite/fluidlite-1.0.0.recipe | 7 +- .../patches/fluidlite-1.0.0.patchset | 66 ------------------- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 media-sound/fluidlite/patches/fluidlite-1.0.0.patchset diff --git a/media-sound/fluidlite/fluidlite-1.0.0.recipe b/media-sound/fluidlite/fluidlite-1.0.0.recipe index ce84f7ecd..e858e1dd8 100644 --- a/media-sound/fluidlite/fluidlite-1.0.0.recipe +++ b/media-sound/fluidlite/fluidlite-1.0.0.recipe @@ -14,12 +14,11 @@ implemented externally." HOMEPAGE="https://github.com/divideconcept/FluidLite" COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" LICENSE="GNU LGPL v2.1" -REVISION="1" -gitRevision="b9573fd464ce3f872b2f5511b595bc67d4498466" +REVISION="2" +gitRevision="ba3a29d5976c0797b204ef5729430c295aab19d8" SOURCE_URI="$HOMEPAGE/archive/$gitRevision.tar.gz" -CHECKSUM_SHA256="e7501cee0f4b2312cf42b7a8eae671849416cb25c9dc7ca86ab9dce801225c7a" +CHECKSUM_SHA256="80ea81bb3ce7e20c0aeaf95fc4660b9f0f40d004acdb7eee1b6a9a2c7aeb1075" SOURCE_DIR="FluidLite-$gitRevision" -PATCHES="fluidlite-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/media-sound/fluidlite/patches/fluidlite-1.0.0.patchset b/media-sound/fluidlite/patches/fluidlite-1.0.0.patchset deleted file mode 100644 index b9a4f00f0..000000000 --- a/media-sound/fluidlite/patches/fluidlite-1.0.0.patchset +++ /dev/null @@ -1,66 +0,0 @@ -From 87b5d31b533b4b717861da44ff8b05278ddff37f Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 3 Aug 2016 19:08:44 +0200 -Subject: gcc2 patch - - -diff --git a/src/fluid_synth.c b/src/fluid_synth.c -index aa3bf60..a743750 100644 ---- a/src/fluid_synth.c -+++ b/src/fluid_synth.c -@@ -568,7 +568,8 @@ new_fluid_synth(fluid_settings_t *settings) - void - fluid_synth_set_sample_rate(fluid_synth_t* synth, float sample_rate) - { -- for (int i = 0; i < synth->nvoice; i++) { -+ int i; -+ for (i = 0; i < synth->nvoice; i++) { - delete_fluid_voice(synth->voice[i]); - synth->voice[i] = new_fluid_voice(synth->sample_rate); - } -@@ -3061,6 +3062,7 @@ int fluid_synth_tune_notes(fluid_synth_t* synth, int bank, int prog, - int len, int *key, double* pitch, int apply) - { - fluid_tuning_t* old_tuning, *new_tuning; -+ int i; - - if(!(synth != NULL)) return FLUID_FAILED; //fluid_return_val_if_fail - if(!(bank >= 0 && bank < 128)) return FLUID_FAILED; //fluid_return_val_if_fail -@@ -3079,7 +3081,7 @@ int fluid_synth_tune_notes(fluid_synth_t* synth, int bank, int prog, - return FLUID_FAILED; - } - -- for (int i = 0; i < len; i++) { -+ for (i = 0; i < len; i++) { - fluid_tuning_set_pitch(new_tuning, key[i], pitch[i]); - } - --- -2.2.2 - - -From bf9855376cacbf45d9bfe9906c9b6f8359461a42 Mon Sep 17 00:00:00 2001 -From: Pete Goodeve -Date: Fri, 24 May 2013 19:33:20 -0700 -Subject: adjust fluidsynth fine tuning range to match standard - - -diff --git a/src/fluid_chan.c b/src/fluid_chan.c -index a06bec7..943465d 100644 ---- a/src/fluid_chan.c -+++ b/src/fluid_chan.c -@@ -268,9 +268,9 @@ fluid_channel_cc(fluid_channel_t* chan, int num, int value) - fluid_channel_pitch_wheel_sens (chan, value); /* Set bend range in semitones */ - /* FIXME - Handle LSB? (Fine bend range in cents) */ - break; -- case RPN_CHANNEL_FINE_TUNE: /* Fine tune is 14 bit over 1 semitone (+/- 50 cents, 8192 = center) */ -+ case RPN_CHANNEL_FINE_TUNE: /* Fine tune is 14 bit over +/-1 semitone (+/- 100 cents, 8192 = center) */ - fluid_synth_set_gen(chan->synth, chan->channum, GEN_FINETUNE, -- (data - 8192) / 8192.0 * 50.0); -+ (data - 8192) / 8192.0 * 100.0); - break; - case RPN_CHANNEL_COARSE_TUNE: /* Coarse tune is 7 bit and in semitones (64 is center) */ - fluid_synth_set_gen(chan->synth, chan->channum, GEN_COARSETUNE, --- -2.2.2 -