[SCM] supercollider-sc3-plugins/master: Make patch work for both GCC 6 and GCC <= 6

hanno-guest at users.alioth.debian.org hanno-guest at users.alioth.debian.org
Fri Sep 2 08:17:35 UTC 2016


The following commit has been merged in the master branch:
commit 60313fc423cfdf3286377576f09867aaa9f55fdd
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Fri Sep 2 10:13:22 2016 +0200

    Make patch work for both GCC 6 and GCC <= 6

diff --git a/debian/patches/03-gcc6.patch b/debian/patches/03-gcc6.patch
index ac7a28c..8511577 100644
--- a/debian/patches/03-gcc6.patch
+++ b/debian/patches/03-gcc6.patch
@@ -8,14 +8,25 @@ Last-Update: 2016-09-02
 
 Index: supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp
 ===================================================================
---- supercollider-sc3-plugins.orig/source/DWGUGens/dwglib/DWG.hpp
-+++ supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp
-@@ -1268,7 +1268,7 @@ class TUBE{
+--- supercollider-sc3-plugins.orig/source/DWGUGens/dwglib/DWG.hpp	2016-09-02 10:02:22.975627092 +0200
++++ supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp	2016-09-02 10:04:23.586778283 +0200
+@@ -1268,8 +1268,11 @@
          if(a1 < 1e-18)
              loss = 0.0;
          else
--            loss = 1.0 - std::min(lossF/sqrt(a1),1.0);
++#if defined(__GNUC__) && __GNUC__ >= 6
 +            loss = 1.0 - std::min(lossF/sqrt(a1),1.0f);
- 
++#else
+             loss = 1.0 - std::min(lossF/sqrt(a1),1.0);
+-
++#endif
      }
      void go(){
+         Rline.push(inR);
+@@ -1278,4 +1281,4 @@
+         outL = loss*Lline.delay(del);
+     }
+ };
+-#endif
+\ No newline at end of file
++#endif

-- 
supercollider-sc3-plugins packaging



More information about the pkg-multimedia-commits mailing list