[pkgsrc/trunk]: pkgsrc/audio/audacity audacity: SunOS build fixes.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/35b862dc4e0a
branches:  trunk
changeset: 311093:35b862dc4e0a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jul 31 21:10:29 2018 +0000

description:
audacity: SunOS build fixes.

diffstat:

 audio/audacity/Makefile                                               |   5 ++-
 audio/audacity/distinfo                                               |   6 ++-
 audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h |  13 +++++-
 audio/audacity/patches/patch-src_effects_Effect.cpp                   |  17 ++++++++++
 audio/audacity/patches/patch-src_effects_EffectManager.cpp            |  17 ++++++++++
 5 files changed, 52 insertions(+), 6 deletions(-)

diffs (118 lines):

diff -r 6b31aefcaf94 -r 35b862dc4e0a audio/audacity/Makefile
--- a/audio/audacity/Makefile   Tue Jul 31 19:13:10 2018 +0000
+++ b/audio/audacity/Makefile   Tue Jul 31 21:10:29 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2018/04/29 05:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2018/07/31 21:10:29 jperkin Exp $
 
 DISTNAME=              audacity-minsrc-2.1.2
 PKGNAME=               ${DISTNAME:S/-minsrc//1}
@@ -44,8 +44,11 @@
 CONFIG_SUB_OVERRIDE=           \
        config.sub */config.sub */*/config.sub */*/*/config.sub
 
+CFLAGS.SunOS+= -fPIC
+
 PTHREAD_AUTO_VARS=     yes
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+BUILDLINK_TRANSFORM+=  rm:-Wl,--version-script=./build/vamp-plugin.map
 
 # regen Makefile.in to avoid being built as shared libraries
 pre-configure:
diff -r 6b31aefcaf94 -r 35b862dc4e0a audio/audacity/distinfo
--- a/audio/audacity/distinfo   Tue Jul 31 19:13:10 2018 +0000
+++ b/audio/audacity/distinfo   Tue Jul 31 21:10:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2018/03/31 20:08:11 joerg Exp $
+$NetBSD: distinfo,v 1.36 2018/07/31 21:10:29 jperkin Exp $
 
 SHA1 (audacity-minsrc-2.1.2.tar.xz) = d0b8924b846f833182e674d621b28eb666cc97d6
 RMD160 (audacity-minsrc-2.1.2.tar.xz) = 47fccf8b96b6db95a677045bf122084d233bd80c
@@ -12,11 +12,13 @@
 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
-SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3
+SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0
 SHA1 (patch-lib-src_portaudio-v19_Makefile.in) = 9e86fbd93d322322b8416ef6b43ba5c98141c986
 SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
 SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
 SHA1 (patch-src_FFmpeg.h) = 664efb8a668a9dd5f76704e5a46c495a8c2c3a4d
+SHA1 (patch-src_effects_Effect.cpp) = ceca279b2d9e0044141a2ad5151390983ae41c23
+SHA1 (patch-src_effects_EffectManager.cpp) = 78e2d1290170e61b0363e5fa453bb11a5b28d411
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
 SHA1 (patch-src_effects_lv2_LV2Effect.cpp) = b001b79df1e924ef0635436f5b8d02db5fa00dd6
diff -r 6b31aefcaf94 -r 35b862dc4e0a audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
--- a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h     Tue Jul 31 19:13:10 2018 +0000
+++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h     Tue Jul 31 21:10:29 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h,v 1.1 2015/04/21 01:33:39 rodent Exp $
+$NetBSD: patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h,v 1.2 2018/07/31 21:10:29 jperkin Exp $
 
 Define endianness for {Free,Open,Net}BSD and Bitrig.
 
---- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig      2015-03-02 01:07:22.000000000 +0000
+--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig      2016-01-13 14:31:18.000000000 +0000
 +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
-@@ -166,6 +166,20 @@ extern long ptrtoabs();
+@@ -151,6 +151,27 @@ extern long ptrtoabs();
  #else
  #define XL_BIG_ENDIAN
  #endif
@@ -22,6 +22,13 @@
 + #else
 +  #define XL_BIG_ENDIAN
 + #endif
++#elif defined(__sun)
++ #include <sys/byteorder.h>
++ #ifdef _BIG_ENDIAN
++  #define XL_BIG_ENDIAN
++ #else
++  #define XL_LITTLE_ENDIAN
++ #endif
  #endif
  
  /* Apple CC */
diff -r 6b31aefcaf94 -r 35b862dc4e0a audio/audacity/patches/patch-src_effects_Effect.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/audacity/patches/patch-src_effects_Effect.cpp       Tue Jul 31 21:10:29 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_effects_Effect.cpp,v 1.1 2018/07/31 21:10:29 jperkin Exp $
+
+SunOS needs alloca.h for alloca().
+
+--- src/effects/Effect.cpp.orig        2016-01-13 14:31:24.000000000 +0000
++++ src/effects/Effect.cpp
+@@ -54,6 +54,10 @@ greater use in future.
+ #include <Cocoa/Cocoa.h>
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ #include "../Experimental.h"
+ 
+ static const int kDummyID = 20000;
diff -r 6b31aefcaf94 -r 35b862dc4e0a audio/audacity/patches/patch-src_effects_EffectManager.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/audacity/patches/patch-src_effects_EffectManager.cpp        Tue Jul 31 21:10:29 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_effects_EffectManager.cpp,v 1.1 2018/07/31 21:10:29 jperkin Exp $
+
+SunOS needs alloca.h for alloca().
+
+--- src/effects/EffectManager.cpp.orig 2016-01-13 14:31:24.000000000 +0000
++++ src/effects/EffectManager.cpp
+@@ -15,6 +15,10 @@
+ #include <wx/stopwatch.h>
+ #include <wx/tokenzr.h>
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ #include "../Experimental.h"
+ 
+ #if defined(EXPERIMENTAL_EFFECTS_RACK)