From c052c1fdfac0963f82a344cea12b67a80df54131 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 04 2021 11:02:37 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b8ca834..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -swami-0.9.4.tar.bz2 -/swami-2.0.0-svn386.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 254a503..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -59e8649b81cbbd2e61bf8bdd00dfd6b7 swami-2.0.0-svn386.tar.bz2 diff --git a/swami-fluidsynth2.patch b/swami-fluidsynth2.patch deleted file mode 100644 index 95afc2e..0000000 --- a/swami-fluidsynth2.patch +++ /dev/null @@ -1,802 +0,0 @@ -diff -rupN swami-2.0.0.org/src/plugins/fluidsynth.c swami-2.0.0/src/plugins/fluidsynth.c ---- swami-2.0.0.org/src/plugins/fluidsynth.c 2010-10-25 13:04:05.000000000 -0400 -+++ swami-2.0.0/src/plugins/fluidsynth.c 2020-02-17 12:53:37.589938699 -0500 -@@ -2,7 +2,7 @@ - * fluidsynth.c - Swami plugin for FluidSynth - * - * Swami -- * Copyright (C) 1999-2010 Joshua "Element" Green -+ * Copyright (C) 1999-2014 Element Green - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License -@@ -198,10 +198,10 @@ static GType interp_mode_register_type ( - static GType chorus_waveform_register_type (SwamiPlugin *plugin); - - static void wavetbl_fluidsynth_class_init (WavetblFluidSynthClass *klass); --static void settings_foreach_count (void *data, char *name, int type); --static void settings_foreach_option_count (void *data, char *name, char *option); --static void settings_foreach_func (void *data, char *name, int type); --static void settings_foreach_option_func (void *data, char *name, char *option); -+static void settings_foreach_count (void *data, const char *name, int type); -+static void settings_foreach_option_count (void *data, const char *name, const char *option); -+static void settings_foreach_func (void *data, const char *name, int type); -+static void settings_foreach_option_func (void *data, const char *name, const char *option); - static int cmpstringp (const void *p1, const void *p2); - static void wavetbl_fluidsynth_init (WavetblFluidSynth *wavetbl); - static void wavetbl_fluidsynth_finalize (GObject *object); -@@ -242,21 +242,17 @@ static int find_reverb_preset (const cha - static void wavetbl_fluidsynth_update_chorus (WavetblFluidSynth *wavetbl); - static int find_chorus_preset (const char *name); - --static int sfloader_free (fluid_sfloader_t *loader); - static fluid_sfont_t *sfloader_load_sfont (fluid_sfloader_t *loader, - const char *filename); - static int sfloader_sfont_free (fluid_sfont_t *sfont); --static char *sfloader_sfont_get_name (fluid_sfont_t *sfont); -+static const char *sfloader_sfont_get_name (fluid_sfont_t *sfont); - static fluid_preset_t *sfloader_sfont_get_preset (fluid_sfont_t *sfont, -- unsigned int bank, -- unsigned int prenum); --static void sfloader_sfont_iteration_start (fluid_sfont_t *sfont); --static int sfloader_sfont_iteration_next (fluid_sfont_t *sfont, -- fluid_preset_t *preset); --static int sfloader_preset_free (fluid_preset_t *preset); --static int sfloader_active_preset_free (fluid_preset_t *preset); --static char *sfloader_preset_get_name (fluid_preset_t *preset); --static char *sfloader_active_preset_get_name (fluid_preset_t *preset); -+ int bank, -+ int prenum); -+static void sfloader_preset_free (fluid_preset_t *preset); -+static void sfloader_active_preset_free (fluid_preset_t *preset); -+static const char *sfloader_preset_get_name (fluid_preset_t *preset); -+static const char *sfloader_active_preset_get_name (fluid_preset_t *preset); - static int sfloader_preset_get_banknum (fluid_preset_t *preset); - static int sfloader_active_preset_get_banknum (fluid_preset_t *preset); - static int sfloader_preset_get_num (fluid_preset_t *preset); -@@ -332,6 +328,10 @@ SWAMI_PLUGIN_INFO (plugin_fluidsynth_ini - static gboolean - plugin_fluidsynth_init (SwamiPlugin *plugin, GError **err) - { -+ fluid_settings_t *settings = NULL; -+ int idef; -+ double ddef; -+ - /* bind the gettext domain */ - #if defined(ENABLE_NLS) - bindtextdomain ("SwamiPlugin-fluidsynth", LOCALEDIR); -@@ -342,41 +342,75 @@ plugin_fluidsynth_init (SwamiPlugin *plu - - g_object_set (plugin, - "name", "FluidSynth", -- "version", "1.01", -- "author", "Josh Green", -- "copyright", "Copyright (C) 2002-2008", -+ "version", "1.1", -+ "author", "Element Green", -+ "copyright", "Copyright (C) 2002-2014", - "descr", N_("FluidSynth software wavetable synth plugin"), - "license", "GPL", - NULL); - -+ - /* initialize voice cache hash */ - voice_cache_hash = g_hash_table_new_full (NULL, NULL, NULL, - (GDestroyNotify)g_object_unref); -- /* initialize types */ -- wavetbl_type = wavetbl_register_type (plugin); -- interp_mode_type = interp_mode_register_type (plugin); -- chorus_waveform_type = chorus_waveform_register_type (plugin); -- - /* initialize built-in reverb and chorus presets - * !! Make sure that name field ends in NULLs (strncpy does this). - * !! If not, then a potential multi-thread string crash could occur. - */ - reverb_presets = g_new (ReverbParams, REVERB_PRESETS_BUILTIN); -+ chorus_presets = g_new (ChorusParams, CHORUS_PRESETS_BUILTIN); -+ settings = new_fluid_settings(); -+ -+ if(voice_cache_hash == NULL || reverb_presets == NULL || chorus_presets == NULL || settings == NULL) -+ { -+ g_hash_table_unref(voice_cache_hash); -+ voice_cache_hash = NULL; -+ g_free(reverb_presets); -+ reverb_presets = NULL; -+ g_free(chorus_presets); -+ chorus_presets = NULL; -+ delete_fluid_settings(settings); -+ return FALSE; -+ } - - strncpy (reverb_presets[0].name, N_("Default"), PRESET_NAME_LEN); -- reverb_presets[0].room_size = FLUID_REVERB_DEFAULT_ROOMSIZE; -- reverb_presets[0].damp = FLUID_REVERB_DEFAULT_DAMP; -- reverb_presets[0].width = FLUID_REVERB_DEFAULT_WIDTH; -- reverb_presets[0].level = FLUID_REVERB_DEFAULT_LEVEL; -+ -+ fluid_settings_getnum_default(settings, "synth.reverb.room-size", &ddef); -+ reverb_presets[0].room_size = ddef; -+ -+ fluid_settings_getnum_default(settings, "synth.reverb.damp", &ddef); -+ reverb_presets[0].damp = ddef; -+ -+ fluid_settings_getnum_default(settings, "synth.reverb.width", &ddef); -+ reverb_presets[0].width = ddef; -+ -+ fluid_settings_getnum_default(settings, "synth.reverb.level", &ddef); -+ reverb_presets[0].level = ddef; - -- chorus_presets = g_new (ChorusParams, CHORUS_PRESETS_BUILTIN); - - strncpy (chorus_presets[0].name, N_("Default"), PRESET_NAME_LEN); -- chorus_presets[0].count = FLUID_CHORUS_DEFAULT_N; -- chorus_presets[0].level = FLUID_CHORUS_DEFAULT_LEVEL; -- chorus_presets[0].freq = FLUID_CHORUS_DEFAULT_SPEED; -- chorus_presets[0].depth = FLUID_CHORUS_DEFAULT_DEPTH; -- chorus_presets[0].waveform = FLUID_CHORUS_DEFAULT_TYPE; -+ -+ fluid_settings_getint_default(settings, "synth.chorus.nr", &idef); -+ chorus_presets[0].count = idef; -+ -+ fluid_settings_getnum_default(settings, "synth.chorus.level", &ddef); -+ chorus_presets[0].level = ddef; -+ -+ fluid_settings_getnum_default(settings, "synth.chorus.speed", &ddef); -+ chorus_presets[0].freq = ddef; -+ -+ fluid_settings_getnum_default(settings, "synth.chorus.depth", &ddef); -+ chorus_presets[0].depth = ddef; -+ -+ chorus_presets[0].waveform = FLUID_CHORUS_MOD_SINE; -+ -+ delete_fluid_settings(settings); -+ -+ -+ /* initialize types */ -+ wavetbl_type = wavetbl_register_type (plugin); -+ interp_mode_type = interp_mode_register_type (plugin); -+ chorus_waveform_type = chorus_waveform_register_type (plugin); - - return (TRUE); - } -@@ -532,8 +566,8 @@ wavetbl_fluidsynth_class_init (WavetblFl - fluid_settings_foreach (bag.settings, &bag, settings_foreach_func); - - delete_fluid_settings (bag.settings); /* not needed anymore */ -- -- -+ -+ - g_object_class_install_property (obj_class, WTBL_PROP_INTERP, - g_param_spec_enum ("interp", _("Interpolation"), - _("Interpolation type"), -@@ -547,22 +581,22 @@ wavetbl_fluidsynth_class_init (WavetblFl - g_object_class_install_property (obj_class, WTBL_PROP_REVERB_ROOM_SIZE, - g_param_spec_double ("reverb-room-size", _("Reverb room size"), - _("Reverb room size"), -- 0.0, 1.2, FLUID_REVERB_DEFAULT_ROOMSIZE, -+ 0.0, 1.0, reverb_presets[0].room_size, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_REVERB_DAMP, - g_param_spec_double ("reverb-damp", _("Reverb damp"), - _("Reverb damp"), -- 0.0, 1.0, FLUID_REVERB_DEFAULT_DAMP, -+ 0.0, 1.0, reverb_presets[0].damp, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_REVERB_WIDTH, - g_param_spec_double ("reverb-width", _("Reverb width"), - _("Reverb width"), -- 0.0, 100.0, FLUID_REVERB_DEFAULT_WIDTH, -+ 0.0, 100.0, reverb_presets[0].width, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_REVERB_LEVEL, - g_param_spec_double ("reverb-level", _("Reverb level"), - _("Reverb level"), -- 0.0, 1.0, FLUID_REVERB_DEFAULT_LEVEL, -+ 0.0, 1.0, reverb_presets[0].level, - G_PARAM_READWRITE)); - - g_object_class_install_property (obj_class, WTBL_PROP_CHORUS_PRESET, -@@ -572,28 +606,28 @@ wavetbl_fluidsynth_class_init (WavetblFl - g_object_class_install_property (obj_class, WTBL_PROP_CHORUS_COUNT, - g_param_spec_int ("chorus-count", _("Chorus count"), - _("Number of chorus delay lines"), -- 1, 99, FLUID_CHORUS_DEFAULT_N, -+ 1, 99, chorus_presets[0].count, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_CHORUS_LEVEL, - g_param_spec_double ("chorus-level", _("Chorus level"), - _("Output level of each chorus line"), -- 0.0, 10.0, FLUID_CHORUS_DEFAULT_LEVEL, -+ 0.0, 10.0, chorus_presets[0].level, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_CHORUS_FREQ, - g_param_spec_double ("chorus-freq", _("Chorus freq"), - _("Chorus modulation frequency (Hz)"), -- 0.3, 5.0, FLUID_CHORUS_DEFAULT_SPEED, -+ 0.3, 5.0, chorus_presets[0].freq, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_CHORUS_DEPTH, - g_param_spec_double ("chorus-depth", _("Chorus depth"), - _("Chorus depth"), -- 0.0, 20.0, FLUID_CHORUS_DEFAULT_DEPTH, -+ 0.0, 20.0, chorus_presets[0].depth, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_CHORUS_WAVEFORM, - g_param_spec_enum ("chorus-waveform", _("Chorus waveform"), - _("Chorus waveform type"), - CHORUS_WAVEFORM_TYPE, -- FLUID_CHORUS_DEFAULT_TYPE, -+ FLUID_CHORUS_MOD_SINE, - G_PARAM_READWRITE)); - g_object_class_install_property (obj_class, WTBL_PROP_ACTIVE_ITEM, - g_param_spec_object ("active-item", _("Active item"), -@@ -614,7 +648,7 @@ wavetbl_fluidsynth_class_init (WavetblFl - - /* for counting the number of FluidSynth settings properties */ - static void --settings_foreach_count (void *data, char *name, int type) -+settings_foreach_count (void *data, const char *name, int type) - { - ForeachBag *bag = (ForeachBag *)data; - int optcount = 0; -@@ -632,7 +666,7 @@ settings_foreach_count (void *data, char - - /* function to count FluidSynth string options for a parameter */ - static void --settings_foreach_option_count (void *data, char *name, char *option) -+settings_foreach_option_count (void *data, const char *name, const char *option) - { - int *optcount = data; - *optcount = *optcount + 1; -@@ -640,15 +674,15 @@ settings_foreach_option_count (void *dat - - /* add each FluidSynth setting as a GObject property */ - static void --settings_foreach_func (void *data, char *name, int type) -+settings_foreach_func (void *data, const char *name, int type) - { - ForeachBag *bag = (ForeachBag *)data; - GStrv options = NULL, optionp; - GParamSpec *spec; - double dmin, dmax, ddef; -- int imin, imax, idef; -+ int imin, imax, idef, hint; - gboolean bdef; -- char *defstr; -+ char *defstr = NULL; - const char **sp; - int optcount = 0; - char *optname; -@@ -671,21 +705,22 @@ settings_foreach_func (void *data, char - { - case FLUID_NUM_TYPE: - fluid_settings_getnum_range (bag->settings, name, &dmin, &dmax); -- ddef = fluid_settings_getnum_default (bag->settings, name); -+ fluid_settings_getnum_default (bag->settings, name, &ddef); - spec = g_param_spec_double (name, name, name, dmin, dmax, ddef, - G_PARAM_READWRITE); - break; - case FLUID_INT_TYPE: - fluid_settings_getint_range (bag->settings, name, &imin, &imax); -- idef = fluid_settings_getint_default (bag->settings, name); -+ fluid_settings_getint_default (bag->settings, name, &idef); -+ fluid_settings_get_hints(bag->settings, name, &hint); - -- if (imin == 0 && imax == 1) /* boolean parameter? */ -+ if ((hint | FLUID_HINT_TOGGLED) != 0) /* boolean parameter? */ - spec = g_param_spec_boolean (name, name, name, idef != 0, G_PARAM_READWRITE); - else - spec = g_param_spec_int (name, name, name, imin, imax, idef, G_PARAM_READWRITE); - break; - case FLUID_STR_TYPE: -- defstr = fluid_settings_getstr_default (bag->settings, name); -+ fluid_settings_getstr_default (bag->settings, name, &defstr); - spec = g_param_spec_string (name, name, name, defstr, G_PARAM_READWRITE); - - /* count options for this string parameter (if any) */ -@@ -742,7 +777,7 @@ settings_foreach_func (void *data, char - /* function to iterate over FluidSynth string options for string parameters - * and fill a string array */ - static void --settings_foreach_option_func (void *data, char *name, char *option) -+settings_foreach_option_func (void *data, const char *name, const char *option) - { - GStrv *poptions = data; - -@@ -838,7 +873,7 @@ wavetbl_fluidsynth_set_property (GObject - return; - } - -- if (!retval) -+ if (retval == FLUID_FAILED) - g_critical ("Failed to set FluidSynth property '%s'", name); - - return; -@@ -970,7 +1005,7 @@ wavetbl_fluidsynth_get_property (GObject - { - WavetblFluidSynth *wavetbl = WAVETBL_FLUIDSYNTH (object); - GSList *mods; -- char *s; -+ char s[256]; - char *name; - double d; - int retval; -@@ -986,15 +1021,15 @@ wavetbl_fluidsynth_get_property (GObject - { - case G_TYPE_INT: - retval = fluid_settings_getint (wavetbl->settings, name, &i); -- if (retval) g_value_set_int (value, i); -+ if (retval != FLUID_FAILED) g_value_set_int (value, i); - break; - case G_TYPE_DOUBLE: - retval = fluid_settings_getnum (wavetbl->settings, name, &d); -- if (retval) g_value_set_double (value, d); -+ if (retval != FLUID_FAILED) g_value_set_double (value, d); - break; - case G_TYPE_STRING: -- retval = fluid_settings_getstr (wavetbl->settings, name, &s); -- if (retval) g_value_set_string (value, s); -+ retval = fluid_settings_copystr (wavetbl->settings, name, s, sizeof(s)); -+ if (retval != FLUID_FAILED) g_value_set_string (value, s); - break; - case G_TYPE_BOOLEAN: - /* check if its a string boolean property */ -@@ -1002,12 +1037,12 @@ wavetbl_fluidsynth_get_property (GObject - { - i = fluid_settings_str_equal (wavetbl->settings, name, "yes"); - g_value_set_boolean (value, i); -- retval = TRUE; -+ retval = FLUID_OK; - } - else - { - retval = fluid_settings_getint (wavetbl->settings, name, &i); -- if (retval) g_value_set_boolean (value, i); -+ if (retval != FLUID_FAILED) g_value_set_boolean (value, i); - } - break; - default: -@@ -1016,6 +1051,7 @@ wavetbl_fluidsynth_get_property (GObject - { - strv = g_param_spec_get_qdata (pspec, wavetbl_fluidsynth_options_quark); - g_value_set_boxed (value, strv); -+ retval = FLUID_OK; - } - else - { -@@ -1024,7 +1060,7 @@ wavetbl_fluidsynth_get_property (GObject - } - } - -- if (!retval) -+ if (retval == FLUID_FAILED) - g_critical ("Failed to get FluidSynth property '%s'", name); - - return; -@@ -1087,7 +1123,7 @@ wavetbl_fluidsynth_get_property (GObject - mods = ipatch_sf2_mod_list_duplicate (wavetbl->mods); - SWAMI_UNLOCK_READ (wavetbl); - -- g_value_set_boxed_take_ownership (value, mods); -+ g_value_take_boxed (value, mods); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -@@ -1125,7 +1161,7 @@ wavetbl_fluidsynth_midi_ctrl_callback (S - WavetblFluidSynth *wavetbl - = WAVETBL_FLUIDSYNTH (((SwamiControlFunc *)control)->user_data); - fluid_synth_t *synth; -- GValueArray *valarray = NULL; -+ GArray *valarray = NULL; - SwamiMidiEvent *midi; - int i, count = 1; /* default for single values */ - -@@ -1133,16 +1169,16 @@ wavetbl_fluidsynth_midi_ctrl_callback (S - synth = wavetbl->synth; - - /* if its multiple values, fetch the value array */ -- if (G_VALUE_TYPE (value) == G_TYPE_VALUE_ARRAY) -+ if (G_VALUE_TYPE (value) == G_TYPE_ARRAY) - { - valarray = g_value_get_boxed (value); -- count = valarray->n_values; -+ count = valarray->len; - } - - i = 0; - while (i < count) - { -- if (valarray) value = g_value_array_get_nth (valarray, i); -+ if (valarray) value = &g_array_index (valarray, GValue, i); - - if (G_VALUE_TYPE (value) == SWAMI_TYPE_MIDI_EVENT - && (midi = g_value_get_boxed (value))) -@@ -1220,10 +1256,15 @@ wavetbl_fluidsynth_open (SwamiWavetbl *s - } - - /* hook our sfloader */ -- loader = g_malloc0 (sizeof (fluid_sfloader_t)); -- loader->data = wavetbl; -- loader->free = sfloader_free; -- loader->load = sfloader_load_sfont; -+ loader = new_fluid_sfloader(sfloader_load_sfont, delete_fluid_sfloader); -+ if(loader == NULL) -+ { -+ g_set_error (err, SWAMI_ERROR, SWAMI_ERROR_FAIL, -+ _("Failed to create FluidSynth sfloader")); -+ SWAMI_UNLOCK_WRITE (wavetbl); -+ return (FALSE); -+ } -+ fluid_sfloader_set_data(loader, wavetbl); - fluid_synth_add_sfloader (wavetbl->synth, loader); - - wavetbl->audio = new_fluid_audio_driver (wavetbl->settings, wavetbl->synth); -@@ -1238,7 +1279,6 @@ wavetbl_fluidsynth_open (SwamiWavetbl *s - (void *)wavetbl); - if (wavetbl->midi_router) - { -- fluid_synth_set_midi_router (wavetbl->synth, wavetbl->midi_router); - wavetbl->midi = - new_fluid_midi_driver (wavetbl->settings, - fluid_midi_router_handle_midi_event, -@@ -1562,14 +1602,6 @@ find_chorus_preset (const char *name) - /* FluidSynth sfloader functions */ - - --/** FluidSynth sfloader "free" function */ --static int --sfloader_free (fluid_sfloader_t *loader) --{ -- g_free (loader); -- return (_SYNTH_OK); --} -- - /** FluidSynth sfloader "load" function */ - static fluid_sfont_t * - sfloader_load_sfont (fluid_sfloader_t *loader, const char *filename) -@@ -1592,17 +1624,12 @@ sfloader_load_sfont (fluid_sfloader_t *l - return (NULL); /* didn't begin with '&' or '!' */ - - sfont_data = g_malloc0 (sizeof (sfloader_sfont_data_t)); -- sfont_data->wavetbl = (WavetblFluidSynth *)(loader->data); -+ sfont_data->wavetbl = (WavetblFluidSynth *)(fluid_sfloader_get_data(loader)); - sfont_data->base_item = IPATCH_BASE (item); - -- sfont = g_malloc0 (sizeof (fluid_sfont_t)); -- sfont->data = sfont_data; -- sfont->free = sfloader_sfont_free; -- sfont->get_name = sfloader_sfont_get_name; -- sfont->get_preset = sfloader_sfont_get_preset; -- sfont->iteration_start = sfloader_sfont_iteration_start; -- sfont->iteration_next = sfloader_sfont_iteration_next; -- -+ sfont = new_fluid_sfont(sfloader_sfont_get_name, sfloader_sfont_get_preset, NULL, NULL, sfloader_sfont_free); -+ fluid_sfont_set_data(sfont, sfont_data); -+ - return (sfont); - } - -@@ -1612,26 +1639,26 @@ sfloader_sfont_free (fluid_sfont_t *sfon - { - sfloader_sfont_data_t *sfont_data; - -- sfont_data = (sfloader_sfont_data_t *)(sfont->data); -+ sfont_data = (sfloader_sfont_data_t *)(fluid_sfont_get_data(sfont)); - - if (sfont_data->base_item) /* -- remove reference */ - g_object_unref (IPATCH_ITEM (sfont_data->base_item)); - - g_free (sfont_data); -- g_free (sfont); -+ delete_fluid_sfont (sfont); - - return (_SYNTH_OK); - } - - /* sfloader callback to get a patch file name */ --static char * -+static const char * - sfloader_sfont_get_name (fluid_sfont_t *sfont) - { - sfloader_sfont_data_t *sfont_data; - static char buf[256]; /* using static buffer so info string can be freed */ - char *s; - -- sfont_data = (sfloader_sfont_data_t *)(sfont->data); -+ sfont_data = (sfloader_sfont_data_t *)(fluid_sfont_get_data(sfont)); - - if (sfont_data->base_item) - { -@@ -1646,15 +1673,15 @@ sfloader_sfont_get_name (fluid_sfont_t * - - /* sfloader callback to get a preset (instrument) by bank and preset number */ - static fluid_preset_t * --sfloader_sfont_get_preset (fluid_sfont_t *sfont, unsigned int bank, -- unsigned int prenum) -+sfloader_sfont_get_preset (fluid_sfont_t *sfont, int bank, -+ int prenum) - { - sfloader_sfont_data_t *sfont_data; - sfloader_preset_data_t *preset_data; - fluid_preset_t* preset; - int b, p; - -- sfont_data = (sfloader_sfont_data_t *)(sfont->data); -+ sfont_data = (sfloader_sfont_data_t *)(fluid_sfont_get_data(sfont)); - - /* active item bank:preset requested? */ - swami_wavetbl_get_active_item_locale (SWAMI_WAVETBL (sfont_data->wavetbl), &b, &p); -@@ -1663,14 +1690,13 @@ sfloader_sfont_get_preset (fluid_sfont_t - { - g_object_ref (G_OBJECT (sfont_data->wavetbl)); /* ++ inc wavetbl ref */ - -- preset = g_malloc0 (sizeof (fluid_preset_t)); -- preset->sfont = sfont; -- preset->data = sfont_data->wavetbl; -- preset->free = sfloader_active_preset_free; -- preset->get_name = sfloader_active_preset_get_name; -- preset->get_banknum = sfloader_active_preset_get_banknum; -- preset->get_num = sfloader_active_preset_get_num; -- preset->noteon = sfloader_active_preset_noteon; -+ preset = new_fluid_preset(sfont, -+ sfloader_active_preset_get_name, -+ sfloader_active_preset_get_banknum, -+ sfloader_active_preset_get_num, -+ sfloader_active_preset_noteon, -+ sfloader_active_preset_free); -+ fluid_preset_set_data(preset, sfont_data->wavetbl); - } - else /* regular preset request */ - { -@@ -1691,39 +1717,25 @@ sfloader_sfont_get_preset (fluid_sfont_t - - preset_data->item = item; /* !! item already referenced by find */ - -- preset = g_malloc0 (sizeof (fluid_preset_t)); -- preset->sfont = sfont; -- preset->data = preset_data; -- preset->free = sfloader_preset_free; -- preset->get_name = sfloader_preset_get_name; -- preset->get_banknum = sfloader_preset_get_banknum; -- preset->get_num = sfloader_preset_get_num; -- preset->noteon = sfloader_preset_noteon; -+ preset = new_fluid_preset(sfont, -+ sfloader_preset_get_name, -+ sfloader_preset_get_banknum, -+ sfloader_preset_get_num, -+ sfloader_preset_noteon, -+ sfloader_preset_free); -+ fluid_preset_set_data(preset, preset_data); - } - - return (preset); - } - --/* sfloader callback to start a SoundFont preset iteration */ --static void --sfloader_sfont_iteration_start (fluid_sfont_t *sfont) --{ --} -- --/* sfloader callback to get next preset in a SoundFont iteration */ --static int --sfloader_sfont_iteration_next (fluid_sfont_t *sfont, fluid_preset_t *preset) --{ -- return (0); --} -- - /* sfloader callback to clean up an fluid_preset_t structure */ --static int -+static void - sfloader_preset_free (fluid_preset_t *preset) - { - sfloader_preset_data_t *preset_data; - -- preset_data = preset->data; -+ preset_data = fluid_preset_get_data(preset); - - /* -- remove item reference */ - g_object_unref (IPATCH_ITEM (preset_data->item)); -@@ -1732,26 +1744,22 @@ sfloader_preset_free (fluid_preset_t *pr - g_object_unref (G_OBJECT (preset_data->wavetbl)); - - g_free (preset_data); -- g_free (preset); -- -- return (_SYNTH_OK); -+ delete_fluid_preset (preset); - } - - /* sfloader callback to clean up a active item preset structure */ --static int -+static void - sfloader_active_preset_free (fluid_preset_t *preset) - { -- g_object_unref (G_OBJECT (preset->data)); /* -- remove wavetbl obj ref */ -- g_free (preset); -- -- return (_SYNTH_OK); -+ g_object_unref (G_OBJECT (fluid_preset_get_data(preset))); /* -- remove wavetbl obj ref */ -+ delete_fluid_preset (preset); - } - - /* sfloader callback to get the name of a preset */ --static char * -+static const char * - sfloader_preset_get_name (fluid_preset_t *preset) - { -- sfloader_preset_data_t *preset_data = preset->data; -+ sfloader_preset_data_t *preset_data = fluid_preset_get_data(preset); - static char buf[256]; /* return string is static */ - char *name; - -@@ -1763,7 +1771,7 @@ sfloader_preset_get_name (fluid_preset_t - } - - /* sfloader callback to get name of active preset */ --static char * -+static const char * - sfloader_active_preset_get_name (fluid_preset_t *preset) - { - return (_("")); -@@ -1773,7 +1781,7 @@ sfloader_active_preset_get_name (fluid_p - static int - sfloader_preset_get_banknum (fluid_preset_t *preset) - { -- sfloader_preset_data_t *preset_data = preset->data; -+ sfloader_preset_data_t *preset_data = fluid_preset_get_data(preset); - int bank; - - g_object_get (preset_data->item, "bank", &bank, NULL); -@@ -1784,7 +1792,7 @@ sfloader_preset_get_banknum (fluid_prese - static int - sfloader_active_preset_get_banknum (fluid_preset_t *preset) - { -- sfloader_preset_data_t *preset_data = preset->data; -+ sfloader_preset_data_t *preset_data = fluid_preset_get_data(preset); - int bank; - - g_object_get (preset_data->wavetbl, "active-bank", &bank, NULL); -@@ -1795,7 +1803,7 @@ sfloader_active_preset_get_banknum (flui - static int - sfloader_preset_get_num (fluid_preset_t *preset) - { -- sfloader_preset_data_t *preset_data = preset->data; -+ sfloader_preset_data_t *preset_data = fluid_preset_get_data(preset); - int program; - - g_object_get (preset_data->item, "program", &program, NULL); -@@ -1806,7 +1814,7 @@ sfloader_preset_get_num (fluid_preset_t - static int - sfloader_active_preset_get_num (fluid_preset_t *preset) - { -- sfloader_preset_data_t *preset_data = preset->data; -+ sfloader_preset_data_t *preset_data = fluid_preset_get_data(preset); - int psetnum; - - g_object_get (preset_data->wavetbl, "active-program", &psetnum, NULL); -@@ -1818,8 +1826,8 @@ static int - sfloader_preset_noteon (fluid_preset_t *preset, fluid_synth_t *synth, - int chan, int key, int vel) - { -- sfloader_preset_data_t *preset_data = preset->data; -- WavetblFluidSynth *wavetbl = preset->data; -+ sfloader_preset_data_t *preset_data = fluid_preset_get_data(preset); -+ WavetblFluidSynth *wavetbl = fluid_preset_get_data(preset); - - /* No item matches the bank:program? */ - if (!preset_data->item) return (_SYNTH_OK); -@@ -1836,7 +1844,7 @@ static int - sfloader_active_preset_noteon (fluid_preset_t *preset, fluid_synth_t *synth, - int chan, int key, int vel) - { -- WavetblFluidSynth *wavetbl = preset->data; -+ WavetblFluidSynth *wavetbl = fluid_preset_get_data(preset); - - SWAMI_LOCK_WRITE (wavetbl); - if (!wavetbl->active_item) -@@ -1863,7 +1871,7 @@ cache_instrument (WavetblFluidSynth *wav - IpatchList *list; - IpatchItem *solo_item = NULL; - int i, count; -- -+ - /* no SF2 voice cache converter? */ - if (!ipatch_find_converter (G_OBJECT_TYPE (item), IPATCH_TYPE_SF2_VOICE_CACHE)) - return; -@@ -1924,7 +1932,7 @@ cache_instrument_noteon (WavetblFluidSyn - IpatchSF2GenArray *gen_array; - fluid_voice_t *flvoice; - fluid_sample_t *wusample; -- fluid_mod_t wumod; -+ fluid_mod_t *wumod; - IpatchSF2Mod *mod; - IpatchSF2Voice *voice; - int i, voice_count, voice_num; -@@ -1963,27 +1971,24 @@ cache_instrument_noteon (WavetblFluidSyn - if (!voice->sample_store) continue; /* For ROM and other non-readable samples */ - - /* FIXME - pool of wusamples? */ -- wusample = g_malloc0 (sizeof (fluid_sample_t)); -- -- wusample->name[0] = '\0'; -- wusample->start = 0; -- wusample->end = voice->sample_size - 1; -- wusample->loopstart = voice->loop_start; -- wusample->loopend = voice->loop_end; -- wusample->samplerate = voice->rate; -- wusample->origpitch = voice->root_note; -- wusample->pitchadj = voice->fine_tune; -- wusample->sampletype = 0; -- wusample->valid = 1; -- -- wusample->data = ipatch_sample_store_cache_get_location -- ((IpatchSampleStoreCache *)(voice->sample_store)); -+ wusample = new_fluid_sample(); - -+ fluid_sample_set_sound_data(wusample, -+ ipatch_sample_store_cache_get_location((IpatchSampleStoreCache *)(voice->sample_store)), -+ NULL, -+ voice->sample_size, -+ voice->rate, -+ FALSE -+ ); -+ -+ fluid_sample_set_loop(wusample, voice->loop_start, voice->loop_end); -+ fluid_sample_set_pitch(wusample, voice->root_note, voice->fine_tune); -+ - /* allocate the FluidSynth voice */ - flvoice = fluid_synth_alloc_voice (synth, wusample, chan, key, vel); - if (!flvoice) - { -- g_free (wusample); -+ delete_fluid_sample (wusample); - g_object_unref (cache); /* -- unref cache */ - return (TRUE); - } -@@ -1994,32 +1999,32 @@ cache_instrument_noteon (WavetblFluidSyn - if (IPATCH_SF2_GEN_ARRAY_TEST_FLAG (gen_array, i)) - fluid_voice_gen_set (flvoice, i, (float)(gen_array->values[i].sword)); - -+ wumod = g_alloca(fluid_mod_sizeof()); - p = voice->mod_list; - while (p) - { -- // wumod = fluid_mod_new (); - mod = (IpatchSF2Mod *)(p->data); - -- wumod.dest = mod->dest; -- wumod.src1 = mod->src & IPATCH_SF2_MOD_MASK_CONTROL; -- -- wumod.flags1 = ((mod->src & (IPATCH_SF2_MOD_MASK_DIRECTION -+ fluid_mod_set_dest(wumod, mod->dest); -+ fluid_mod_set_source1(wumod, -+ mod->src & IPATCH_SF2_MOD_MASK_CONTROL, -+ ((mod->src & (IPATCH_SF2_MOD_MASK_DIRECTION - | IPATCH_SF2_MOD_MASK_POLARITY - | IPATCH_SF2_MOD_MASK_TYPE)) - >> IPATCH_SF2_MOD_SHIFT_DIRECTION) -- | ((mod->src & IPATCH_SF2_MOD_MASK_CC) ? FLUID_MOD_CC : 0); -- -- wumod.src2 = mod->amtsrc & IPATCH_SF2_MOD_MASK_CONTROL; -+ | ((mod->src & IPATCH_SF2_MOD_MASK_CC) ? FLUID_MOD_CC : 0)); - -- wumod.flags2 = ((mod->amtsrc & (IPATCH_SF2_MOD_MASK_DIRECTION -+ fluid_mod_set_source2(wumod, -+ mod->amtsrc & IPATCH_SF2_MOD_MASK_CONTROL, -+ ((mod->amtsrc & (IPATCH_SF2_MOD_MASK_DIRECTION - | IPATCH_SF2_MOD_MASK_POLARITY - | IPATCH_SF2_MOD_MASK_TYPE)) - >> IPATCH_SF2_MOD_SHIFT_DIRECTION) -- | ((mod->amtsrc & IPATCH_SF2_MOD_MASK_CC) ? FLUID_MOD_CC : 0); -+ | ((mod->amtsrc & IPATCH_SF2_MOD_MASK_CC) ? FLUID_MOD_CC : 0)); - -- wumod.amount = mod->amount; -+ fluid_mod_set_amount(wumod, mod->amount); - -- fluid_voice_add_mod (flvoice, &wumod, FLUID_VOICE_OVERWRITE); -+ fluid_voice_add_mod (flvoice, wumod, FLUID_VOICE_OVERWRITE); - - p = p->next; - } diff --git a/swami-gpointer-int-size.patch b/swami-gpointer-int-size.patch deleted file mode 100644 index 197b09a..0000000 --- a/swami-gpointer-int-size.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -rupN swami-2.0.0.org/src/libswami/SwamiObject.c swami-2.0.0/src/libswami/SwamiObject.c ---- swami-2.0.0.org/src/libswami/SwamiObject.c 2010-10-25 13:04:05.000000000 -0400 -+++ swami-2.0.0/src/libswami/SwamiObject.c 2018-10-22 20:14:01.612230765 -0400 -@@ -299,7 +299,7 @@ swami_type_get_children (GType group_typ - ap = retarray = g_malloc ((g_list_length (sortlist) + 1) * sizeof (GType)); - while (tp) - { -- *ap = GPOINTER_TO_INT (tp->data); /* store GType into array element */ -+ *ap = GPOINTER_TO_SIZE (tp->data); /* store GType into array element */ - ap++; - tp = g_list_delete_link (tp, tp); /* delete and iterate */ - } -diff -rupN swami-2.0.0.org/src/swamigui/SwamiguiItemMenu.c swami-2.0.0/src/swamigui/SwamiguiItemMenu.c ---- swami-2.0.0.org/src/swamigui/SwamiguiItemMenu.c 2010-10-25 13:04:05.000000000 -0400 -+++ swami-2.0.0/src/swamigui/SwamiguiItemMenu.c 2018-10-22 20:14:52.385099697 -0400 -@@ -312,7 +312,7 @@ swamigui_item_menu_add (SwamiguiItemMenu - /* find insert position from order info parameter */ - for (p = list, index = 0; p; p = p->next, index++) - { -- order = GPOINTER_TO_INT (g_object_get_data (p->data, "_order")); -+ order = GPOINTER_TO_SIZE (g_object_get_data (p->data, "_order")); - if (info->order < order) break; - } - -diff -rupN swami-2.0.0.org/src/swamigui/SwamiguiModEdit.c swami-2.0.0/src/swamigui/SwamiguiModEdit.c ---- swami-2.0.0.org/src/swamigui/SwamiguiModEdit.c 2010-10-25 13:04:05.000000000 -0400 -+++ swami-2.0.0/src/swamigui/SwamiguiModEdit.c 2018-10-22 20:14:52.382099704 -0400 -@@ -1017,7 +1017,7 @@ swamigui_mod_edit_cb_combo_list_select ( - src = &newmod.src; - else src = &newmod.amtsrc; - -- ctrl = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (litem), "ctrlnum")); -+ ctrl = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (litem), "ctrlnum")); - *src &= ~(IPATCH_SF2_MOD_MASK_CONTROL | IPATCH_SF2_MOD_MASK_CC); - *src |= ctrl; - -diff -rupN swami-2.0.0.org/src/swamigui/SwamiguiPref.c swami-2.0.0/src/swamigui/SwamiguiPref.c ---- swami-2.0.0.org/src/swamigui/SwamiguiPref.c 2010-10-25 13:04:05.000000000 -0400 -+++ swami-2.0.0/src/swamigui/SwamiguiPref.c 2018-10-22 20:14:52.383099701 -0400 -@@ -431,7 +431,7 @@ keybindings_set_bind_mode (GtkWidget *pr - GtkWidget *lbl; - - /* Check if requested mode is already set */ -- if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (prefwidg), "bind-mode")) == mode) -+ if (GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (prefwidg), "bind-mode")) == mode) - return; - - lbl = swamigui_util_glade_lookup (prefwidg, "LabelKeyBind"); -diff -rupN swami-2.0.0.org/src/swamigui/patch_funcs.c swami-2.0.0/src/swamigui/patch_funcs.c ---- swami-2.0.0.org/src/swamigui/patch_funcs.c 2010-10-25 13:04:05.000000000 -0400 -+++ swami-2.0.0/src/swamigui/patch_funcs.c 2018-10-22 20:14:52.390099685 -0400 -@@ -822,7 +822,7 @@ swamigui_cb_export_samples_response (Gtk - } - - samples = IPATCH_LIST (g_object_get_data (G_OBJECT (dialog), "samples")); -- multi = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "multi")); -+ multi = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (dialog), "multi")); - combo = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "combo")); - - filepath = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); -diff -rupN swami-2.0.0.org/src/swamigui/widgets/combo-box.c swami-2.0.0/src/swamigui/widgets/combo-box.c ---- swami-2.0.0.org/src/swamigui/widgets/combo-box.c 2004-12-15 01:14:40.000000000 -0500 -+++ swami-2.0.0/src/swamigui/widgets/combo-box.c 2018-10-22 20:14:52.387099692 -0400 -@@ -508,7 +508,7 @@ static gboolean - cb_tearable_enter_leave (GtkWidget * w, GdkEventCrossing * event, - gpointer data) - { -- gboolean const flag = GPOINTER_TO_INT (data); -+ gboolean const flag = GPOINTER_TO_SIZE (data); - gtk_widget_set_state (w, flag ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); - return FALSE; - } -diff -rupN swami-2.0.0.org/src/swamigui/widgets/icon-combo.c swami-2.0.0/src/swamigui/widgets/icon-combo.c ---- swami-2.0.0.org/src/swamigui/widgets/icon-combo.c 2003-06-24 15:53:52.000000000 -0400 -+++ swami-2.0.0/src/swamigui/widgets/icon-combo.c 2018-10-22 20:14:52.388099690 -0400 -@@ -109,7 +109,7 @@ emit_change (GtkWidget *button, IconComb - static void - icon_clicked (GtkWidget *button, IconCombo *ic) - { -- int index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "index")); -+ int index = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (button), "index")); - icon_combo_select_icon_index (ic, index); - emit_change (button, ic); - combo_box_popup_hide (COMBO_BOX (ic)); diff --git a/swami-snapshot.sh b/swami-snapshot.sh deleted file mode 100644 index 29e2964..0000000 --- a/swami-snapshot.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# $1 - revision number to checkout. -: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X - or fetch the latest revision by: `basename $0` latest"} - -set -e - -tmp=$(mktemp -d) - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) -name=swami -version=2.0.0 - -if [[ $1 == "latest" ]] ; then -revision=HEAD -else -revision=$1 -fi - -pushd "$tmp" >/dev/null -echo "Fetching SVN revision: $1" -svn export -r$revision https://swami.svn.sourceforge.net/svnroot/swami/trunk/$name $name-$version |tee $name.stdout -revision=$(cat $name.stdout|grep "Exported revision"|sed 's|[^0-9]*||g') -echo "Fetched SVN revision: $revision" -rm -f $name.stdout - -tar jcf "$pwd"/$name-$version-svn$revision.tar.bz2 $name-$version -echo "Written: $name-$version-svn$revision.tar.bz2" -popd >/dev/null diff --git a/swami.spec b/swami.spec deleted file mode 100644 index 6925110..0000000 --- a/swami.spec +++ /dev/null @@ -1,260 +0,0 @@ -%define __cmake_in_source_build 1 - -Name: swami -Version: 2.0.0 -Release: 25.20110806svn386%{?dist} -Summary: MIDI instrument and sound editor -License: GPLv2 -URL: http://www.swamiproject.org/ -# Upstream applied our patches and switched to cmake in trunk. It is easier -# just to package the trunk than patching it. The original tarball is at -#Source0: http://downloads.sourceforge.net/swami/swami-%%{version}.tar.gz -Source0: swami-2.0.0-svn386.tar.bz2 -# To fetch the sources -Source1: swami-snapshot.sh -Patch0: swami-gpointer-int-size.patch -# Fluidsynth2 support. From upstream trunk: -Patch1: swami-fluidsynth2.patch - -BuildRequires: cmake -BuildRequires: desktop-file-utils -BuildRequires: fftw-devel -BuildRequires: fluidsynth-devel -BuildRequires: gcc -BuildRequires: libglade2-devel -BuildRequires: libgnomecanvas-devel -BuildRequires: libinstpatch-devel -BuildRequires: librsvg2-devel - -Requires: hicolor-icon-theme -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description -The Swami Project - Sampled Waveforms And Musical Instruments - is a collection -of free software for editing and sharing MIDI instruments and sounds. Swami -aims to provide an instrument editing and sharing software for instrument -formats such as SoundFont, DLS and GigaSampler. - -%package libs -Summary: MIDI instrument and sound editor library - -%description libs -Shared libraries for The Swami Project - Sampled Waveforms And Musical -Instruments. - -%package devel -Summary: MIDI instrument and sound editor development files -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -Headers and development files for The Swami Project - Sampled Waveforms And -Musical Instruments. - -%prep -%setup -q -%patch0 -p1 -b .gpointer_int_size -%patch1 -p1 -b .fluidsynth2 - -%build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake} -DLIB_SUFFIX="" -DPLUGINS_DIR=%{_libdir}/swami/ .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - - -%install -make install DESTDIR=%{buildroot} -C %{_target_platform} -desktop-file-install \ - --add-category="AudioVideo" \ - --add-category="X-Jack" \ - --remove-category="Application" \ - --remove-key="Encoding" \ - --delete-original \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}/%{_datadir}/applications/%{name}.desktop - -%files -%doc AUTHORS ChangeLog NEWS README -%{_libdir}/%{name}/ -%{_datadir}/%{name}/ -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/mime/packages/%{name}.xml - -%files libs -%license COPYING -%{_libdir}/lib%{name}*.so.* - -%files devel -%doc HACKERS -%{_libdir}/lib%{name}*.so -%{_includedir}/%{name}/ - - -%changelog -* Tue Sep 22 2020 Jeff Law - 2.0.0-25.20110806svn386 -- Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes - -* Sat Aug 01 2020 Fedora Release Engineering - 2.0.0-24.20110806svn386 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.0.0-23.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Feb 17 2020 Orcan Ogetbil - 2.0.0-22.20110806svn386 -- Rebuild against fluidsynth2 - -* Fri Jan 31 2020 Fedora Release Engineering - 2.0.0-21.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.0.0-20.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.0.0-19.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 23 2018 Orcan Ogetbil - 2.0.0-18.20110806svn386 -- Patch for invalid pointer cast on 64bit systems -- Remove old scriptlets - -* Sat Jul 14 2018 Fedora Release Engineering - 2.0.0-17.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0.0-16.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 2.0.0-15.20110806svn386 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0.0-14.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.0-13.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.0-12.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.0.0-11.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.0.0-10.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Oct 02 2014 Rex Dieter 2.0.0-9.20110806svn386 -- update icon/mime scriptlets, use %%name macro in subpkg deps - -* Mon Aug 18 2014 Fedora Release Engineering - 2.0.0-8.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.0.0-7.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.0.0-6.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.0.0-5.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 2.0.0-4.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.0.0-3.20110806svn386 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 2.0.0-2.20110806svn386 -- Rebuild for new libpng - -* Fri Aug 12 2011 Orcan Ogetbil - 2.0.0-1.20110806svn386 -- Update to swami2. Fixes RHBZ#728694 - -* Wed Feb 09 2011 Fedora Release Engineering - 0.9.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Aug 05 2009 Orcan Ogetbil - 0.9.4-6 -- Update .desktop file - -* Sun Jul 26 2009 Fedora Release Engineering - 0.9.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun Apr 12 2009 Orcan Ogetbil - 0.9.4-4 -- Add Requires: hicolor-icon-theme - -* Fri Mar 27 2009 Orcan Ogetbil - 0.9.4-3 -- Initial Fedora build - -* Sun Jul 27 2008 Fernando Lopez-Lezcano 0.9.4-2 -- updated for new fluidsynth libraries (1.0.8) on fc8 - -* Wed Nov 14 2007 Fernando Lopez-Lezcano -- updated desktop categories -- add popt-devel build requirement for f8 - -* Fri Sep 14 2007 Fernando Lopez-Lezcano 0.9.4-1 -- updated to 0.9.4 - -* Tue May 8 2007 Fernando Lopez-Lezcano 0.9.3-2 -- build on fc7, use autogen.sh to use the newer versions of auto* tools -- add MKINSTALLDIRS explicitly in make invocation - -* Mon Apr 16 2007 Fernando Lopez-Lezcano 0.9.3-2 -- spec file tweaks, build on fc6 - -* Mon May 29 2006 Fernando Lopez-Lezcano 0.9.3-1 -- added Planet CCRMA categories to desktop file, spec file cleanups -- updated to 0.9.3 - -* Fri Nov 18 2005 Fernando Lopez-Lezcano 0.9.2-3 -- rebuild for new version of fluidsynth (1.0.6) -- build requires lash (name change from ladcca) -- change all references from ladcca to lash -- added autotools build requirement (for change to lash), needs - automake17 - -* Fri Dec 31 2004 Fernando Lopez-Lezcano -- spec file cleanup - -* Fri Sep 24 2004 Fernando Lopez-Lezcano 0.9.2-2 -- built for new fluidsynth libraries -- set libfluidsynth require to be for the exact version, swami is - very picky and won't work with newer versions than the one it was - compiled with - -* Thu May 20 2004 Fernando Lopez-Lezcano -- added code to recognize libpng12.pc in configure - -* Wed May 12 2004 Fernando Lopez-Lezcano -- added buildrequires - -* Sun Feb 29 2004 Fernando Lopez-Lezcano 0.9.2-1 -- updated to 0.9.2 -- patched config.status to force recognition of libpng -- erased and obsoleted old libswami and libswami-devel packages - -* Mon Nov 17 2003 Fernando Lopez-Lezcano 0.9.1a-3 -- spec file tweaks, autogen ommited, does not work on FC1 - -* Fri Jul 25 2003 Fernando Lopez-Lezcano 0.9.1-3 -- rebuilt for fluidsynth 1.0.3 -- added release tags and an explicit dependency with the current - version of libfluidsynth - -* Fri Jul 25 2003 Fernando Lopez-Lezcano 0.9.1-2 -- rebuilt for fluidsynth 1.0.2 - -* Thu May 8 2003 Fernando Lopez-Lezcano 0.9.1-1 -- updated to 0.9.1a - -* Thu Mar 6 2003 Fernando Lopez-Lezcano 0.9.0-1.cvs -- cvs: 20030306.185320 - -* Thu Feb 27 2003 Fernando Lopez-Lezcano 0.9.0-1.cvs -- adapted from mandrake spec file -- switched over to cvs swami - -* Fri Jan 31 2003 Austin Acton 0.9.0-1mdk -- adapted spec file from Torbjorn Turpeinen