Attachment #162802 for bug #203607




# $FreeBSD: head/audio/audacity/Makefile 397077 2015-09-16 19:51:26Z bapt $

PORTNAME=	audacity
PORTVERSION=	2.1.1
PORTREVISION=	5
CATEGORIES=	audio
MASTER_SITES=	https://github.com/audacity/audacity/archive/
DISTNAME=	Audacity-${PORTVERSION}

MAINTAINER=	xxjack12xx@gmail.com
COMMENT=	GUI editor for digital audio waveforms


LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile

BUILD_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
		autogen:${PORTSDIR}/devel/autogen \
		bash:${PORTSDIR}/shells/bash \
		cmake:${PORTSDIR}/devel/cmake

WRKSRC=		${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}

GNU_CONFIGURE=	yes
USES=		cpe desktop-file-utils gmake pkgconfig shared-mime-info shebangfix zip:infozip
NLS_USES=	gettext
NLS_CONFIGURE_ENABLE=	nls
OPTIONS_SUB=	yes
USE_WX=		2.8+
WX_UNICODE=	yes
WX_COMPS=	wx
INSTALLS_ICONS=	yes
PORTDOCS=	README.txt
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	NLS DEBUG DOCS FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
			PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
			PORTMIXER SBSMS SOUNDTOUCH SAMPLERATE TWOLAME VAMP VORBIS VST
OPTIONS_DEFINE_amd64=	SSE
OPTIONS_DEFINE_i386=	SSE
OPTIONS_DEFAULT_amd64=	SSE

MAD_DESC=	Use libmad for mp2/3 decoding support
MIDI_DESC=	Use portSMF for Midi support
NYQUIST_DESC=	Nyquist plug-in support
SAMPLERATE_DESC=	Use libsamplerate for sample rate conversion
SAMPLERATED_DESC=	Default sample rate conversion support
PORTMIXER_DESC=	Compile with PortMixer support
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
#SOXR_DESC=	Use libsoxr for sample rate conversion
TAGLIB_DESC=	Use TagLib for metadata support
TWOLAME_DESC=	Use libtwolame for MP2 export support
VAMP_DESC=	Vamp plug-in support


CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"

CONFIGURE_ARGS+=	--with-lib-preference="local system" --without-lv2 --without-ffmpeg \
			--enable-portaudio --enable-unicode --with-libsoxr

CONFIGURE_SHELL?=${LOCALBASE}/bin/bash

DEBUG_CONFIGURE_WITH=	debug
FFMPEG_RUN_DEPENDS=	${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
FFMPEG_LIB_DEPENDS=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
FFMPEG_CFLAGS=		-I${LOCALBASE}/include/ffmpeg
FFMPEG_CPPFLAGS=	-I${LOCALBASE}/include/ffmpeg
FFMPEG_CXXFLAGS=	-I${LOCALBASE}/include/ffmpeg

FLAC_CONFIGURE_WITH=	libflac
FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac


PORTMIXER_CONFIGURE_WITH=	portmixer

SAMPLERATE_CONFIGURE_WITH=	libsamplerate
SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate

SBSMS_CONFIGURE_WITH=	sbsms

SOUNDTOUCH_CONFIGURE_WITH=	soundtouch
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch

#SOXR_CONFIGURE_WITH=	libsoxr
#SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake

SSE_CONFIGURE_ENABLE=	sse

TWOLAME_CONFIGURE_WITH=	libtwolame

Lines 1-2 Link Here

(-)audio/audacity/distinfo (-2 / +2 lines)
1	SHA256 (audacity-minsrc-2.1.0.tar.xz) = b0d98d89b38be233e88af81e1add649732484b6f8feec95dc5977accdde042b3	1	SHA256 (Audacity-2.1.1.zip) = 1ec4c3b92e3653a83b30b37f67d1778050eb87bd651266865a1e30fe1f402892
2	SIZE (audacity-minsrc-2.1.0.tar.xz) = 5104924	2	SIZE (Audacity-2.1.1.zip) = 28838970

Line 0 Link Here

(-)audio/audacity/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig 2015-11-05 07:57:02 UTC
	2	+++ Makefile.in
	3	@@ -476,7 +476,7 @@ top_builddir = @top_builddir@
	4	top_srcdir = @top_srcdir@
	5	SUBDIRS = help images lib-src po src tests
	6	ACLOCAL_AMFLAGS = -I m4
	7	-bin_SCRIPTS = audacity$(EXEEXT)
	8	+bin_PROGRAMS = audacity$(EXEEXT)
	9	dist_doc_DATA = LICENSE.txt README.txt
	10	dist_pkgdata_DATA = presets/EQDefaultCurves.xml
	11	nobase_dist_pkgdata_DATA = \




--- lib-src/libnyquist/nyquist/cmt/cext.h       2009-07-15 20:27:36.000000000 -0700
+++ lib-src/libnyquist/nyquist/cmt/cext.h       2009-07-19 00:37:45.000000000 -0700

@@ -58,7 +58,7 @@
 #include <malloc.h>
 #endif

-#if NEED_ULONG
+#if NEED_ULONG || __FreeBSD__
 typedef unsigned long ulong;
 #endif





--- lib-src/libmad/configure.orig	2015-07-11 10:02:22 UTC
+++ lib-src/libmad/configure
@@ -11983,17 +11983,12 @@ then
 	    : #x optimize="$optimize -fforce-addr"
 	    : #x optimize="$optimize -finline-functions"
 	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
 	    : #x optimize="$optimize -frerun-cse-after-loop"
 	    : #x optimize="$optimize -frerun-loop-opt"
 	    : #x optimize="$optimize -fgcse"
 	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
 	    : #* optimize="$optimize -fdelayed-branch"
 	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
 	    : #? optimize="$optimize -ffunction-sections"
 	    : #? optimize="$optimize -fcaller-saves"
 	    : #> optimize="$optimize -funroll-loops"

Lines 1-5 Link Here

(-)audio/audacity/files/patch-lib-src__libnyquist__nyquist__nyqstk__include__FileRead.h (-2 / +2 lines)
1	--- ./lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2011-05-04 17:18:48.000000000 +0200	1	--- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2015-07-11 10:02:22 UTC
2	+++ ./lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h 2011-05-04 17:19:13.000000000 +0200	2	+++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h
3	@@ -33,6 +33,7 @@	3	@@ -33,6 +33,7 @@
4	#define STK_FILEREAD_H	4	#define STK_FILEREAD_H
5		5

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src__libsoxr__configure (+9 lines)
	1	--- lib-src/libsoxr/configure.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/libsoxr/configure
	3	@@ -12,6 +12,5 @@
	4
	5	srcdir="$@"
	6	srcdir="${srcdir#*--srcdir=}"
	7	-srcdir="./${srcdir/ */}"
	8
	9	cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF "${srcdir}"

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src__lv2__Makefile (+10 lines)
	1	--- lib-src/lv2/Makefile.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/lv2/Makefile
	3	@@ -1,7 +1,6 @@
	4	include srcdir.mk
	5
	6	all:
	7	- ./build --srcdir=$(srcdir)
	8
	9	check:
	10

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am (+11 lines)
	1	--- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/soundtouch/source/SoundTouch/Makefile.am
	3	@@ -32,7 +32,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FI
	4
	5
	6	# Compiler flags
	7	-AM_CXXFLAGS=-O3 -fcheck-new -I../../include
	8	+AM_CXXFLAGS=-O3 -I../../include
	9
	10	# Compile the files that need MMX and SSE individually.
	11	libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in (+11 lines)
	1	--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/soundtouch/source/SoundTouch/Makefile.in
	3	@@ -346,7 +346,7 @@ lib_LTLIBRARIES = libSoundTouch.la
	4	libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86.cpp BPMDetect.cpp PeakFinder.cpp
	5
	6	# Compiler flags
	7	-AM_CXXFLAGS = -O3 -fcheck-new -I../../include
	8	+AM_CXXFLAGS = -O3 -I../../include
	9
	10	# Compile the files that need MMX and SSE individually.
	11	libSoundTouch_la_LIBADD = libSoundTouchMMX.la libSoundTouchSSE.la

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h (+11 lines)
	1	--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/libnyquist/nyquist/cmt/cext.h
	3	@@ -58,7 +58,7 @@ EXIT(n) -- calls exit(n) after shutting
	4	#include <malloc.h>
	5	#endif
	6
	7	-#if NEED_ULONG
	8	+#if NEED_ULONG \|\| __FreeBSD__
	9	typedef unsigned long ulong;
	10	#endif
	11




--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2015-07-11 10:02:22 UTC
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
@@ -153,6 +153,15 @@ extern long ptrtoabs();
 #endif
 #endif
 
+/* FreeBSD */
+#ifdef __FreeBSD__
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define XL_LITTLE_ENDIAN
+#else
+#define XL_BIG_ENDIAN
+#endif
+#endif
+
 /* Apple CC */
 #ifdef __APPLE__
 #define NNODES 2000

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h (+11 lines)
	1	--- lib-src/portmixer/include/portmixer.h.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/portmixer/include/portmixer.h
	3	@@ -45,7 +45,7 @@ extern "C"
	4	*
	5	*/
	6
	7	-#include "portaudio.h"
	8	+#include "../../portaudio-v19/include/portaudio.h"
	9
	10	typedef void PxMixer;
	11




diff -ur lib-src/portmixer/include/portmixer.h lib-src/portmixer/include/portmixer.h
--- lib-src/portmixer/include/portmixer.h	2014-09-22 13:38:13.000000000 -0700
+++ lib-src/portmixer/include/portmixer.h	2014-10-01 19:49:06.000000000 -0700
@@ -45,7 +45,7 @@
  *
  */
 
-#include "portaudio.h"
+#include "../../portaudio-v19/include/portaudio.h"
 
 typedef void PxMixer;
 
diff -ur src/AudioIO.h src/AudioIO.h
--- src/AudioIO.h	2014-09-22 13:38:13.000000000 -0700
+++ src/AudioIO.h	2014-10-01 19:48:46.000000000 -0700
@@ -13,7 +13,7 @@
 #ifndef __AUDACITY_AUDIO_IO__
 #define __AUDACITY_AUDIO_IO__
 
-#include "portaudio.h"
+#include "../lib-src/portaudio-v19/include/portaudio.h"
 #include "Audacity.h"
 #include "Experimental.h"
 
diff -ur src/DeviceManager.cpp src/DeviceManager.cpp
--- src/DeviceManager.cpp	2014-09-22 13:38:13.000000000 -0700
+++ src/DeviceManager.cpp	2014-10-01 19:48:52.000000000 -0700
@@ -6,7 +6,7 @@
 
 ******************************************************************/
 
-#include "portaudio.h"
+#include "../lib-src/portaudio-v19/include/portaudio.h"
 #ifdef __WXMSW__
 #include "pa_win_wasapi.h"
 #endif
diff -ur src/prefs/DevicePrefs.cpp src/prefs/DevicePrefs.cpp
--- src/prefs/DevicePrefs.cpp	2014-09-22 13:38:13.000000000 -0700
+++ src/prefs/DevicePrefs.cpp	2014-10-01 19:48:39.000000000 -0700
@@ -30,7 +30,7 @@
 #include <wx/intl.h>
 #include <wx/log.h>
 
-#include "portaudio.h"
+#include "../../lib-src/portaudio-v19/include/portaudio.h"
 
 #include "../AudioIO.h"
 #include "../Internat.h"

Line 0 Link Here

(-)audio/audacity/files/patch-src_AudioIO.h (+11 lines)
	1	--- src/AudioIO.h.orig 2015-07-11 10:02:22 UTC
	2	+++ src/AudioIO.h
	3	@@ -13,7 +13,7 @@
	4	#ifndef __AUDACITY_AUDIO_IO__
	5	#define __AUDACITY_AUDIO_IO__
	6
	7	-#include "portaudio.h"
	8	+#include "../lib-src/portaudio-v19/include/portaudio.h"
	9	#include "Audacity.h"
	10	#include "Experimental.h"
	11

Line 0 Link Here

(-)audio/audacity/files/patch-src_DeviceManager.cpp (+11 lines)
	1	--- src/DeviceManager.cpp.orig 2015-07-11 10:02:22 UTC
	2	+++ src/DeviceManager.cpp
	3	@@ -6,7 +6,7 @@
	4
	5	******************************************************************/
	6
	7	-#include "portaudio.h"
	8	+#include "../lib-src/portaudio-v19/include/portaudio.h"
	9	#ifdef __WXMSW__
	10	#include "pa_win_wasapi.h"
	11	#endif




--- src/FFmpeg.h.orig	2015-07-11 10:02:22 UTC
+++ src/FFmpeg.h
@@ -689,7 +689,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVOutputFormat*,
       av_oformat_next,

       (f)
    );
    FFMPEG_FUNCTION_WITH_RETURN(
@@ -756,7 +756,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       int,
       av_fifo_size,

       (f)
    );
    FFMPEG_FUNCTION_WITH_RETURN(
@@ -802,7 +802,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVDictionaryEntry *,
       av_dict_get,

Lines 1-6 Link Here

(-)audio/audacity/files/patch-src__Makefile.in (-2 / +2 lines)
1	--- src/Makefile.in.orig 2014-09-22 20:38:13 UTC	1	--- src/Makefile.in.orig 2015-07-11 10:02:22 UTC
2	+++ src/Makefile.in	2	+++ src/Makefile.in
3	@@ -1055,8 +1055,7 @@	3	@@ -1118,8 +1118,7 @@ audacity_CPPFLAGS = -D__STDC_CONSTANT_MA
4	# /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'	4	# /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
5	# wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );	5	# wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
6	# ^	6	# ^

Lines 1-6 Link Here

(-)audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp (-3 / +3 lines)
1	--- src/effects/VST/VSTEffect.cpp 2015-03-31 23:03:30.000000000 -0700	1	--- src/effects/VST/VSTEffect.cpp.orig 2015-07-11 10:02:22 UTC
2	+++ src/effects/VST/VSTEffect.cpp 2015-03-01 17:06:58.000000000 -0800	2	+++ src/effects/VST/VSTEffect.cpp
3	@@ -2609,7 +2609,7 @@	3	@@ -2576,7 +2576,7 @@ bool VSTEffect::Load()
4	// symbols.	4	// symbols.
5	//	5	//
6	// Once we define a proper external API, the flags can be removed.	6	// Once we define a proper external API, the flags can be removed.

Line 0 Link Here

(-)audio/audacity/files/patch-src_prefs_DevicePrefs.cpp (+11 lines)
	1	--- src/prefs/DevicePrefs.cpp.orig 2015-07-11 10:02:22 UTC
	2	+++ src/prefs/DevicePrefs.cpp
	3	@@ -30,7 +30,7 @@ other settings.
	4	#include <wx/intl.h>
	5	#include <wx/log.h>
	6
	7	-#include "portaudio.h"
	8	+#include "../../lib-src/portaudio-v19/include/portaudio.h"
	9
	10	#include "../AudioIO.h"
	11	#include "../Internat.h"




--- lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-15 20:27:36.000000000 -0700
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-19 00:24:11.000000000 -0700
@@ -152,6 +152,15 @@
 #endif
 #endif

+/* FreeBSD */
+#ifdef __FreeBSD__
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define XL_LITTLE_ENDIAN
+#else
+#define XL_BIG_ENDIAN
+#endif
+#endif
+
 /* Apple CC */
 #ifdef __APPLE__
 #define NNODES 2000

Return to bug 203607

Lines 2-12 Link Here

(-)audio/audacity/Makefile (-31 / +21 lines)
2	# $FreeBSD: head/audio/audacity/Makefile 397077 2015-09-16 19:51:26Z bapt $	2	# $FreeBSD: head/audio/audacity/Makefile 397077 2015-09-16 19:51:26Z bapt $
3		3
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.1.0	5	PORTVERSION= 2.1.1
6	PORTREVISION= 5
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= https://github.com/audacity/audacity/archive/
9	DISTNAME= ${PORTNAME}-minsrc-${PORTVERSION}	8	DISTNAME= Audacity-${PORTVERSION}
10		9
11	MAINTAINER= xxjack12xx@gmail.com	10	MAINTAINER= xxjack12xx@gmail.com
12	COMMENT= GUI editor for digital audio waveforms	11	COMMENT= GUI editor for digital audio waveforms
Lines 16-38 Link Here
16		15
17	LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile	16	LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile
18		17
19	WRKSRC= ${WRKDIR}/${PORTNAME}-minsrc-${PORTVERSION}	18	BUILD_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
		19	autogen:${PORTSDIR}/devel/autogen \
		20	bash:${PORTSDIR}/shells/bash \
		21	cmake:${PORTSDIR}/devel/cmake
		22
		23	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
20		24
21	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
22	USES= cpe desktop-file-utils gettext gmake pkgconfig shared-mime-info \	26	USES= cpe desktop-file-utils gmake pkgconfig shared-mime-info shebangfix zip:infozip
23	tar:xz	27	NLS_USES= gettext
		28	NLS_CONFIGURE_ENABLE= nls
		29	OPTIONS_SUB= yes
24	USE_WX= 2.8+	30	USE_WX= 2.8+
25	WX_UNICODE= yes
26	WX_COMPS= wx	31	WX_COMPS= wx
27	INSTALLS_ICONS= yes	32	INSTALLS_ICONS= yes
28	PORTDOCS= README.txt	33	PORTDOCS= README.txt
		34	INSTALL_TARGET= install-strip
29		35
30	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \	36	OPTIONS_DEFINE= NLS DEBUG DOCS FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
31	PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	37	PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
32	OPTIONS_SINGLE= SAMPLERATED	38	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
33	OPTIONS_SINGLE_SAMPLERATED= SAMPLERATE #SOXR	39	PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
34	OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
35	PORTMIXER SBSMS SOUNDTOUCH SAMPLERATE TWOLAME VAMP VORBIS VST
36	OPTIONS_DEFINE_amd64= SSE	40	OPTIONS_DEFINE_amd64= SSE
37	OPTIONS_DEFINE_i386= SSE	41	OPTIONS_DEFINE_i386= SSE
38	OPTIONS_DEFAULT_amd64= SSE	42	OPTIONS_DEFAULT_amd64= SSE
Lines 43-54 Link Here
43	MAD_DESC= Use libmad for mp2/3 decoding support	47	MAD_DESC= Use libmad for mp2/3 decoding support
44	MIDI_DESC= Use portSMF for Midi support	48	MIDI_DESC= Use portSMF for Midi support
45	NYQUIST_DESC= Nyquist plug-in support	49	NYQUIST_DESC= Nyquist plug-in support
46	SAMPLERATE_DESC= Use libsamplerate for sample rate conversion
47	SAMPLERATED_DESC= Default sample rate conversion support
48	PORTMIXER_DESC= Compile with PortMixer support	50	PORTMIXER_DESC= Compile with PortMixer support
49	SBSMS_DESC= Use libsbsms for pitch and tempo changing	51	SBSMS_DESC= Use libsbsms for pitch and tempo changing
50	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing	52	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
51	#SOXR_DESC= Use libsoxr for sample rate conversion
52	TAGLIB_DESC= Use TagLib for metadata support	53	TAGLIB_DESC= Use TagLib for metadata support
53	TWOLAME_DESC= Use libtwolame for MP2 export support	54	TWOLAME_DESC= Use libtwolame for MP2 export support
54	VAMP_DESC= Vamp plug-in support	55	VAMP_DESC= Vamp plug-in support
Lines 56-72 Link Here
56		57
57	CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"	58	CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"
58		59
59	CONFIGURE_ARGS+= --with-lib-preference="local system" \	60	CONFIGURE_ARGS+= --with-lib-preference="local system" --without-lv2 --without-ffmpeg \
60	--enable-portaudio --enable-unicode	61	--enable-portaudio --enable-unicode --with-libsoxr
61		62
62	DEBUG_CONFIGURE_WITH= debug	63	CONFIGURE_SHELL?=${LOCALBASE}/bin/bash
63		64
64	FFMPEG_CONFIGURE_WITH= ffmpeg	65	DEBUG_CONFIGURE_WITH= debug
65	FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
66	FFMPEG_LIB_DEPENDS= libavformat.so:${PORTSDIR}/multimedia/ffmpeg
67	FFMPEG_CFLAGS= -I${LOCALBASE}/include/ffmpeg
68	FFMPEG_CPPFLAGS= -I${LOCALBASE}/include/ffmpeg
69	FFMPEG_CXXFLAGS= -I${LOCALBASE}/include/ffmpeg
70		66
71	FLAC_CONFIGURE_WITH= libflac	67	FLAC_CONFIGURE_WITH= libflac
72	FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac	68	FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac
Lines 91-107 Link Here
91		87
92	PORTMIXER_CONFIGURE_WITH= portmixer	88	PORTMIXER_CONFIGURE_WITH= portmixer
93		89
94	SAMPLERATE_CONFIGURE_WITH= libsamplerate
95	SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate
96
97	SBSMS_CONFIGURE_WITH= sbsms	90	SBSMS_CONFIGURE_WITH= sbsms
98		91
99	SOUNDTOUCH_CONFIGURE_WITH= soundtouch	92	SOUNDTOUCH_CONFIGURE_WITH= soundtouch
100	SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch	93	SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch
101		94
102	#SOXR_CONFIGURE_WITH= libsoxr
103	#SOXR_BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake
104
105	SSE_CONFIGURE_ENABLE= sse	95	SSE_CONFIGURE_ENABLE= sse
106		96
107	TWOLAME_CONFIGURE_WITH= libtwolame	97	TWOLAME_CONFIGURE_WITH= libtwolame

Lines 1-12 Link Here

(-)audio/audacity/files/patch-cext.h (-12 lines)
1	--- lib-src/libnyquist/nyquist/cmt/cext.h 2009-07-15 20:27:36.000000000 -0700
2	+++ lib-src/libnyquist/nyquist/cmt/cext.h 2009-07-19 00:37:45.000000000 -0700
3
4	@@ -58,7 +58,7 @@
5	#include <malloc.h>
6	#endif
7
8	-#if NEED_ULONG
9	+#if NEED_ULONG \|\| __FreeBSD__
10	typedef unsigned long ulong;
11	#endif
12

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src__libmad__configure (+20 lines)
	1	--- lib-src/libmad/configure.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/libmad/configure
	3	@@ -11983,17 +11983,12 @@ then
	4	: #x optimize="$optimize -fforce-addr"
	5	: #x optimize="$optimize -finline-functions"
	6	: #- optimize="$optimize -fstrength-reduce"
	7	- optimize="$optimize -fthread-jumps"
	8	- optimize="$optimize -fcse-follow-jumps"
	9	- optimize="$optimize -fcse-skip-blocks"
	10	: #x optimize="$optimize -frerun-cse-after-loop"
	11	: #x optimize="$optimize -frerun-loop-opt"
	12	: #x optimize="$optimize -fgcse"
	13	optimize="$optimize -fexpensive-optimizations"
	14	- optimize="$optimize -fregmove"
	15	: #* optimize="$optimize -fdelayed-branch"
	16	: #x optimize="$optimize -fschedule-insns"
	17	- optimize="$optimize -fschedule-insns2"
	18	: #? optimize="$optimize -ffunction-sections"
	19	: #? optimize="$optimize -fcaller-saves"
	20	: #> optimize="$optimize -funroll-loops"

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (+18 lines)
	1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2015-07-11 10:02:22 UTC
	2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
	3	@@ -153,6 +153,15 @@ extern long ptrtoabs();
	4	#endif
	5	#endif
	6
	7	+/* FreeBSD */
	8	+#ifdef __FreeBSD__
	9	+#if __BYTE_ORDER == __LITTLE_ENDIAN
	10	+#define XL_LITTLE_ENDIAN
	11	+#else
	12	+#define XL_BIG_ENDIAN
	13	+#endif
	14	+#endif
	15	+
	16	/* Apple CC */
	17	#ifdef __APPLE__
	18	#define NNODES 2000

Lines 1-48 Link Here

(-)audio/audacity/files/patch-portaudio.h (-48 lines)
1	diff -ur lib-src/portmixer/include/portmixer.h lib-src/portmixer/include/portmixer.h
2	--- lib-src/portmixer/include/portmixer.h 2014-09-22 13:38:13.000000000 -0700
3	+++ lib-src/portmixer/include/portmixer.h 2014-10-01 19:49:06.000000000 -0700
4	@@ -45,7 +45,7 @@
5	*
6	*/
7
8	-#include "portaudio.h"
9	+#include "../../portaudio-v19/include/portaudio.h"
10
11	typedef void PxMixer;
12
13	diff -ur src/AudioIO.h src/AudioIO.h
14	--- src/AudioIO.h 2014-09-22 13:38:13.000000000 -0700
15	+++ src/AudioIO.h 2014-10-01 19:48:46.000000000 -0700
16	@@ -13,7 +13,7 @@
17	#ifndef __AUDACITY_AUDIO_IO__
18	#define __AUDACITY_AUDIO_IO__
19
20	-#include "portaudio.h"
21	+#include "../lib-src/portaudio-v19/include/portaudio.h"
22	#include "Audacity.h"
23	#include "Experimental.h"
24
25	diff -ur src/DeviceManager.cpp src/DeviceManager.cpp
26	--- src/DeviceManager.cpp 2014-09-22 13:38:13.000000000 -0700
27	+++ src/DeviceManager.cpp 2014-10-01 19:48:52.000000000 -0700
28	@@ -6,7 +6,7 @@
29
30	******************************************************************/
31
32	-#include "portaudio.h"
33	+#include "../lib-src/portaudio-v19/include/portaudio.h"
34	#ifdef __WXMSW__
35	#include "pa_win_wasapi.h"
36	#endif
37	diff -ur src/prefs/DevicePrefs.cpp src/prefs/DevicePrefs.cpp
38	--- src/prefs/DevicePrefs.cpp 2014-09-22 13:38:13.000000000 -0700
39	+++ src/prefs/DevicePrefs.cpp 2014-10-01 19:48:39.000000000 -0700
40	@@ -30,7 +30,7 @@
41	#include <wx/intl.h>
42	#include <wx/log.h>
43
44	-#include "portaudio.h"
45	+#include "../../lib-src/portaudio-v19/include/portaudio.h"
46
47	#include "../AudioIO.h"
48	#include "../Internat.h"

Lines 1-6 Link Here

(-)audio/audacity/files/patch-src_FFmpeg.h (-4 / +4 lines)
1	--- src/FFmpeg.h.orig 2015-03-02 01:06:57 UTC	1	--- src/FFmpeg.h.orig 2015-07-11 10:02:22 UTC
2	+++ src/FFmpeg.h	2	+++ src/FFmpeg.h
3	@@ -688,7 +688,7 @@ extern "C" {	3	@@ -689,7 +689,7 @@ extern "C" {
4	FFMPEG_FUNCTION_WITH_RETURN(	4	FFMPEG_FUNCTION_WITH_RETURN(
5	AVOutputFormat*,	5	AVOutputFormat*,
6	av_oformat_next,	6	av_oformat_next,
Lines 9-15 Link Here
9	(f)	9	(f)
10	);	10	);
11	FFMPEG_FUNCTION_WITH_RETURN(	11	FFMPEG_FUNCTION_WITH_RETURN(
12	@@ -755,7 +755,7 @@ extern "C" {	12	@@ -756,7 +756,7 @@ extern "C" {
13	FFMPEG_FUNCTION_WITH_RETURN(	13	FFMPEG_FUNCTION_WITH_RETURN(
14	int,	14	int,
15	av_fifo_size,	15	av_fifo_size,
Lines 18-24 Link Here
18	(f)	18	(f)
19	);	19	);
20	FFMPEG_FUNCTION_WITH_RETURN(	20	FFMPEG_FUNCTION_WITH_RETURN(
21	@@ -801,7 +801,7 @@ extern "C" {	21	@@ -802,7 +802,7 @@ extern "C" {
22	FFMPEG_FUNCTION_WITH_RETURN(	22	FFMPEG_FUNCTION_WITH_RETURN(
23	AVDictionaryEntry *,	23	AVDictionaryEntry *,
24	av_dict_get,	24	av_dict_get,

Lines 1-18 Link Here

(-)audio/audacity/files/patch-xlisp.h (-18 lines)
1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h 2009-07-15 20:27:36.000000000 -0700
2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h 2009-07-19 00:24:11.000000000 -0700
3	@@ -152,6 +152,15 @@
4	#endif
5	#endif
6
7	+/* FreeBSD */
8	+#ifdef __FreeBSD__
9	+#if __BYTE_ORDER == __LITTLE_ENDIAN
10	+#define XL_LITTLE_ENDIAN
11	+#else
12	+#define XL_BIG_ENDIAN
13	+#endif
14	+#endif
15	+
16	/* Apple CC */
17	#ifdef __APPLE__
18	#define NNODES 2000

Lines 11-17 Link Here

(-)audio/audacity/pkg-plist (-2 / +10 lines)
11	%%DATADIR%%/include/audacity/ModuleInterface.h	11	%%DATADIR%%/include/audacity/ModuleInterface.h
12	%%DATADIR%%/include/audacity/PluginInterface.h	12	%%DATADIR%%/include/audacity/PluginInterface.h
13	%%DATADIR%%/include/audacity/Types.h	13	%%DATADIR%%/include/audacity/Types.h
14	%%DATADIR%%/nyquist/bug.lsp
15	%%DATADIR%%/nyquist/dspprims.lsp	14	%%DATADIR%%/nyquist/dspprims.lsp
16	%%DATADIR%%/nyquist/envelopes.lsp	15	%%DATADIR%%/nyquist/envelopes.lsp
17	%%DATADIR%%/nyquist/equalizer.lsp	16	%%DATADIR%%/nyquist/equalizer.lsp
Lines 49-73 Link Here
49	%%DATADIR%%/nyquist/sndfnint.lsp	48	%%DATADIR%%/nyquist/sndfnint.lsp
50	%%DATADIR%%/nyquist/stk.lsp	49	%%DATADIR%%/nyquist/stk.lsp
51	%%DATADIR%%/nyquist/system.lsp	50	%%DATADIR%%/nyquist/system.lsp
		51	%%DATADIR%%/nyquist/test.lsp
		52	%%DATADIR%%/nyquist/upic.sal
		53	%%DATADIR%%/nyquist/velocity.lsp
52	%%DATADIR%%/nyquist/xlinit.lsp	54	%%DATADIR%%/nyquist/xlinit.lsp
53	%%DATADIR%%/nyquist/xm.lsp	55	%%DATADIR%%/nyquist/xm.lsp
54	%%DATADIR%%/plug-ins/SilenceMarker.ny	56	%%DATADIR%%/plug-ins/SilenceMarker.ny
55	%%DATADIR%%/plug-ins/SoundFinder.ny	57	%%DATADIR%%/plug-ins/SoundFinder.ny
		58	%%DATADIR%%/plug-ins/SpectralEditMulti.ny
		59	%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
		60	%%DATADIR%%/plug-ins/SpectralEditShelves.ny
56	%%DATADIR%%/plug-ins/StudioFadeOut.ny	61	%%DATADIR%%/plug-ins/StudioFadeOut.ny
57	%%DATADIR%%/plug-ins/adjustable-fade.ny	62	%%DATADIR%%/plug-ins/adjustable-fade.ny
58	%%DATADIR%%/plug-ins/beat.ny	63	%%DATADIR%%/plug-ins/beat.ny
59	%%DATADIR%%/plug-ins/clicktrack.ny	64	%%DATADIR%%/plug-ins/clicktrack.ny
60	%%DATADIR%%/plug-ins/clipfix.ny	65	%%DATADIR%%/plug-ins/clipfix.ny
		66	%%DATADIR%%/plug-ins/crossfadeclips.ny
61	%%DATADIR%%/plug-ins/crossfadetracks.ny	67	%%DATADIR%%/plug-ins/crossfadetracks.ny
62	%%DATADIR%%/plug-ins/delay.ny	68	%%DATADIR%%/plug-ins/delay.ny
63	%%DATADIR%%/plug-ins/equalabel.ny	69	%%DATADIR%%/plug-ins/equalabel.ny
64	%%DATADIR%%/plug-ins/highpass.ny	70	%%DATADIR%%/plug-ins/highpass.ny
		71	%%DATADIR%%/plug-ins/limiter.ny
65	%%DATADIR%%/plug-ins/lowpass.ny	72	%%DATADIR%%/plug-ins/lowpass.ny
66	%%DATADIR%%/plug-ins/notch.ny	73	%%DATADIR%%/plug-ins/notch.ny
67	%%DATADIR%%/plug-ins/pluck.ny	74	%%DATADIR%%/plug-ins/pluck.ny
68	%%DATADIR%%/plug-ins/rissetdrum.ny	75	%%DATADIR%%/plug-ins/rissetdrum.ny
69	%%DATADIR%%/plug-ins/sample-data-export.ny	76	%%DATADIR%%/plug-ins/sample-data-export.ny
70	%%DATADIR%%/plug-ins/tremolo.ny	77	%%DATADIR%%/plug-ins/tremolo.ny
		78	%%DATADIR%%/plug-ins/vocalrediso.ny
71	%%DATADIR%%/plug-ins/vocalremover.ny	79	%%DATADIR%%/plug-ins/vocalremover.ny
72	%%DATADIR%%/plug-ins/vocoder.ny	80	%%DATADIR%%/plug-ins/vocoder.ny
73	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt	81	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
Lines 84-90 Link Here
84	share/locale/bn/LC_MESSAGES/audacity.mo	92	share/locale/bn/LC_MESSAGES/audacity.mo
85	share/locale/bs/LC_MESSAGES/audacity.mo	93	share/locale/bs/LC_MESSAGES/audacity.mo
86	share/locale/ca/LC_MESSAGES/audacity.mo	94	share/locale/ca/LC_MESSAGES/audacity.mo
87	share/locale/ca@valencia/LC_MESSAGES/audacity.mo	95	share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
88	share/locale/cs/LC_MESSAGES/audacity.mo	96	share/locale/cs/LC_MESSAGES/audacity.mo
89	share/locale/cy/LC_MESSAGES/audacity.mo	97	share/locale/cy/LC_MESSAGES/audacity.mo
90	share/locale/da/LC_MESSAGES/audacity.mo	98	share/locale/da/LC_MESSAGES/audacity.mo