port these packages to GCC 6:

- audacity: GCC 6 wants std namespace, found via <cmath>.
- smpeg2: don't initialise unsigned with "0-1".
- libclucene/strigi: match GCC 6 (and 7, and 8, and 9.)

3 files changed, 41 insertions, 1 deletions

diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 1bc2e46a6e1..78ad55a179e 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2016/07/16 01:32:51 markd Exp $
+$NetBSD: distinfo,v 1.34 2018/02/08 07:28:57 mrg Exp $
 
 SHA1 (audacity-minsrc-2.1.2.tar.xz) = d0b8924b846f833182e674d621b28eb666cc97d6
 RMD160 (audacity-minsrc-2.1.2.tar.xz) = 47fccf8b96b6db95a677045bf122084d233bd80c
@@ -19,5 +19,7 @@ SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58
 SHA1 (patch-src_FFmpeg.h) = 664efb8a668a9dd5f76704e5a46c495a8c2c3a4d
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
+SHA1 (patch-src_effects_lv2_LV2Effect.cpp) = 88972bb870f9aa1018337a6e2e4042827f3c6e7f
+SHA1 (patch-src_effects_nyquist_Nyquist.cpp) = 1a931e9287960a43f862bbfa2c6fc8ee535a4bec
 SHA1 (patch-src_effects_vamp_LoadVamp.cpp) = 5e57289e99d8ac5323b869138d13b67b5ad8a3d6
 SHA1 (patch-src_import_ImportFLAC.cpp) = 9064b5f24cfd837d9a5d5bb74450bcfd0096b099
diff --git a/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp b/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp
new file mode 100644
index 00000000000..0d4275a4a1b
--- /dev/null
+++ b/audio/audacity/patches/patch-src_effects_lv2_LV2Effect.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_effects_lv2_LV2Effect.cpp,v 1.1 2018/02/08 07:28:58 mrg Exp $
+
+GCC 6 wants std namespace, found via <cmath>.
+
+--- src/effects/lv2/LV2Effect.cpp.orig	2016-01-13 14:31:24.000000000 +0000
++++ src/effects/lv2/LV2Effect.cpp	2018-02-07 10:20:15.597051982 +0000
+@@ -562,13 +562,13 @@
+       lilv_scale_points_free(points);
+ 
+       // Collect the value and range info
+-      ctrl.mHasLo = !isnan(minimumVals[i]);
+-      ctrl.mHasHi = !isnan(maximumVals[i]);
++      ctrl.mHasLo = !std::isnan(minimumVals[i]);
++      ctrl.mHasHi = !std::isnan(maximumVals[i]);
+       ctrl.mMin = ctrl.mHasLo ? minimumVals[i] : 0.0;
+       ctrl.mMax = ctrl.mHasHi ? maximumVals[i] : 1.0;
+       ctrl.mLo = ctrl.mMin;
+       ctrl.mHi = ctrl.mMax;
+-      ctrl.mDef = !isnan(defaultValues[i]) ?
++      ctrl.mDef = !std::isnan(defaultValues[i]) ?
+                   defaultValues[i] :
+                      ctrl.mHasLo ?
+                      ctrl.mLo :
diff --git a/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp b/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp
new file mode 100644
index 00000000000..a3266cd1c60
--- /dev/null
+++ b/audio/audacity/patches/patch-src_effects_nyquist_Nyquist.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_effects_nyquist_Nyquist.cpp,v 1.1 2018/02/08 07:28:58 mrg Exp $
+
+GCC 6 wants std namespace, found via <cmath>.
+
+--- src/effects/nyquist/Nyquist.cpp.orig	2018-02-07 10:04:58.228319803 +0000
++++ src/effects/nyquist/Nyquist.cpp	2018-02-07 10:14:46.346004080 +0000
+@@ -666,7 +666,7 @@
+                // with very small values, bandwidth calculation may be inf.
+                // (Observed on Linux)
+                double bw = log(mF1 / mF0) / log(2.0);
+-               if (!isinf(bw)) {
++               if (!std::isinf(bw)) {
+                   bandwidth.Printf(wxT("(float %s)"), Internat::ToString(bw).c_str());
+                }
+             }