Attachment #168282 for bug #207892




DOS2UNIX_GLOB=	Makefile.* *.c* *.h
SHEBANG_FILES=	lib-src/lv2/build

OPTIONS_DEFINE=	NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT=	ALSA FLAC ID3TAG LADSPA MAD \
			SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST

OPTIONS_DEFINE_amd64=	SSE

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

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h (+11 lines)
	1	--- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/libnyquist/nyquist/nyqsrc/sound.h
	3	@@ -459,7 +459,7 @@ double step_to_hz(double);
	4
	5	#ifdef WIN32
	6	double log2(double x);
	7	-#endif WIN32
	8	+#endif /WIN32/
	9
	10	/* macros for access to samples within a suspension */
	11	/* NOTE: assume suspension structure is named "susp" */




--- lib-src/portmixer/configure.orig	2016-01-08 22:05:48 UTC
+++ lib-src/portmixer/configure
@@ -777,6 +777,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_debug
+enable_alsa
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1425,6 +1426,7 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-debug          enable debug compilation
+  --disable-alsa
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -12028,7 +12030,7 @@ fi
 #
 
 cppflags_save="$CPPFLAGS"

 
 have_oss=no
 for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
@@ -12267,7 +12269,7 @@ $as_echo "$as_me: Including support for 
    have_support=yes
 fi
 
- if test "$have_alsa" = yes; then
+ if test "$have_alsa" = yes -a "x$enable_alsa" != "xno"; then
   USE_LINUX_ALSA_TRUE=
   USE_LINUX_ALSA_FALSE='#'
 else
@@ -12275,7 +12277,7 @@ else
   USE_LINUX_ALSA_FALSE=
 fi
 
-if [ $have_alsa = "yes" ] ; then
+if [ $have_alsa = "yes" -a "x$enable_alsa" != "xno" ] ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: Including support for ALSA" >&5
 $as_echo "$as_me: Including support for ALSA" >&6;}
    $as_echo "#define PX_USE_LINUX_ALSA 1" >>confdefs.h

Lines 1-7 Link Here

(-)audio/audacity/files/patch-lib-src_portmixer_configure.ac (-1 / +22 lines)
1	--- lib-src/portmixer/configure.ac.orig 2016-01-08 22:05:48 UTC	1	--- lib-src/portmixer/configure.ac.orig 2016-01-08 22:05:48 UTC
2	+++ lib-src/portmixer/configure.ac	2	+++ lib-src/portmixer/configure.ac
3	@@ -43,7 +43,7 @@ PKG_CHECK_MODULES([PORTAUDIO], [portaudi	3	@@ -35,6 +35,9 @@ AC_ARG_ENABLE([debug],
		4	[AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)],
		5	[AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
4		6
		7	+AC_ARG_ENABLE([alsa],
		8	+ AC_HELP_STRING([--disable-alsa], []))
		9	+
		10	PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19])
		11
		12	#
		13	@@ -43,7 +46,7 @@ PKG_CHECK_MODULES([PORTAUDIO], [portaudi
		14
5	dnl The following tests need to have the header files of portaudio available.	15	dnl The following tests need to have the header files of portaudio available.
6	cppflags_save="$CPPFLAGS"	16	cppflags_save="$CPPFLAGS"
7	-CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"	17	-CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"
Lines 9-11 Link Here
9		19
10	have_oss=no	20	have_oss=no
11	AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)	21	AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
		22	@@ -123,8 +126,8 @@ if [[ $have_oss = "yes" ]] ; then
		23	have_support=yes
		24	fi
		25
		26	-AM_CONDITIONAL([USE_LINUX_ALSA], [test "$have_alsa" = yes])
		27	-if [[ $have_alsa = "yes" ]] ; then
		28	+AM_CONDITIONAL([USE_LINUX_ALSA], [test "$have_alsa" = yes -a "x$enable_alsa" != "xno"])
		29	+if [[ $have_alsa = "yes" -a "x$enable_alsa" != "xno" ]] ; then
		30	AC_MSG_NOTICE([Including support for ALSA])
		31	AC_DEFINE(PX_USE_LINUX_ALSA)
		32	have_support=yes

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c (+10 lines)
	1	--- lib-src/portmixer/src/px_linux_alsa.c.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/portmixer/src/px_linux_alsa.c
	3	@@ -42,6 +42,7 @@
	4
	5	#include "portaudio.h"
	6	#include "pa_unix_oss.h"
	7	+#include <pa_linux_alsa.h>
	8
	9	#include "portmixer.h"
	10	#include "px_mixer.h"

Line 0 Link Here

(-)audio/audacity/files/patch-src_BatchCommands.cpp (+11 lines)
	1	--- src/BatchCommands.cpp.orig 2016-01-08 22:05:48 UTC
	2	+++ src/BatchCommands.cpp
	3	@@ -151,7 +151,7 @@ bool BatchCommands::ReadChain(const wxSt
	4	else if (cmd == wxT("ExportWav"))
	5	cmd = wxT("ExportWAV");
	6	else if (cmd == wxT("Compressor") && (parm.find(wxT("DecayTime")) != parm.npos))
	7	- parm.Replace(wxT("DecayTime"), wxT("ReleaseTime"), NULL); // 2.0.6
	8	+ parm.Replace(wxT("DecayTime"), wxT("ReleaseTime"), false); // 2.0.6
	9
	10	// Add to lists
	11	mCommandChain.Add(cmd);

Return to bug 207892

Lines 37-45 Link Here

(-)audio/audacity/Makefile (-3 / +10 lines)
37	DOS2UNIX_GLOB= Makefile.* .c *.h	37	DOS2UNIX_GLOB= Makefile.* .c *.h
38	SHEBANG_FILES= lib-src/lv2/build	38	SHEBANG_FILES= lib-src/lv2/build
39		39
40	OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \	40	OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
41	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	41	MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
42	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \	42	OPTIONS_DEFAULT= ALSA FLAC ID3TAG LADSPA MAD \
43	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	43	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
44		44
45	OPTIONS_DEFINE_amd64= SSE	45	OPTIONS_DEFINE_amd64= SSE
Lines 80-85 Link Here
80	DOCS_BUILD_DEPENDS= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \	80	DOCS_BUILD_DEPENDS= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
81	docbook2man:${PORTSDIR}/textproc/docbook-utils	81	docbook2man:${PORTSDIR}/textproc/docbook-utils
82		82
		83	ALSA_CONFIGURE_OFF= --disable-alsa
		84	ALSA_CONFIGURE_WITH= alsa
		85	ALSA_CFLAGS= -I${LOCALBASE}/include
		86	ALSA_CXXFLAGS= -I${LOCALBASE}/include
		87	ALSA_LDFLAGS= -L${LOCALBASE}/lib
		88	ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
		89
83	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:${PORTSDIR}/multimedia/ffmpeg	90	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:${PORTSDIR}/multimedia/ffmpeg
84	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:${PORTSDIR}/audio/lame	91	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:${PORTSDIR}/audio/lame
85	DYNLOAD_CONFIGURE_ENABLE= dynamic-loading	92	DYNLOAD_CONFIGURE_ENABLE= dynamic-loading

Lines 1-6 Link Here

(-)audio/audacity/files/patch-lib-src_portmixer_configure (-1 / +35 lines)
1	--- lib-src/portmixer/configure.orig 2016-01-08 22:05:48 UTC	1	--- lib-src/portmixer/configure.orig 2016-01-08 22:05:48 UTC
2	+++ lib-src/portmixer/configure	2	+++ lib-src/portmixer/configure
3	@@ -12028,7 +12028,7 @@ fi	3	@@ -777,6 +777,7 @@ with_gnu_ld
		4	with_sysroot
		5	enable_libtool_lock
		6	enable_debug
		7	+enable_alsa
		8	'
		9	ac_precious_vars='build_alias
		10	host_alias
		11	@@ -1425,6 +1426,7 @@ Optional Features:
		12	optimize for fast installation [default=yes]
		13	--disable-libtool-lock avoid locking (might break parallel builds)
		14	--enable-debug enable debug compilation
		15	+ --disable-alsa
		16
		17	Optional Packages:
		18	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
		19	@@ -12028,7 +12030,7 @@ fi
4	#	20	#
5		21
6	cppflags_save="$CPPFLAGS"	22	cppflags_save="$CPPFLAGS"
Lines 9-11 Link Here
9		25
10	have_oss=no	26	have_oss=no
11	for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h	27	for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
		28	@@ -12267,7 +12269,7 @@ $as_echo "$as_me: Including support for
		29	have_support=yes
		30	fi
		31
		32	- if test "$have_alsa" = yes; then
		33	+ if test "$have_alsa" = yes -a "x$enable_alsa" != "xno"; then
		34	USE_LINUX_ALSA_TRUE=
		35	USE_LINUX_ALSA_FALSE='#'
		36	else
		37	@@ -12275,7 +12277,7 @@ else
		38	USE_LINUX_ALSA_FALSE=
		39	fi
		40
		41	-if [ $have_alsa = "yes" ] ; then
		42	+if [ $have_alsa = "yes" -a "x$enable_alsa" != "xno" ] ; then
		43	{ $as_echo "$as_me:${as_lineno-$LINENO}: Including support for ALSA" >&5
		44	$as_echo "$as_me: Including support for ALSA" >&6;}
		45	$as_echo "#define PX_USE_LINUX_ALSA 1" >>confdefs.h