Attachment #181177 for bug #218104




# $FreeBSD: head/audio/audacity/Makefile 428352 2016-12-11 15:22:47Z jbeich $

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

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

GNU_CONFIGURE=	yes
USES=		autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
NLS_USES=	gettext-runtime
NLS_CONFIGURE_ENABLE=	nls
NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
OPTIONS_SUB=	yes
USE_GCC=	4.9+
USE_WX=		3.0+
WX_COMPS=	wx
INSTALLS_ICONS=	yes


.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == gcc
CXXFLAGS+=	-std=c++11
.endif

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}


Lines 1-2 Link Here

(-)audacity-new/distinfo (-2 / +3 lines)
1	SHA256 (Audacity-2.1.2.tar.gz) = 90007b50cdc3885607b1afef2f158777a61c1658e869a88ec4d98c59c133f9bd	1	TIMESTAMP = 1490408781
2	SIZE (Audacity-2.1.2.tar.gz) = 24718129	2	SHA256 (Audacity-2.1.3.tar.gz) = cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
		3	SIZE (Audacity-2.1.3.tar.gz) = 24106855

Lines 1-11 Link Here

(-)audacity-new/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h (-11 lines)
1	--- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig 2016-07-26 13:34:06 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" */

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_effects_VST_VSTEffect.cpp (-11 lines)
1	--- src/effects/VST/VSTEffect.cpp.orig 2016-07-26 13:34:06 UTC
2	+++ src/effects/VST/VSTEffect.cpp
3	@@ -2129,7 +2129,7 @@ bool VSTEffect::Load()
4	// symbols.
5	//
6	// Once we define a proper external API, the flags can be removed.
7	- void lib = dlopen((const char )wxString(realPath).ToUTF8(), RTLD_NOW \| RTLD_LOCAL \| RTLD_DEEPBIND);
8	+ void lib = dlopen((const char )wxString(realPath).ToUTF8(), RTLD_NOW \| RTLD_LOCAL);
9	if (!lib)
10	{
11	return false;

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_effects_vamp_LoadVamp.cpp (-11 lines)
1	--- src/effects/vamp/LoadVamp.cpp.orig 2016-07-26 13:34:06 UTC
2	+++ src/effects/vamp/LoadVamp.cpp
3	@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
4	Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
5	if (!vp)
6	{
7	- return false;
8	+ return NULL;
9	}
10
11	// We limit the listed plugin outputs to those whose results can




--- src/import/ImportFLAC.cpp.orig	2016-07-26 13:34:06 UTC
+++ 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




%%DATADIR%%/plug-ins/StudioFadeOut.ny
%%DATADIR%%/plug-ins/adjustable-fade.ny
%%DATADIR%%/plug-ins/beat.ny
%%DATADIR%%/plug-ins/clicktrack.ny
%%DATADIR%%/plug-ins/clipfix.ny
%%DATADIR%%/plug-ins/crossfadeclips.ny
%%DATADIR%%/plug-ins/crossfadetracks.ny

%%DATADIR%%/plug-ins/lowpass.ny
%%DATADIR%%/plug-ins/notch.ny
%%DATADIR%%/plug-ins/pluck.ny
%%DATADIR%%/plug-ins/rhythmtrack.ny
%%DATADIR%%/plug-ins/rissetdrum.ny
%%DATADIR%%/plug-ins/sample-data-export.ny
%%DATADIR%%/plug-ins/sample-data-import.ny
%%DATADIR%%/plug-ins/tremolo.ny
%%DATADIR%%/plug-ins/vocalrediso.ny
%%DATADIR%%/plug-ins/vocalremover.ny
%%DATADIR%%/plug-ins/vocoder.ny
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
share/icons/hicolor/16x16/apps/audacity.png
share/icons/hicolor/22x22/apps/audacity.png
share/icons/hicolor/24x24/apps/audacity.png

Return to bug 218104

Lines 2-9 Link Here

(-)audacity-new/Makefile (-7 / +3 lines)
2	# $FreeBSD: head/audio/audacity/Makefile 428352 2016-12-11 15:22:47Z jbeich $	2	# $FreeBSD: head/audio/audacity/Makefile 428352 2016-12-11 15:22:47Z jbeich $
3		3
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.1.2	5	PORTVERSION= 2.1.3
6	PORTREVISION= 4
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= https://github.com/audacity/audacity/archive/	7	MASTER_SITES= https://github.com/audacity/audacity/archive/
9	DISTNAME= Audacity-${PORTVERSION}	8	DISTNAME= Audacity-${PORTVERSION}
Lines 25-35 Link Here
25	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}	24	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
26		25
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix	27	USES= autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
29	NLS_USES= gettext-runtime	28	NLS_USES= gettext-runtime
30	NLS_CONFIGURE_ENABLE= nls	29	NLS_CONFIGURE_ENABLE= nls
31	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"	30	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
32	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
		32	USE_GCC= 4.9+
33	USE_WX= 3.0+	33	USE_WX= 3.0+
34	WX_COMPS= wx	34	WX_COMPS= wx
35	INSTALLS_ICONS= yes	35	INSTALLS_ICONS= yes
Lines 137-146 Link Here
137		137
138	.include <bsd.port.pre.mk>	138	.include <bsd.port.pre.mk>
139		139
140	.if ${CHOSEN_COMPILER_TYPE} == gcc
141	CXXFLAGS+= -std=c++11
142	.endif
143
144	post-install:	140	post-install:
145	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	141	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
146		142

Lines 1-20 Link Here

(-)audacity-new/files/patch-src_import_ImportFLAC.cpp (-20 lines)
1	--- src/import/ImportFLAC.cpp.orig 2016-07-26 13:34:06 UTC
2	+++ src/import/ImportFLAC.cpp
3	@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
4	int cnt;
5	wxFile binaryFile;
6	if (!binaryFile.Open(filename)) {
7	- return false; // File not found
8	+ return NULL; // File not found
9	}
10
11	#ifdef USE_LIBID3TAG
12	@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
13
14	if (cnt == wxInvalidOffset \|\| strncmp(buf, FLAC_HEADER, 4) != 0) {
15	// File is not a FLAC file
16	- return false;
17	+ return NULL;
18	}
19
20	// Open the file for import

Lines 62-68 Link Here

(-)audacity-new/pkg-plist (-1 / +3 lines)
62	%%DATADIR%%/plug-ins/StudioFadeOut.ny	62	%%DATADIR%%/plug-ins/StudioFadeOut.ny
63	%%DATADIR%%/plug-ins/adjustable-fade.ny	63	%%DATADIR%%/plug-ins/adjustable-fade.ny
64	%%DATADIR%%/plug-ins/beat.ny	64	%%DATADIR%%/plug-ins/beat.ny
65	%%DATADIR%%/plug-ins/clicktrack.ny
66	%%DATADIR%%/plug-ins/clipfix.ny	65	%%DATADIR%%/plug-ins/clipfix.ny
67	%%DATADIR%%/plug-ins/crossfadeclips.ny	66	%%DATADIR%%/plug-ins/crossfadeclips.ny
68	%%DATADIR%%/plug-ins/crossfadetracks.ny	67	%%DATADIR%%/plug-ins/crossfadetracks.ny
Lines 73-85 Link Here
73	%%DATADIR%%/plug-ins/lowpass.ny	72	%%DATADIR%%/plug-ins/lowpass.ny
74	%%DATADIR%%/plug-ins/notch.ny	73	%%DATADIR%%/plug-ins/notch.ny
75	%%DATADIR%%/plug-ins/pluck.ny	74	%%DATADIR%%/plug-ins/pluck.ny
		75	%%DATADIR%%/plug-ins/rhythmtrack.ny
76	%%DATADIR%%/plug-ins/rissetdrum.ny	76	%%DATADIR%%/plug-ins/rissetdrum.ny
77	%%DATADIR%%/plug-ins/sample-data-export.ny	77	%%DATADIR%%/plug-ins/sample-data-export.ny
		78	%%DATADIR%%/plug-ins/sample-data-import.ny
78	%%DATADIR%%/plug-ins/tremolo.ny	79	%%DATADIR%%/plug-ins/tremolo.ny
79	%%DATADIR%%/plug-ins/vocalrediso.ny	80	%%DATADIR%%/plug-ins/vocalrediso.ny
80	%%DATADIR%%/plug-ins/vocalremover.ny	81	%%DATADIR%%/plug-ins/vocalremover.ny
81	%%DATADIR%%/plug-ins/vocoder.ny	82	%%DATADIR%%/plug-ins/vocoder.ny
82	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt	83	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
		84	%%PORTDOCS%%%%DOCSDIR%%/README.txt
83	share/icons/hicolor/16x16/apps/audacity.png	85	share/icons/hicolor/16x16/apps/audacity.png
84	share/icons/hicolor/22x22/apps/audacity.png	86	share/icons/hicolor/22x22/apps/audacity.png
85	share/icons/hicolor/24x24/apps/audacity.png	87	share/icons/hicolor/24x24/apps/audacity.png