[pkgsrc/trunk]: pkgsrc/audio/audacity gcc6 build fixes

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df9547237d55
branches:  trunk
changeset: 349788:df9547237d55
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Jul 16 01:32:51 2016 +0000

description:
gcc6 build fixes

diffstat:

 audio/audacity/distinfo                                    |   4 +-
 audio/audacity/patches/patch-src_effects_vamp_LoadVamp.cpp |  15 ++++++++
 audio/audacity/patches/patch-src_import_ImportFLAC.cpp     |  24 ++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)

diffs (62 lines):

diff -r 64c7a02a95e1 -r df9547237d55 audio/audacity/distinfo
--- a/audio/audacity/distinfo   Sat Jul 16 01:17:59 2016 +0000
+++ b/audio/audacity/distinfo   Sat Jul 16 01:32:51 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2016/06/05 01:02:38 ryoon Exp $
+$NetBSD: distinfo,v 1.33 2016/07/16 01:32:51 markd Exp $
 
 SHA1 (audacity-minsrc-2.1.2.tar.xz) = d0b8924b846f833182e674d621b28eb666cc97d6
 RMD160 (audacity-minsrc-2.1.2.tar.xz) = 47fccf8b96b6db95a677045bf122084d233bd80c
@@ -19,3 +19,5 @@
 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_vamp_LoadVamp.cpp) = 5e57289e99d8ac5323b869138d13b67b5ad8a3d6
+SHA1 (patch-src_import_ImportFLAC.cpp) = 9064b5f24cfd837d9a5d5bb74450bcfd0096b099
diff -r 64c7a02a95e1 -r df9547237d55 audio/audacity/patches/patch-src_effects_vamp_LoadVamp.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/audacity/patches/patch-src_effects_vamp_LoadVamp.cpp        Sat Jul 16 01:32:51 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_effects_vamp_LoadVamp.cpp,v 1.1 2016/07/16 01:32:51 markd Exp $
+
+gcc6 fix
+
+--- src/effects/vamp/LoadVamp.cpp.orig 2016-01-13 14:31:24.000000000 +0000
++++ src/effects/vamp/LoadVamp.cpp
+@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
+    Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
+    if (!vp)
+    {
+-      return false;
++      return NULL;
+    }
+ 
+    // We limit the listed plugin outputs to those whose results can
diff -r 64c7a02a95e1 -r df9547237d55 audio/audacity/patches/patch-src_import_ImportFLAC.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/audacity/patches/patch-src_import_ImportFLAC.cpp    Sat Jul 16 01:32:51 2016 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_import_ImportFLAC.cpp,v 1.1 2016/07/16 01:32:51 markd Exp $
+
+gcc6 fix
+
+--- src/import/ImportFLAC.cpp.orig     2016-01-13 14:31:24.000000000 +0000
++++ src/import/ImportFLAC.cpp
+@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
+    int cnt;
+    wxFile binaryFile;
+    if (!binaryFile.Open(filename)) {
+-      return false; // File not found
++      return NULL; // File not found
+    }
+ 
+ #ifdef USE_LIBID3TAG
+@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
+ 
+    if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
+       // File is not a FLAC file
+-      return false;
++      return NULL;
+    }
+ 
+    // Open the file for import