svn commit: r411741 - in head/audio/audacity: . files
Thomas Zander
riggs at FreeBSD.org
Wed Mar 23 20:42:43 UTC 2016
Author: riggs
Date: Wed Mar 23 20:42:41 2016
New Revision: 411741
URL: https://svnweb.freebsd.org/changeset/ports/411741
Log:
Fix build failure when accidentally picking up alsa (libasound).
Currently, there is no configure switch for consistently disabling
alsa detection. This changeset introduces the possibility to do so
during the configure stage and adds ALSA as a non-default OPTION.
PR: 207892
Submitted by: tatsuki_makino at hotmail.com
Reported by: bar
Reviewed by: xxjack12xx at gmail.com, riggs
Approved by: xxjack12xx at gmail.com (maintainer)
Added:
head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h (contents, props changed)
head/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c (contents, props changed)
head/audio/audacity/files/patch-src_BatchCommands.cpp (contents, props changed)
Modified:
head/audio/audacity/Makefile
head/audio/audacity/files/patch-lib-src_portmixer_configure.ac
Modified: head/audio/audacity/Makefile
==============================================================================
--- head/audio/audacity/Makefile Wed Mar 23 20:26:29 2016 (r411740)
+++ head/audio/audacity/Makefile Wed Mar 23 20:42:41 2016 (r411741)
@@ -37,8 +37,8 @@ PORTDOCS= README.txt
DOS2UNIX_GLOB= Makefile.* *.c* *.h
SHEBANG_FILES= lib-src/lv2/build
-OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
- SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
+OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
+ MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \
SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
@@ -80,6 +80,13 @@ DEBUG_CONFIGURE_WITH= debug
DOCS_BUILD_DEPENDS= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
docbook2man:${PORTSDIR}/textproc/docbook-utils
+ALSA_CONFIGURE_OFF= --disable-alsa
+ALSA_CONFIGURE_WITH= alsa
+ALSA_CFLAGS= -I${LOCALBASE}/include
+ALSA_CXXFLAGS= -I${LOCALBASE}/include
+ALSA_LDFLAGS= -L${LOCALBASE}/lib
+ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
+
DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:${PORTSDIR}/multimedia/ffmpeg
DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:${PORTSDIR}/audio/lame
DYNLOAD_CONFIGURE_ENABLE= dynamic-loading
Added: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h Wed Mar 23 20:42:41 2016 (r411741)
@@ -0,0 +1,11 @@
+--- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig 2016-01-08 22:05:48 UTC
++++ lib-src/libnyquist/nyquist/nyqsrc/sound.h
+@@ -459,7 +459,7 @@ double step_to_hz(double);
+
+ #ifdef WIN32
+ double log2(double x);
+-#endif WIN32
++#endif /*WIN32*/
+
+ /* macros for access to samples within a suspension */
+ /* NOTE: assume suspension structure is named "susp" */
Modified: head/audio/audacity/files/patch-lib-src_portmixer_configure.ac
==============================================================================
--- head/audio/audacity/files/patch-lib-src_portmixer_configure.ac Wed Mar 23 20:26:29 2016 (r411740)
+++ head/audio/audacity/files/patch-lib-src_portmixer_configure.ac Wed Mar 23 20:42:41 2016 (r411741)
@@ -1,6 +1,16 @@
--- lib-src/portmixer/configure.ac.orig 2016-01-08 22:05:48 UTC
+++ lib-src/portmixer/configure.ac
-@@ -43,7 +43,7 @@ PKG_CHECK_MODULES([PORTAUDIO], [portaudi
+@@ -35,6 +35,9 @@ AC_ARG_ENABLE([debug],
+ [AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)],
+ [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
+
++AC_ARG_ENABLE([alsa],
++ AC_HELP_STRING([--disable-alsa], []))
++
+ PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19])
+
+ #
+@@ -43,7 +46,7 @@ PKG_CHECK_MODULES([PORTAUDIO], [portaudi
dnl The following tests need to have the header files of portaudio available.
cppflags_save="$CPPFLAGS"
@@ -9,3 +19,14 @@
have_oss=no
AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
+@@ -123,8 +126,8 @@ if [[ $have_oss = "yes" ]] ; then
+ have_support=yes
+ fi
+
+-AM_CONDITIONAL([USE_LINUX_ALSA], [test "$have_alsa" = yes])
+-if [[ $have_alsa = "yes" ]] ; then
++AM_CONDITIONAL([USE_LINUX_ALSA], [test "$have_alsa" = yes -a "x$enable_alsa" != "xno"])
++if [[ $have_alsa = "yes" -a "x$enable_alsa" != "xno" ]] ; then
+ AC_MSG_NOTICE([Including support for ALSA])
+ AC_DEFINE(PX_USE_LINUX_ALSA)
+ have_support=yes
Added: head/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c Wed Mar 23 20:42:41 2016 (r411741)
@@ -0,0 +1,10 @@
+--- lib-src/portmixer/src/px_linux_alsa.c.orig 2016-01-08 22:05:48 UTC
++++ lib-src/portmixer/src/px_linux_alsa.c
+@@ -42,6 +42,7 @@
+
+ #include "portaudio.h"
+ #include "pa_unix_oss.h"
++#include <pa_linux_alsa.h>
+
+ #include "portmixer.h"
+ #include "px_mixer.h"
Added: head/audio/audacity/files/patch-src_BatchCommands.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-src_BatchCommands.cpp Wed Mar 23 20:42:41 2016 (r411741)
@@ -0,0 +1,11 @@
+--- src/BatchCommands.cpp.orig 2016-01-08 22:05:48 UTC
++++ src/BatchCommands.cpp
+@@ -151,7 +151,7 @@ bool BatchCommands::ReadChain(const wxSt
+ else if (cmd == wxT("ExportWav"))
+ cmd = wxT("ExportWAV");
+ else if (cmd == wxT("Compressor") && (parm.find(wxT("DecayTime")) != parm.npos))
+- parm.Replace(wxT("DecayTime"), wxT("ReleaseTime"), NULL); // 2.0.6
++ parm.Replace(wxT("DecayTime"), wxT("ReleaseTime"), false); // 2.0.6
+
+ // Add to lists
+ mCommandChain.Add(cmd);
More information about the svn-ports-all
mailing list