[SCM] calf/master: Import Debian patch 0.0.60-3.1

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ba997178faaf9ce0806bf299c6b700c5a7154d85
Author: Johannes Brandstätter <jbrandst at 2ds.eu>
Date:   Sat Sep 24 13:02:01 2016 +0200

    Import Debian patch 0.0.60-3.1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b408e6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.pc
diff --git a/debian/changelog b/debian/changelog
index 263b6f5..e9312ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calf (0.0.60-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix compilation errors when using GCC 6.
+
+ -- Johannes Brandstätter <jbrandst at 2ds.eu>  Sat, 24 Sep 2016 13:02:01 +0200
+
 calf (0.0.60-3) unstable; urgency=medium
 
   * Update watch file:
diff --git a/debian/patches/3001_gcc6_transition_fixes.patch b/debian/patches/3001_gcc6_transition_fixes.patch
new file mode 100644
index 0000000..9748f10
--- /dev/null
+++ b/debian/patches/3001_gcc6_transition_fixes.patch
@@ -0,0 +1,70 @@
+Description: Fix compilation errors when using GCC 6.
+ .
+Author: Johannes Brandstätter <jbrandst at 2ds.eu>
+Bug-Debian: https://bugs.debian.org/811883
+Last-Update: <2016-09-24>
+
+--- calf-0.0.60.orig/src/analyzer.cpp
++++ calf-0.0.60/src/analyzer.cpp
+@@ -470,13 +470,13 @@ void analyzer::draw(int subindex, float
+                                 lastoutL = fft_outL[_iter];
+                                 //pumping up actual signal an erase surrounding
+                                 // sounds
+-                                fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \
+-                                    fabs(fft_outL[_iter]) - var1L , 1e-20);
++                                fft_outL[_iter] = 0.25f * std::max(static_cast<double>(
++                                    n * 0.6f * fabs(fft_outL[_iter]) - var1L) , 1e-20);
+                                 if(_mode == 3 or _mode == 4) {
+                                     // do the same with R channel if needed
+                                     lastoutR = fft_outR[_iter];
+-                                    fft_outR[_iter] = 0.25f * std::max(n * \
+-                                        0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20);
++                                    fft_outR[_iter] = 0.25f * std::max(static_cast<double>(
++                                        n * 0.6f * fabs(fft_outR[_iter]) - var1R) , 1e-20);
+                                 }
+                                 break;
+                         }
+--- calf-0.0.60.orig/src/jack_client.cpp
++++ calf-0.0.60/src/jack_client.cpp
+@@ -226,7 +226,7 @@ void jack_client::calculate_plugin_order
+                 map<string, int>::const_iterator p = port_to_plugin.find((*k) + cnlen + 1);
+                 if (p != port_to_plugin.end())
+                 {
+-                    run_before.insert(make_pair<int, int>(p->second, i));
++                    run_before.insert(make_pair(p->second, i));
+                 }
+             }
+             jack_free(conns);
+--- calf-0.0.60.orig/src/modules_dist.cpp
++++ calf-0.0.60/src/modules_dist.cpp
+@@ -794,8 +794,8 @@ uint32_t tapesimulator_audio_module::pro
+             lfo2.advance(1);
+             
+             // dot
+-            rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2);
+-            input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2);
++            rms = std::max(rms, (fabs(Lo) + fabs(Ro)) / 2);
++            input = std::max(input, (fabs(Lc) + fabs(Rc)) / 2);
+             
+             float values[] = {inL, inR, outs[0][i], outs[1][i]};
+             meters.process(values);
+--- calf-0.0.60.orig/src/modules_limit.cpp
++++ calf-0.0.60/src/modules_limit.cpp
+@@ -429,7 +429,7 @@ uint32_t multibandlimiter_audio_module::
+                 }
+                 
+                 // write multiband coefficient to buffer
+-                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
++                buffer[pos] = std::min(static_cast<double>(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR))), 1.0);
+                 
+                 // step forward in multiband buffer
+                 pos = (pos + channels) % buffer_size;
+@@ -811,7 +811,7 @@ uint32_t sidechainlimiter_audio_module::
+                 }
+                 
+                 // write multiband coefficient to buffer
+-                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
++                buffer[pos] = std::min(static_cast<double>(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR))), 1.0);
+                 
+                 // step forward in multiband buffer
+                 pos = (pos + channels) % buffer_size;
diff --git a/debian/patches/series b/debian/patches/series
index 650394e..183388d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 1001_use_autoconf_dirnames.patch
 1002-lv2core_to_lv2.patch
 2001_use_colorbox.patch
+3001_gcc6_transition_fixes.patch

-- 
calf audio plugins packaging