[debian-edu-commits] debian-edu/pkg-team/ 02/02: Adjust patch to match chnange done upstream.

[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 026b0aceeffd3d6572f2519f7de2ce85864f402b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 20 09:01:27 2015 +0200

    Adjust patch to match chnange done upstream.
    
    Also, note that the patch is sent upstream.
    
    Git-Dch: ignore
---
 debian/patches/gcc5.patch | 55 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/debian/patches/gcc5.patch b/debian/patches/gcc5.patch
index e32fa62..fb0c58d 100644
--- a/debian/patches/gcc5.patch
+++ b/debian/patches/gcc5.patch
@@ -5,30 +5,29 @@ Description: Fix build problems with gcc 5
     rewrote inline to static inline functions.
 Author: Petter Reinholdtsen <pere at hungry.com>
 Bug-Debian: https://bugs.debian.org/777989
-Forwarded: no
+Forwarded: https://github.com/LMMS/lmms/pull/2362
 Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2015-09-19
+Last-Update: 2015-09-20
 
 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 @@
+--- lmms.orig/src/core/AutomatableModel.cpp	2015-09-20 08:58:43.730808124 +0200
++++ lmms/src/core/AutomatableModel.cpp	2015-09-20 08:59:07.938928776 +0200
+@@ -312,8 +312,7 @@
  									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)->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) {
+Index: lmms/plugins/LadspaEffect/swh/hermes_filter_1200.c
+===================================================================
+--- lmms.orig/plugins/LadspaEffect/swh/hermes_filter_1200.c	2015-09-20 08:58:43.730808124 +0200
++++ lmms/plugins/LadspaEffect/swh/hermes_filter_1200.c	2015-09-20 08:58:43.730808124 +0200
+@@ -117,7 +117,7 @@
  
  /* Run one sample through the SV filter. Filter is by andy at vellocet */
  
@@ -37,7 +36,7 @@ index bf3bbba..a8dd28e 100644
          float out;
          int i;
  
-@@ -144,7 +144,7 @@ inline float run_svf(sv_filter *sv, float in) {
+@@ -144,7 +144,7 @@
          return out;
  }
  
@@ -46,11 +45,11 @@ index bf3bbba..a8dd28e 100644
          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;
+Index: lmms/plugins/LadspaEffect/swh/imp_1199.c
+===================================================================
+--- lmms.orig/plugins/LadspaEffect/swh/imp_1199.c	2015-09-20 08:58:43.730808124 +0200
++++ lmms/plugins/LadspaEffect/swh/imp_1199.c	2015-09-20 08:58:43.730808124 +0200
+@@ -63,7 +63,7 @@
  
  #define MK_IMP(i) impulse2freq(c, i, IMP_LENGTH(i), impulse_freq[c]); c++
  
@@ -59,7 +58,7 @@ index d172a92..90e8e8c 100644
  
  #include "impulses/all.h"
  
-@@ -77,7 +77,7 @@ unsigned int fft_length[IMPULSES];
+@@ -77,7 +77,7 @@
  #ifdef __clang__
  void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
  #else
@@ -68,10 +67,10 @@ index d172a92..90e8e8c 100644
  #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
+Index: lmms/plugins/LadspaEffect/swh/impulses/all.h
+===================================================================
+--- lmms.orig/plugins/LadspaEffect/swh/impulses/all.h	2015-09-20 08:58:43.730808124 +0200
++++ lmms/plugins/LadspaEffect/swh/impulses/all.h	2015-09-20 08:58:43.730808124 +0200
 @@ -27,7 +27,7 @@
  #ifdef __clang__
  void mk_imps(fftw_real **impulse_freq)
@@ -81,11 +80,11 @@ index 3355f32..b0897fb 100644
  #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
+Index: lmms/plugins/LadspaEffect/swh/retro_flange_1208.c
+===================================================================
+--- lmms.orig/plugins/LadspaEffect/swh/retro_flange_1208.c	2015-09-20 08:58:43.730808124 +0200
++++ lmms/plugins/LadspaEffect/swh/retro_flange_1208.c	2015-09-20 08:58:43.730808124 +0200
+@@ -31,7 +31,7 @@
  
  #define BASE_BUFFER 0.001 // Base buffer length (s)
  

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