[debian-edu-commits] debian-edu/pkg-team/ 02/03: New patch gcc5.patch to get the code building with gcc 5 in unstable.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository lmms.

commit d5c3043f16b6e6fdb10adebf803c36a202750235
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Sep 19 21:47:50 2015 +0200

    New patch gcc5.patch to get the code building with gcc 5 in unstable.
---
 debian/patches/gcc5.patch | 96 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 2 files changed, 97 insertions(+)

diff --git a/debian/patches/gcc5.patch b/debian/patches/gcc5.patch
new file mode 100644
index 0000000..e32fa62
--- /dev/null
+++ b/debian/patches/gcc5.patch
@@ -0,0 +1,96 @@
+Description: Fix build problems with gcc 5
+ The compiler complain about several problems with the code.
+  - Did not like !a != b, rewrote as a == !b.
+  - Did not like static inline functions used from inline functions,
+    rewrote inline to static inline functions.
+Author: Petter Reinholdtsen <pere at hungry.com>
+Bug-Debian: https://bugs.debian.org/777989
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2015-09-19
+
+Index: lmms/src/core/AutomatableModel.cpp
+===================================================================
+--- lmms.orig/src/core/AutomatableModel.cpp	2015-09-19 18:49:25.000000000 +0000
++++ lmms/src/core/AutomatableModel.cpp	2015-09-19 19:06:58.000000000 +0000
+@@ -312,8 +312,8 @@
+ 									it != m_linkedModels.end(); ++it )
+ 		{
+ 			if( (*it)->m_setValueDepth < 1 &&
+-				!(*it)->fittedValue( m_value ) !=
+-							 (*it)->m_value )
++				(*it)->fittedValue( m_value ) ==
++							 !(*it)->m_value )
+ 			{
+ 				(*it)->setAutomatedValue( value );
+ 			}
+diff --git lmms.orig/plugins/LadspaEffect/swh/hermes_filter_1200.c lmms/plugins/LadspaEffect/swh/hermes_filter_1200.c
+index bf3bbba..a8dd28e 100644
+--- lmms.orig/plugins/LadspaEffect/swh/hermes_filter_1200.c
++++ lmms/plugins/LadspaEffect/swh/hermes_filter_1200.c
+@@ -117,7 +117,7 @@ inline void setup_f_svf(sv_filter *sv, const float fs, const float fc) {
+ 
+ /* Run one sample through the SV filter. Filter is by andy at vellocet */
+ 
+-inline float run_svf(sv_filter *sv, float in) {
++static inline float run_svf(sv_filter *sv, float in) {
+         float out;
+         int i;
+ 
+@@ -144,7 +144,7 @@ inline float run_svf(sv_filter *sv, float in) {
+         return out;
+ }
+ 
+-inline int wave_tbl(const float wave) {
++static inline int wave_tbl(const float wave) {
+         switch (f_round(wave)) {
+                 case 0:
+                 return BLO_SINE;
+diff --git lmms.orig/plugins/LadspaEffect/swh/imp_1199.c lmms/plugins/LadspaEffect/swh/imp_1199.c
+index d172a92..90e8e8c 100644
+--- lmms.orig/plugins/LadspaEffect/swh/imp_1199.c
++++ lmms/plugins/LadspaEffect/swh/imp_1199.c
+@@ -63,7 +63,7 @@ typedef rfftw_plan fft_plan;
+ 
+ #define MK_IMP(i) impulse2freq(c, i, IMP_LENGTH(i), impulse_freq[c]); c++
+ 
+-inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out);
++static inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out);
+ 
+ #include "impulses/all.h"
+ 
+@@ -77,7 +77,7 @@ unsigned int fft_length[IMPULSES];
+ #ifdef __clang__
+ void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
+ #else
+-inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
++static inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
+ #endif
+ {
+   fftw_real impulse_time[MAX_FFT_LENGTH];
+diff --git lmms.orig/plugins/LadspaEffect/swh/impulses/all.h lmms/plugins/LadspaEffect/swh/impulses/all.h
+index 3355f32..b0897fb 100644
+--- lmms.orig/plugins/LadspaEffect/swh/impulses/all.h
++++ lmms/plugins/LadspaEffect/swh/impulses/all.h
+@@ -27,7 +27,7 @@
+ #ifdef __clang__
+ void mk_imps(fftw_real **impulse_freq)
+ #else
+-inline void mk_imps(fftw_real **impulse_freq)
++static inline void mk_imps(fftw_real **impulse_freq)
+ #endif
+ {
+ 	int c = 0;
+diff --git lmms.orig/plugins/LadspaEffect/swh/retro_flange_1208.c lmms/plugins/LadspaEffect/swh/retro_flange_1208.c
+index c96dff5..9c7fb4f 100644
+--- lmms.orig/plugins/LadspaEffect/swh/retro_flange_1208.c
++++ lmms/plugins/LadspaEffect/swh/retro_flange_1208.c
+@@ -31,7 +31,7 @@ void __attribute__((constructor)) swh_init(); // forward declaration
+ 
+ #define BASE_BUFFER 0.001 // Base buffer length (s)
+ 
+-inline LADSPA_Data sat(LADSPA_Data x, float q,  float dist) {
++static inline LADSPA_Data sat(LADSPA_Data x, float q,  float dist) {
+         if (x == q) {
+                 return 1.0f / dist + q / (1.0f - f_exp(dist * q));
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 807af4c..0c64173 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 desktop-argument.patch
 find-fluid.patch
+gcc5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git