audacity

2 files changed, 102 insertions, 0 deletions

diff --git a/media-sound/audacity/files/audacity-1.3.13-automagic.patch b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
new file mode 100644
index 00000000..4e7c2917
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
@@ -0,0 +1,61 @@
+--- audacity-src-1.3.13-beta.orig/configure.in
++++ audacity-src-1.3.13-beta/configure.in
+@@ -173,6 +173,9 @@
+             lib_preference=$withval,
+             lib_preference="system local")
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
++
+ dnl AC_ARG_WITH(wx-version,
+ dnl            [AS_HELP_STRING([--with-wx-version],
+ dnl                            [select wxWidgets version (if both installed) [2.8,]])],
+@@ -574,13 +577,21 @@
+       ;;
+    *)
+       dnl Unix
+-      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+-      if [[ $have_alsa = "yes" ]] ; then
+-         LIBS="$LIBS -lasound"
+-      fi
+-      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+-      if [[ $have_jack = "yes" ]] ; then
+-         LIBS="$LIBS $JACK_LIBS"
++      if test "x$with_alsa" != "xno"; then
++         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
++         if [[ $have_alsa = "yes" ]] ; then
++            LIBS="$LIBS -lasound"
++        else
++            AC_MSG_WARN([Support for alsa not available])
++         fi
++      fi        
++      if test "x$with_jack" != "xno"; then
++         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
++         if [[ $have_jack = "yes" ]] ; then
++            LIBS="$LIBS $JACK_LIBS"
++        else
++            AC_MSG_WARN([Support for jack not available])
++         fi
+       fi
+       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
+       if [[ $have_asihpi = "yes" ]] ; then
+--- audacity-src-1.3.13-beta.orig/lib-src/portmixer/configure.ac
++++ audacity-src-1.3.13-beta/lib-src/portmixer/configure.ac
+@@ -31,6 +31,8 @@
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
+ 
++AC_ARG_WITH([alsa], AC_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
+ #
+ # Check for portaudio path
+ #
+@@ -133,7 +135,7 @@
+    have_support=yes
+ fi
+ 
+-if [[ $have_alsa = "yes" ]] ; then
++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
+    AC_MSG_NOTICE([Including support for ALSA])
+    AC_DEFINE(PX_USE_LINUX_ALSA)
+    objects="$objects px_linux_alsa.o"
diff --git a/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
new file mode 100644
index 00000000..32bcf42f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
@@ -0,0 +1,41 @@
+Fix building with C++14, which errors out due to bool -> T* conversions
+See also: https://bugs.gentoo.org/show_bug.cgi?id=592448
+
+Patch by OpenSUSE
+
+Index: src/effects/vamp/LoadVamp.cpp
+===================================================================
+--- src/effects/vamp/LoadVamp.cpp.orig
++++ 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
+Index: src/import/ImportFLAC.cpp
+===================================================================
+--- src/import/ImportFLAC.cpp.orig
++++ 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
+