View | Details | Raw Unified | Return to bug 218104 | Differences between
and this patch

Collapse All | Expand All

(-)audacity-new/Makefile (-8 / +11 lines)
Lines 22-33 Link Here
22
BROKEN_powerpc64=	fails to build
22
BROKEN_powerpc64=	fails to build
23
23
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
USES=		autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
25
USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase
26
NLS_USES=	gettext-runtime
26
NLS_USES=	gettext-runtime
27
NLS_CONFIGURE_ENABLE=	nls
27
NLS_CONFIGURE_ENABLE=	nls
28
NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
28
NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
29
OPTIONS_SUB=	yes
29
OPTIONS_SUB=	yes
30
USE_GCC=	4.9+
31
USE_WX=		3.0+
30
USE_WX=		3.0+
32
WX_COMPS=	wx
31
WX_COMPS=	wx
33
INSTALLS_ICONS=	yes
32
INSTALLS_ICONS=	yes
Lines 37-43 Link Here
37
USE_GITHUB=	yes
36
USE_GITHUB=	yes
38
37
39
OPTIONS_DEFINE=	NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
38
OPTIONS_DEFINE=	NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
40
		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
39
		MAD SBSMS SILENT SOUNDTOUCH TWOLAME VAMP VORBIS VST
41
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD \
40
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD \
42
			SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
41
			SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
43
42
Lines 50-57 Link Here
50
LAME_DESC=	Use lame for import and export support
49
LAME_DESC=	Use lame for import and export support
51
LV2_DESC=	Add LV2 plug-in support
50
LV2_DESC=	Add LV2 plug-in support
52
MAD_DESC=	Use libmad for mp2/3 decoding support
51
MAD_DESC=	Use libmad for mp2/3 decoding support
53
MIDI_DESC=	Use portSMF for Midi support
54
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
52
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
53
SILENT_DESC=	Non verbose build output
55
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
54
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
56
TAGLIB_DESC=	Use TagLib for metadata support
55
TAGLIB_DESC=	Use TagLib for metadata support
57
TWOLAME_DESC=	Use libtwolame for MP2 export support
56
TWOLAME_DESC=	Use libtwolame for MP2 export support
Lines 60-75 Link Here
60
59
61
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
60
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
62
61
63
CONFIGURE_ARGS+=	--enable-unicode \
62
CONFIGURE_ARGS+=	--disable-option-checking \
63
			--enable-unicode \
64
			${ICONV_CONFIGURE_ARG} \
64
			${ICONV_CONFIGURE_ARG} \
65
			--with-lib-preference="local" \
65
			--with-lib-preference="local" \
66
			--with-expat=system \
66
			--with-expat=system \
67
			--with-libsndfile=system \
67
			--with-libsndfile=system \
68
			--with-libsoxr \
68
			--with-libsoxr \
69
			--with-portaudio \
70
			--with-midi \
69
			--with-midi \
71
			--with-widgetextra \
70
			--with-portaudio \
72
			--with-portmixer=yes
71
			--with-portmixer=yes \
72
			--with-widgetextra
73
73
74
CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
74
CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
75
75
Lines 118-123 Link Here
118
118
119
SBSMS_CONFIGURE_WITH=	sbsms
119
SBSMS_CONFIGURE_WITH=	sbsms
120
120
121
SILENT_CONFIGURE_ENABLE=	silent-rules
122
SILENT_CONFIGURE_ON=		-q
123
121
SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
124
SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
122
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
125
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
123
126
(-)audacity-new/files/patch-Makefile.am (-23 lines)
Lines 1-23 Link Here
1
--- Makefile.am.orig	2016-07-26 13:34:06 UTC
2
+++ Makefile.am
3
@@ -1,4 +1,4 @@
4
-SUBDIRS = help images lib-src po src tests
5
+SUBDIRS = help images include lib-src po src tests
6
 
7
 ACLOCAL_AMFLAGS = -I m4
8
 
9
@@ -8,14 +8,6 @@ dist_doc_DATA = LICENSE.txt README.txt
10
 dist_pkgdata_DATA = presets/EQDefaultCurves.xml
11
 
12
 nobase_dist_pkgdata_DATA = \
13
-   include/audacity/ConfigInterface.h \
14
-   include/audacity/EffectAutomationParameters.h \
15
-   include/audacity/EffectInterface.h \
16
-   include/audacity/IdentInterface.h \
17
-   include/audacity/ImporterInterface.h \
18
-   include/audacity/ModuleInterface.h \
19
-   include/audacity/PluginInterface.h \
20
-   include/audacity/Types.h \
21
    nyquist/dspprims.lsp \
22
    nyquist/envelopes.lsp \
23
    nyquist/equalizer.lsp \
(-)audacity-new/files/patch-configure.ac (-14 / +20 lines)
Lines 1-18 Link Here
1
--- configure.ac.orig	2016-01-08 22:05:48 UTC
1
--- configure.ac.orig	2016-01-08 22:05:48 UTC
2
+++ configure.ac
2
+++ configure.ac
3
@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4])
3
@@ -235,20 +236,7 @@
4
 dnl Solaris builds, by defining HAVE_ALLOCA_H
5
 AC_CHECK_HEADERS_ONCE(alloca.h)
4
 
6
 
5
 AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])
7
-
6
 AM_MAINTAINER_MODE([disable])
8
-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
7
+AM_SILENT_RULES([yes])
9
-if test "${ax_cv_c_compiler_vendor}" = "gnu"; then
10
-
11
-    dnl GCC < 4.9 has known bugs (#1397) and can't be used
12
-    AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
13
-    if test x$gcc_ok = xno; then
14
-        AC_MSG_ERROR([Audacity requires at least GCC 4.9])
15
-    fi
16
-
17
-    CXXFLAGS="${CXXFLAGS} --std=gnu++11"
18
-else
19
-    CXXFLAGS="${CXXFLAGS} --std=c++11"
20
-fi
21
+CXXFLAGS="${CXXFLAGS} --std=c++11"
8
 
22
 
9
 AM_GNU_GETTEXT_VERSION([0.18])
23
 dnl --------------------------------------------------------------------------
10
 AM_GNU_GETTEXT([external])
24
 dnl We would like warnings enabled on the builds, but different compilers need
11
@@ -690,6 +691,7 @@ AC_CONFIG_FILES([
12
    Makefile
13
    help/Makefile
14
    images/Makefile
15
+   include/Makefile
16
    lib-src/Makefile
17
    po/Makefile.in
18
    src/audacity.desktop
(-)audacity-new/files/patch-include_Makefile.am (-24 lines)
Lines 1-24 Link Here
1
--- include/Makefile.am.orig	2016-07-26 13:34:07 UTC
2
+++ include/Makefile.am
3
@@ -0,0 +1,21 @@
4
+ACLOCAL_AMFLAGS=	-I m4
5
+
6
+pkginclude_HEADERS= \
7
+	audacity/ConfigInterface.h \
8
+	audacity/EffectAutomationParameters.h \
9
+	audacity/EffectInterface.h \
10
+	audacity/IdentInterface.h \
11
+	audacity/ImporterInterface.h \
12
+	audacity/ModuleInterface.h \
13
+	audacity/PluginInterface.h \
14
+	audacity/Types.h \
15
+	$(NULL)
16
+
17
+pkgdataincludedir=	$(pkgdatadir)/include
18
+
19
+install-data-local: install-data-include
20
+install-data-include:
21
+	$(MKDIR_P) "$(DESTDIR)$(pkgdataincludedir)"
22
+	$(LN_S) "$(pkgincludedir)" "$(DESTDIR)$(pkgdataincludedir)/"
23
+
24
+.PHONY: install-data-include
(-)audacity-new/files/patch-include_audacity_Types.h (+11 lines)
Line 0 Link Here
1
--- include/audacity/Types.h.orig	2017-03-13 21:02:21 UTC
2
+++ include/audacity/Types.h
3
@@ -70,7 +70,7 @@ public:
4
    sampleCount ( int v ) : value { v } {}
5
    sampleCount ( unsigned v ) : value { v } {}
6
    sampleCount ( long v ) : value { v } {}
7
-   sampleCount ( unsigned long v ) : value { v } {}
8
+   sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
9
 
10
    // Beware implicit conversions from floating point values!
11
    // Otherwise the meaning of binary operators with sampleCount change
(-)audacity-new/files/patch-lib-src_libnyquist_Makefile.am (-11 lines)
Lines 1-11 Link Here
1
--- lib-src/libnyquist/Makefile.am.orig	2016-07-26 13:34:06 UTC
2
+++ lib-src/libnyquist/Makefile.am
3
@@ -3,7 +3,7 @@
4
 # Written by Richard Ash following Gary Vaughan's Autobook
5
 
6
 PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
7
-SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
8
+#SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
9
 
10
 # tell aclocal that extra macros can be found in autotools/m4/
11
 ACLOCAL_AMFLAGS = -I autotools/m4
(-)audacity-new/files/patch-lib-src_libnyquist_configure.ac (-11 lines)
Lines 1-11 Link Here
1
--- lib-src/libnyquist/configure.ac.orig	2016-01-08 22:05:48 UTC
2
+++ lib-src/libnyquist/configure.ac
3
@@ -117,6 +117,8 @@ dnl Checks for typedefs, structures, and
4
 AC_C_CONST
5
 AC_TYPE_SIZE_T
6
 
7
+AC_SUBST([SNDFILE_CFLAGS])
8
+
9
 AC_CONFIG_FILES([Makefile])
10
 
11
 AC_OUTPUT
(-)audacity-new/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac (-11 lines)
Lines 1-11 Link Here
1
--- lib-src/portaudio-v19/bindings/cpp/configure.ac.orig	2016-01-08 22:05:48 UTC
2
+++ lib-src/portaudio-v19/bindings/cpp/configure.ac
3
@@ -14,7 +14,7 @@ m4_define([lt_age], [0])
4
 
5
 AC_INIT([PortAudioCpp], [12])
6
 AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx])
7
-AM_INIT_AUTOMAKE
8
+AM_INIT_AUTOMAKE([subdir-objects])
9
 AM_MAINTAINER_MODE
10
 
11
 ###### Top-level directory of pacpp
(-)audacity-new/files/patch-lib-src_portmixer_include_portmixer.h (-11 lines)
Lines 1-11 Link Here
1
--- lib-src/portmixer/include/portmixer.h.orig	2016-07-26 13:34:07 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
 
(-)audacity-new/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am (-11 lines)
Lines 1-11 Link Here
1
--- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig	2016-07-26 13:34:06 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
(-)audacity-new/files/patch-m4_audacity__checklib__libsndfile.m4 (-10 lines)
Lines 1-10 Link Here
1
--- m4/audacity_checklib_libsndfile.m4.orig	2016-01-08 22:05:48 UTC
2
+++ m4/audacity_checklib_libsndfile.m4
3
@@ -50,6 +50,7 @@ AC_DEFUN([AUDACITY_CONFIG_LIBSNDFILE], [
4
       SNDFILE_LIBS='$(top_builddir)/lib-src/libsndfile/src/.libs/libsndfile.a'
5
       AC_CONFIG_SUBDIRS([lib-src/libsndfile])
6
    fi
7
+   export SNDFILE_CFLAGS
8
 
9
    AC_SUBST([SNDFILE_CFLAGS])
10
    AC_SUBST([SNDFILE_LIBS])
(-)audacity-new/files/patch-src_Audacity.h (+16 lines)
Line 0 Link Here
1
--- src/Audacity.h.orig	2017-06-16 13:26:40 UTC
2
+++ src/Audacity.h
3
@@ -24,13 +24,6 @@
4
 #ifndef __AUDACITY_H__
5
 #define __AUDACITY_H__
6
 
7
-// If building with GNU compiler, then must be 4.9 or later.
8
-// TODO: This would be much nicer as a standalone test in configure.ac
9
-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
10
-#error insufficient compiler
11
-#endif
12
-
13
-
14
 // We only do alpha builds and release versions.
15
 // Most of the time we're in development, so IS_ALPHA should be defined
16
 // to 1.
(-)audacity-new/files/patch-src_AudioIO.h (-11 lines)
Lines 1-11 Link Here
1
--- src/AudioIO.h.orig	2016-07-26 13:34:06 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
 
(-)audacity-new/files/patch-src_DeviceManager.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/DeviceManager.cpp.orig	2016-07-26 13:34:06 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
(-)audacity-new/files/patch-src_prefs_DevicePrefs.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/prefs/DevicePrefs.cpp.orig	2016-07-26 13:34:06 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"
(-)audacity-new/pkg-plist (-9 / +9 lines)
Lines 1-17 Link Here
1
bin/audacity
1
bin/audacity
2
include/audacity/ConfigInterface.h
3
include/audacity/EffectAutomationParameters.h
4
include/audacity/EffectInterface.h
5
include/audacity/IdentInterface.h
6
include/audacity/ImporterInterface.h
7
include/audacity/ModuleInterface.h
8
include/audacity/PluginInterface.h
9
include/audacity/Types.h
10
man/man1/audacity.1.gz
2
man/man1/audacity.1.gz
11
share/appdata/audacity.appdata.xml
3
share/appdata/audacity.appdata.xml
12
share/applications/audacity.desktop
4
share/applications/audacity.desktop
13
%%DATADIR%%/EQDefaultCurves.xml
5
%%DATADIR%%/EQDefaultCurves.xml
14
%%DATADIR%%/include/audacity
6
%%DATADIR%%/include/audacity/ConfigInterface.h
7
%%DATADIR%%/include/audacity/EffectAutomationParameters.h
8
%%DATADIR%%/include/audacity/EffectInterface.h
9
%%DATADIR%%/include/audacity/IdentInterface.h
10
%%DATADIR%%/include/audacity/ImporterInterface.h
11
%%DATADIR%%/include/audacity/ModuleInterface.h
12
%%DATADIR%%/include/audacity/PluginInterface.h
13
%%DATADIR%%/include/audacity/Types.h
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 81-86 Link Here
81
%%DATADIR%%/plug-ins/vocalremover.ny
80
%%DATADIR%%/plug-ins/vocalremover.ny
82
%%DATADIR%%/plug-ins/vocoder.ny
81
%%DATADIR%%/plug-ins/vocoder.ny
83
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
82
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
83
%%PORTDOCS%%%%DOCSDIR%%/README.txt
84
share/icons/hicolor/16x16/apps/audacity.png
84
share/icons/hicolor/16x16/apps/audacity.png
85
share/icons/hicolor/22x22/apps/audacity.png
85
share/icons/hicolor/22x22/apps/audacity.png
86
share/icons/hicolor/24x24/apps/audacity.png
86
share/icons/hicolor/24x24/apps/audacity.png

Return to bug 218104