- updated to 0.6.6

- updated config patch
- removed obsolete fluidsynth2 patch

diff --git a/config.patch b/config.patch
index a7e3fe3a825deaa7294665d43baeaf98a33b8511..635e9ec9ad271462a9bb4424c6c798bf5dcac646 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,5 @@
-diff -dur freewheeling-4a03065f9d2f520cbd37dd560b4cae5685418153.orig/data/interfaces.xml freewheeling-4a03065f9d2f520cbd37dd560b4cae5685418153/data/interfaces.xml
---- freewheeling-4a03065f9d2f520cbd37dd560b4cae5685418153.orig/data/interfaces.xml     2017-02-24 19:47:23.000000000 +0100
-+++ freewheeling-4a03065f9d2f520cbd37dd560b4cae5685418153/data/interfaces.xml  2017-03-10 19:39:59.224087433 +0100
+--- freewheeling-0.6.6/data/interfaces.xml.orig        2020-05-15 20:20:08.923100009 +0200
++++ freewheeling-0.6.6/data/interfaces.xml     2020-05-15 20:27:55.703904574 +0200
 @@ -21,19 +21,25 @@
    <interface setup="coreinterface.xml" switchable="0"/>
  
@@ -10,20 +9,19 @@ diff -dur freewheeling-4a03065f9d2f520cbd37dd560b4cae5685418153.orig/data/interf
    <interface setup="synthedit.xml" switchable="0"/>
    <interface setup="bcf2000-synthedit.xml" switchable="0"/>
    <interface setup="rme-hdsp.xml" switchable="0"/>
-+  -->
++   -->
  
    <!-- Bare minimum -->
    <interface setup="browsers.xml" switchable="0"/>
  
-   <!-- Added user interfaces -->
+   <!-- Controller device<->loop mapping interfaces -->
 +  <!--
    <interface setup="midifootswitch.xml" switchable="0"/>
-   <interface setup="bcf2000.xml"/>
--<!-- <interface setup="pckeyboard.xml"/> -->
-+  -->
-+  <interface setup="pckeyboard.xml"/>
++   -->
+   <interface setup="pckeyboard.xml"/>
 +  <!--
    <interface setup="midikeyboard.xml"/>
+   <interface setup="bcf2000.xml"/>
 -<!-- <interface setup="pcr-m1.xml" switchable="0"/> -->
 +  <interface setup="pcr-m1.xml" switchable="0"/>
    <interface setup="dancemat.xml"/>

diff --git a/fluidsynth2.patch b/fluidsynth2.patch
deleted file mode 100644 (file)
index 7d86ae5..0000000
--- a/fluidsynth2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -dur freewheeling-0.6.4.orig/src/fweelin_browser.h freewheeling-0.6.4/src/fweelin_browser.h
---- freewheeling-0.6.4.orig/src/fweelin_browser.h      2017-04-03 21:19:44.000000000 +0200
-+++ freewheeling-0.6.4/src/fweelin_browser.h   2018-11-20 19:22:05.157793326 +0100
-@@ -52,7 +52,7 @@
- class BrowserItem {
-  public:
-   // Initialize a browser item with name n
--  BrowserItem(char *n = 0, char default_name = 1) : 
-+  BrowserItem(const char *n = 0, char default_name = 1) : 
-     default_name(default_name), next(0), prev(0) {
-     if (n == 0)
-       name = 0;
-@@ -415,7 +415,7 @@
- public:
- 
-   PatchItem (int id = 0, int bank = 0, int prog = 0, int channel = 0,
--             char *name = 0, char bypasscc = 0, int bypasschannel = -1, float bypasstime1 = 0.0, float bypasstime2 = 10.0) :
-+             const char *name = 0, char bypasscc = 0, int bypasschannel = -1, float bypasstime1 = 0.0, float bypasstime2 = 10.0) :
-     BrowserItem(name), id(id), bank(bank), prog(prog), channel(channel),
-     bypasscc(bypasscc), bypasschannel(bypasschannel), bypasstime1(bypasstime1), bypasstime2(bypasstime2), 
-     zones(0), numzones(0) {};
-diff -dur freewheeling-0.6.4.orig/src/fweelin_fluidsynth.cc freewheeling-0.6.4/src/fweelin_fluidsynth.cc
---- freewheeling-0.6.4.orig/src/fweelin_fluidsynth.cc  2017-04-03 21:19:44.000000000 +0200
-+++ freewheeling-0.6.4/src/fweelin_fluidsynth.cc       2018-11-20 19:21:42.736622350 +0100
-@@ -33,12 +33,6 @@
- 
- #include "fweelin_fluidsynth.h"
- 
--#define fluid_sfont_iteration_start(_sf) (*(_sf)->iteration_start)(_sf)
--#define fluid_sfont_iteration_next(_sf,_pr) (*(_sf)->iteration_next)(_sf,_pr)
--#define fluid_preset_get_name(_preset) (*(_preset)->get_name)(_preset)
--#define fluid_preset_get_banknum(_preset) (*(_preset)->get_banknum)(_preset)
--#define fluid_preset_get_num(_preset) (*(_preset)->get_num)(_preset)
--
- void FluidSynthParam_Int::Send(fluid_settings_t *settings) {
-   printf("FLUID: Setting parameter '%s' = '%d'\n",name,val);
-   fluid_settings_setint(settings, name, val);
-@@ -91,11 +85,11 @@
-     double pitches[12];
-     for (int i = 0; i < 12; i++)
-       pitches[i] = tuning;
--    fluid_synth_create_octave_tuning(synth, 0, 0, "DETUNE", pitches);
-+    fluid_synth_activate_octave_tuning(synth, 0, 0, "DETUNE", pitches, true);
- 
-     // Select tuning
-     for (int i = 0; i < MAX_MIDI_CHANNELS; i++) 
--      fluid_synth_select_tuning(synth, i, 0, 0);
-+      fluid_synth_activate_tuning(synth, i, 0, 0, true);
-   } else 
-     printf("FLUID: Using default tuning\n");
- 
-@@ -160,7 +154,7 @@
- 
- // Sets up our internal patch list based on loaded soundfonts
- void FluidSynthProcessor::SetupPatches() {
--  fluid_preset_t preset;
-+  fluid_preset_t *preset;
- 
-   PatchBrowser *br = (PatchBrowser *) app->getBROWSER(B_Patch);
- 
-@@ -174,12 +168,12 @@
-     for (int i = 0; i < sfcnt; i++) {
-       fluid_sfont_t *curfont = fluid_synth_get_sfont(synth,i);
-       fluid_sfont_iteration_start(curfont);
--      while (fluid_sfont_iteration_next(curfont, &preset))
-+      while ((preset = fluid_sfont_iteration_next(curfont)))
-         br->AddItem(new PatchItem(fluid_sfont_get_id(curfont),
--                                  fluid_preset_get_banknum(&preset),
--                                  fluid_preset_get_num(&preset),
-+                                  fluid_preset_get_banknum(preset),
-+                                  fluid_preset_get_num(preset),
-                                   fluidchan,
--                                  fluid_preset_get_name(&preset)));
-+                                  fluid_preset_get_name(preset)));
- 
-       if (i+1 < sfcnt) {
-         // End of soundfont- put in a divider

diff --git a/freewheeling.spec b/freewheeling.spec
index 12ef5c3b4621429fcf17354db15142f1ae967d55..69deae13ab0696732cb6405feebff9a620f93c45 100644 (file)
--- a/freewheeling.spec
+++ b/freewheeling.spec
@@ -1,44 +1,49 @@
+# TODO: system Vera font?
 Summary:       Freewheeling Live Looper
+Summary(pl.UTF-8):     Freewheeling - narzędzie do nagrywania pętli dźwiękowych w czasie rzeczywistym
 Name:          freewheeling
-Version:       0.6.4
-Release:       3
-License:       GPL v2
-Group:         Applications
+Version:       0.6.6
+Release:       1
+License:       GPL v2+
+Group:         Applications/Sound
+#Source0Download: https://github.com/free-wheeling/freewheeling/releases
 Source0:       https://github.com/free-wheeling/freewheeling/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 7a76624759929fe819d3a0d0dc8c0bb3
+# Source0-md5: 7ab4a2e6a9b46bff01f799f732f3e4c0
 Patch0:                config.patch
-Patch1:                fluidsynth2.patch
 URL:           https://github.com/free-wheeling/freewheeling/
-BuildRequires: SDL-devel
-BuildRequires: SDL_gfx-devel
-BuildRequires: SDL_ttf-devel
+BuildRequires: SDL-devel >= 1.2
+BuildRequires: SDL_gfx-devel >= 1.2
+BuildRequires: SDL_ttf-devel >= 1.2
 BuildRequires: alsa-lib-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: fluidsynth-devel
-BuildRequires: freetype-devel
-BuildRequires: gnutls-openssl-devel
+BuildRequires: freetype-devel >= 2
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: liblo-devel
 BuildRequires: libogg-devel
 BuildRequires: libsndfile-devel
-BuildRequires: libtool
+BuildRequires: libstdc++-devel
 BuildRequires: libvorbis-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2
+BuildRequires: nettle-devel
+BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Freewheeling provides a highly configurable, intuitive, and fluid user
 interface for instrumentalists to capture audio loops in real-time.
 
+%description -l pl.UTF-8
+Freewheeling udostępnia w dużym stopniu konfigurowalny, intuicyjny
+interfejs użytkownika dla instrumentalistów, służący do nagrywania
+pętli dźwiękowych w czasie rzeczywistym.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-export CFLAGS="%{rpmcflags} -I/usr/include/SDL"
-export CXXFLAGS="%{rpmcxxflags} -I/usr/include/SDL"
 %configure \
        --enable-fluidsynth
 
@@ -55,7 +60,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog THANKS TUNING
-%doc data/config-help.txt examples
+%doc AUTHORS ChangeLog THANKS TUNING data/config-help.txt examples
 %attr(755,root,root) %{_bindir}/fweelin
 %{_datadir}/fweelin