Attachment 183724 Details for Bug 218104 – Make audacity compile with clang and patch/option cleanups

[patch] Make audacity compile with clang and patch/option cleanups

audacity.txt (text/plain), 14.61 KB, created by Jack on 2017-06-23 01:22:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2017-06-23 01:22:14 UTC

Size: 14.61 KB

patch

obsolete

>diff -urN audacity/Makefile audacity-new/Makefile
>--- audacity/Makefile	2017-06-22 16:44:06.694560000 -0700
>+++ audacity-new/Makefile	2017-06-22 18:19:03.372580000 -0700
>@@ -22,12 +22,11 @@
> BROKEN_powerpc64=	fails to build
> 
> 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
>+USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase
> 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
>@@ -37,7 +36,7 @@
> USE_GITHUB=	yes
> 
> OPTIONS_DEFINE=	NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
>-		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
>+		MAD SBSMS SILENT SOUNDTOUCH TWOLAME VAMP VORBIS VST
> OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD \
> 			SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
> 
>@@ -50,8 +49,8 @@
> LAME_DESC=	Use lame for import and export support
> LV2_DESC=	Add LV2 plug-in support
> MAD_DESC=	Use libmad for mp2/3 decoding support
>-MIDI_DESC=	Use portSMF for Midi support
> SBSMS_DESC=	Use libsbsms for pitch and tempo changing
>+SILENT_DESC=	Non verbose build output
> SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
> TAGLIB_DESC=	Use TagLib for metadata support
> TWOLAME_DESC=	Use libtwolame for MP2 export support
>@@ -60,16 +59,17 @@
> 
> CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
> 
>-CONFIGURE_ARGS+=	--enable-unicode \
>+CONFIGURE_ARGS+=	--disable-option-checking \
>+			--enable-unicode \
> 			${ICONV_CONFIGURE_ARG} \
> 			--with-lib-preference="local" \
> 			--with-expat=system \
> 			--with-libsndfile=system \
> 			--with-libsoxr \
>-			--with-portaudio \
> 			--with-midi \
>-			--with-widgetextra \
>-			--with-portmixer=yes
>+			--with-portaudio \
>+			--with-portmixer=yes \
>+			--with-widgetextra
> 
> CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
> 
>@@ -118,6 +118,9 @@
> 
> SBSMS_CONFIGURE_WITH=	sbsms
> 
>+SILENT_CONFIGURE_ENABLE=	silent-rules
>+SILENT_CONFIGURE_ON=		-q
>+
> SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
> SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
> 
>diff -urN audacity/files/patch-Makefile.am audacity-new/files/patch-Makefile.am
>--- audacity/files/patch-Makefile.am	2017-06-22 16:09:36.654125000 -0700
>+++ audacity-new/files/patch-Makefile.am	1969-12-31 16:00:00.000000000 -0800
>@@ -1,23 +0,0 @@
>---- Makefile.am.orig	2016-07-26 13:34:06 UTC
>-+++ Makefile.am
>-@@ -1,4 +1,4 @@
>--SUBDIRS = help images lib-src po src tests
>-+SUBDIRS = help images include lib-src po src tests
>- 
>- ACLOCAL_AMFLAGS = -I m4
>- 
>-@@ -8,14 +8,6 @@ dist_doc_DATA = LICENSE.txt README.txt
>- dist_pkgdata_DATA = presets/EQDefaultCurves.xml
>- 
>- nobase_dist_pkgdata_DATA = \
>--   include/audacity/ConfigInterface.h \
>--   include/audacity/EffectAutomationParameters.h \
>--   include/audacity/EffectInterface.h \
>--   include/audacity/IdentInterface.h \
>--   include/audacity/ImporterInterface.h \
>--   include/audacity/ModuleInterface.h \
>--   include/audacity/PluginInterface.h \
>--   include/audacity/Types.h \
>-    nyquist/dspprims.lsp \
>-    nyquist/envelopes.lsp \
>-    nyquist/equalizer.lsp \
>diff -urN audacity/files/patch-configure.ac audacity-new/files/patch-configure.ac
>--- audacity/files/patch-configure.ac	2017-06-22 16:09:36.505415000 -0700
>+++ audacity-new/files/patch-configure.ac	2017-06-21 19:34:42.080951000 -0700
>@@ -1,18 +1,24 @@
> --- configure.ac.orig	2016-01-08 22:05:48 UTC
> +++ configure.ac
>-@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4])
>+@@ -235,20 +236,7 @@
>+ dnl Solaris builds, by defining HAVE_ALLOCA_H
>+ AC_CHECK_HEADERS_ONCE(alloca.h)
>  
>- AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])
>- AM_MAINTAINER_MODE([disable])
>-+AM_SILENT_RULES([yes])
>+-
>+-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
>+-if test "${ax_cv_c_compiler_vendor}" = "gnu"; then
>+-
>+-    dnl GCC < 4.9 has known bugs (#1397) and can't be used
>+-    AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
>+-    if test x$gcc_ok = xno; then
>+-        AC_MSG_ERROR([Audacity requires at least GCC 4.9])
>+-    fi
>+-
>+-    CXXFLAGS="${CXXFLAGS} --std=gnu++11"
>+-else
>+-    CXXFLAGS="${CXXFLAGS} --std=c++11"
>+-fi
>++CXXFLAGS="${CXXFLAGS} --std=c++11"
>  
>- AM_GNU_GETTEXT_VERSION([0.18])
>- AM_GNU_GETTEXT([external])
>-@@ -690,6 +691,7 @@ AC_CONFIG_FILES([
>-    Makefile
>-    help/Makefile
>-    images/Makefile
>-+   include/Makefile
>-    lib-src/Makefile
>-    po/Makefile.in
>-    src/audacity.desktop
>+ dnl --------------------------------------------------------------------------
>+ dnl We would like warnings enabled on the builds, but different compilers need
>diff -urN audacity/files/patch-include_Makefile.am audacity-new/files/patch-include_Makefile.am
>--- audacity/files/patch-include_Makefile.am	2017-06-22 16:09:36.669535000 -0700
>+++ audacity-new/files/patch-include_Makefile.am	1969-12-31 16:00:00.000000000 -0800
>@@ -1,24 +0,0 @@
>---- include/Makefile.am.orig	2016-07-26 13:34:07 UTC
>-+++ include/Makefile.am
>-@@ -0,0 +1,21 @@
>-+ACLOCAL_AMFLAGS=	-I m4
>-+
>-+pkginclude_HEADERS= \
>-+	audacity/ConfigInterface.h \
>-+	audacity/EffectAutomationParameters.h \
>-+	audacity/EffectInterface.h \
>-+	audacity/IdentInterface.h \
>-+	audacity/ImporterInterface.h \
>-+	audacity/ModuleInterface.h \
>-+	audacity/PluginInterface.h \
>-+	audacity/Types.h \
>-+	$(NULL)
>-+
>-+pkgdataincludedir=	$(pkgdatadir)/include
>-+
>-+install-data-local: install-data-include
>-+install-data-include:
>-+	$(MKDIR_P) "$(DESTDIR)$(pkgdataincludedir)"
>-+	$(LN_S) "$(pkgincludedir)" "$(DESTDIR)$(pkgdataincludedir)/"
>-+
>-+.PHONY: install-data-include
>diff -urN audacity/files/patch-include_audacity_Types.h audacity-new/files/patch-include_audacity_Types.h
>--- audacity/files/patch-include_audacity_Types.h	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-include_audacity_Types.h	2017-06-19 15:56:30.856183000 -0700
>@@ -0,0 +1,11 @@
>+--- include/audacity/Types.h.orig	2017-03-13 21:02:21 UTC
>++++ include/audacity/Types.h
>+@@ -70,7 +70,7 @@ public:
>+    sampleCount ( int v ) : value { v } {}
>+    sampleCount ( unsigned v ) : value { v } {}
>+    sampleCount ( long v ) : value { v } {}
>+-   sampleCount ( unsigned long v ) : value { v } {}
>++   sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
>+ 
>+    // Beware implicit conversions from floating point values!
>+    // Otherwise the meaning of binary operators with sampleCount change
>diff -urN audacity/files/patch-lib-src_libnyquist_Makefile.am audacity-new/files/patch-lib-src_libnyquist_Makefile.am
>--- audacity/files/patch-lib-src_libnyquist_Makefile.am	2017-06-22 16:09:36.613912000 -0700
>+++ audacity-new/files/patch-lib-src_libnyquist_Makefile.am	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- lib-src/libnyquist/Makefile.am.orig	2016-07-26 13:34:06 UTC
>-+++ lib-src/libnyquist/Makefile.am
>-@@ -3,7 +3,7 @@
>- # Written by Richard Ash following Gary Vaughan's Autobook
>- 
>- PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
>--SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
>-+#SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
>- 
>- # tell aclocal that extra macros can be found in autotools/m4/
>- ACLOCAL_AMFLAGS = -I autotools/m4
>diff -urN audacity/files/patch-lib-src_libnyquist_configure.ac audacity-new/files/patch-lib-src_libnyquist_configure.ac
>--- audacity/files/patch-lib-src_libnyquist_configure.ac	2017-06-22 16:09:36.288186000 -0700
>+++ audacity-new/files/patch-lib-src_libnyquist_configure.ac	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- lib-src/libnyquist/configure.ac.orig	2016-01-08 22:05:48 UTC
>-+++ lib-src/libnyquist/configure.ac
>-@@ -117,6 +117,8 @@ dnl Checks for typedefs, structures, and
>- AC_C_CONST
>- AC_TYPE_SIZE_T
>- 
>-+AC_SUBST([SNDFILE_CFLAGS])
>-+
>- AC_CONFIG_FILES([Makefile])
>- 
>- AC_OUTPUT
>diff -urN audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac audacity-new/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac
>--- audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac	2017-06-22 16:09:36.248092000 -0700
>+++ audacity-new/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- lib-src/portaudio-v19/bindings/cpp/configure.ac.orig	2016-01-08 22:05:48 UTC
>-+++ lib-src/portaudio-v19/bindings/cpp/configure.ac
>-@@ -14,7 +14,7 @@ m4_define([lt_age], [0])
>- 
>- AC_INIT([PortAudioCpp], [12])
>- AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx])
>--AM_INIT_AUTOMAKE
>-+AM_INIT_AUTOMAKE([subdir-objects])
>- AM_MAINTAINER_MODE
>- 
>- ###### Top-level directory of pacpp
>diff -urN audacity/files/patch-lib-src_portmixer_include_portmixer.h audacity-new/files/patch-lib-src_portmixer_include_portmixer.h
>--- audacity/files/patch-lib-src_portmixer_include_portmixer.h	2017-06-22 16:09:36.570537000 -0700
>+++ audacity-new/files/patch-lib-src_portmixer_include_portmixer.h	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- lib-src/portmixer/include/portmixer.h.orig	2016-07-26 13:34:07 UTC
>-+++ lib-src/portmixer/include/portmixer.h
>-@@ -45,7 +45,7 @@ extern "C"
>-  *
>-  */
>- 
>--#include "portaudio.h"
>-+#include "../../portaudio-v19/include/portaudio.h"
>- 
>- typedef void PxMixer;
>- 
>diff -urN audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am audacity-new/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am
>--- audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am	2017-06-22 16:09:36.020905000 -0700
>+++ audacity-new/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig	2016-07-26 13:34:06 UTC
>-+++ lib-src/soundtouch/source/SoundTouch/Makefile.am
>-@@ -32,7 +32,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FI
>- 
>- 
>- # Compiler flags
>--AM_CXXFLAGS=-O3 -fcheck-new -I../../include
>-+AM_CXXFLAGS=-O3 -I../../include
>- 
>- # Compile the files that need MMX and SSE individually.
>- libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la
>diff -urN audacity/files/patch-m4_audacity__checklib__libsndfile.m4 audacity-new/files/patch-m4_audacity__checklib__libsndfile.m4
>--- audacity/files/patch-m4_audacity__checklib__libsndfile.m4	2017-06-22 16:09:36.194363000 -0700
>+++ audacity-new/files/patch-m4_audacity__checklib__libsndfile.m4	1969-12-31 16:00:00.000000000 -0800
>@@ -1,10 +0,0 @@
>---- m4/audacity_checklib_libsndfile.m4.orig	2016-01-08 22:05:48 UTC
>-+++ m4/audacity_checklib_libsndfile.m4
>-@@ -50,6 +50,7 @@ AC_DEFUN([AUDACITY_CONFIG_LIBSNDFILE], [
>-       SNDFILE_LIBS='$(top_builddir)/lib-src/libsndfile/src/.libs/libsndfile.a'
>-       AC_CONFIG_SUBDIRS([lib-src/libsndfile])
>-    fi
>-+   export SNDFILE_CFLAGS
>- 
>-    AC_SUBST([SNDFILE_CFLAGS])
>-    AC_SUBST([SNDFILE_LIBS])
>diff -urN audacity/files/patch-src_Audacity.h audacity-new/files/patch-src_Audacity.h
>--- audacity/files/patch-src_Audacity.h	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-src_Audacity.h	2017-06-19 15:56:30.856329000 -0700
>@@ -0,0 +1,16 @@
>+--- src/Audacity.h.orig	2017-06-16 13:26:40 UTC
>++++ src/Audacity.h
>+@@ -24,13 +24,6 @@
>+ #ifndef __AUDACITY_H__
>+ #define __AUDACITY_H__
>+ 
>+-// If building with GNU compiler, then must be 4.9 or later.
>+-// TODO: This would be much nicer as a standalone test in configure.ac
>+-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
>+-#error insufficient compiler
>+-#endif
>+-
>+-
>+ // We only do alpha builds and release versions.
>+ // Most of the time we're in development, so IS_ALPHA should be defined
>+ // to 1.
>diff -urN audacity/files/patch-src_AudioIO.h audacity-new/files/patch-src_AudioIO.h
>--- audacity/files/patch-src_AudioIO.h	2017-06-22 16:09:35.915493000 -0700
>+++ audacity-new/files/patch-src_AudioIO.h	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/AudioIO.h.orig	2016-07-26 13:34:06 UTC
>-+++ src/AudioIO.h
>-@@ -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 -urN audacity/files/patch-src_DeviceManager.cpp audacity-new/files/patch-src_DeviceManager.cpp
>--- audacity/files/patch-src_DeviceManager.cpp	2017-06-22 16:09:36.809250000 -0700
>+++ audacity-new/files/patch-src_DeviceManager.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/DeviceManager.cpp.orig	2016-07-26 13:34:06 UTC
>-+++ src/DeviceManager.cpp
>-@@ -6,7 +6,7 @@
>- 
>- ******************************************************************/
>- 
>--#include "portaudio.h"
>-+#include "../lib-src/portaudio-v19/include/portaudio.h"
>- #ifdef __WXMSW__
>- #include "pa_win_wasapi.h"
>- #endif
>diff -urN audacity/files/patch-src_prefs_DevicePrefs.cpp audacity-new/files/patch-src_prefs_DevicePrefs.cpp
>--- audacity/files/patch-src_prefs_DevicePrefs.cpp	2017-06-22 16:09:35.933438000 -0700
>+++ audacity-new/files/patch-src_prefs_DevicePrefs.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/prefs/DevicePrefs.cpp.orig	2016-07-26 13:34:06 UTC
>-+++ src/prefs/DevicePrefs.cpp
>-@@ -30,7 +30,7 @@ other settings.
>- #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"
>diff -urN audacity/pkg-plist audacity-new/pkg-plist
>--- audacity/pkg-plist	2017-06-22 16:09:36.920198000 -0700
>+++ audacity-new/pkg-plist	2017-06-21 20:04:10.340325000 -0700
>@@ -1,17 +1,16 @@
> bin/audacity
>-include/audacity/ConfigInterface.h
>-include/audacity/EffectAutomationParameters.h
>-include/audacity/EffectInterface.h
>-include/audacity/IdentInterface.h
>-include/audacity/ImporterInterface.h
>-include/audacity/ModuleInterface.h
>-include/audacity/PluginInterface.h
>-include/audacity/Types.h
> man/man1/audacity.1.gz
> share/appdata/audacity.appdata.xml
> share/applications/audacity.desktop
> %%DATADIR%%/EQDefaultCurves.xml
>-%%DATADIR%%/include/audacity
>+%%DATADIR%%/include/audacity/ConfigInterface.h
>+%%DATADIR%%/include/audacity/EffectAutomationParameters.h
>+%%DATADIR%%/include/audacity/EffectInterface.h
>+%%DATADIR%%/include/audacity/IdentInterface.h
>+%%DATADIR%%/include/audacity/ImporterInterface.h
>+%%DATADIR%%/include/audacity/ModuleInterface.h
>+%%DATADIR%%/include/audacity/PluginInterface.h
>+%%DATADIR%%/include/audacity/Types.h
> %%DATADIR%%/nyquist/dspprims.lsp
> %%DATADIR%%/nyquist/envelopes.lsp
> %%DATADIR%%/nyquist/equalizer.lsp
>@@ -81,6 +80,7 @@
> %%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

Actions: View | Diff

Attachments on bug 218104: 181176 | 181177 | 183543 | 183551 | 183636 | 183697 | 183724