Attachment #191028 for bug #226136




# $FreeBSD: head/audio/audacity/Makefile 452570 2017-10-21 06:50:49Z jbeich $

PORTNAME=	audacity
PORTVERSION=	2.2.2
DISTVERSIONPREFIX=	Audacity-
PORTREVISION=	3
CATEGORIES=	audio

MAINTAINER=	xxjack12xx@gmail.com


BUILD_DEPENDS=	autogen:devel/autogen \
		bash:shells/bash \
		cmake:devel/cmake 

LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libexpat.so:textproc/expat2 \
		libsndfile.so:audio/libsndfile \
		libsoxr.so:audio/libsoxr

BROKEN_aarch64=		fails to configure: checking whether C++ compiler accepts -msse... no
BROKEN_powerpc64=	fails to build

SHEBANG_FILES=	lib-src/lv2/build
USE_GITHUB=	yes

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

			--with-lib-preference="local" \
			--with-expat=system \
			--with-libsndfile=system \
			--with-libsoxr=system \
			--with-midi \
			--with-portaudio \
			--with-portmixer=yes \

DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
			docbook2man: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:audio/alsa-lib

DYNLOAD_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
DYNLOAD_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:audio/lame
DYNLOAD_CONFIGURE_ENABLE=	dynamic-loading

LAME_LDFLAGS=		-L${LOCALBASE}/lib
LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame

LV2_CONFIGURE_WITH=	lv2=system
LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
			libsuil-0.so:audio/suil

SBSMS_CONFIGURE_WITH=	sbsms


Lines 1-3 Link Here

(-)audacity-new/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496739477	1	TIMESTAMP = 1519297034
2	SHA256 (audacity-audacity-Audacity-2.1.3_GH0.tar.gz) = cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86	2	SHA256 (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3
3	SIZE (audacity-audacity-Audacity-2.1.3_GH0.tar.gz) = 24106855	3	SIZE (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 25947462




--- configure.ac.orig   2016-01-08 22:05:48 UTC
+++ configure.ac
@@ -235,20 +235,7 @@
 dnl Solaris builds, by defining HAVE_ALLOCA_H
 AC_CHECK_HEADERS_ONCE(alloca.h)
 
-
-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
-if "${CXX}" -v 2>&1 | grep -q '^gcc version'; 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])




--- include/audacity/Types.h.orig       2017-03-13 21:02:21 UTC
+++ include/audacity/Types.h
@@ -72,7 +72,7 @@
    sampleCount ( int v ) : value { v } {}
    sampleCount ( unsigned v ) : value { v } {}
    sampleCount ( long v ) : value { v } {}
 
    // unsigned long is 64 bit on some platforms.  Let it narrow.
-   sampleCount ( unsigned long v ) : value ( v ) {}
+   sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
 
    // Beware implicit conversions from floating point values!




--- lib-src/libmad/configure.ac.orig	2016-01-08 22:05:48 UTC
+++ lib-src/libmad/configure.ac
@@ -141,22 +141,25 @@ then
 
     case "$optimize" in
 	-O|"-O "*)
+dnl (using audio/libmad/files/patch-configure as reference)
+AC_PROG_GREP
+AS_IF([$CC -v 2>&1 | $GREP -q clang], [CLANG=yes], [CLANG=])
 	    optimize="-O"
 	    : #x optimize="$optimize -fforce-mem"
 	    : #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"
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fthread-jumps" ; fi
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-follow-jumps" ; fi
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-skip-blocks" ; fi
 	    : #x optimize="$optimize -frerun-cse-after-loop"
 	    : #x optimize="$optimize -frerun-loop-opt"
 	    : #x optimize="$optimize -fgcse"
 	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fregmove" ; fi
 	    : #* optimize="$optimize -fdelayed-branch"
 	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fschedule-insns2" ; fi
 	    : #? optimize="$optimize -ffunction-sections"
 	    : #? optimize="$optimize -fcaller-saves"
 	    : #> optimize="$optimize -funroll-loops"




--- lib-src/portmidi/porttime/ptlinux.c.orig	2018-02-22 17:57:15.438232000 -0800
+++ lib-src/portmidi/porttime/ptlinux.c	2018-02-22 19:12:15.820418000 -0800
@@ -31,14 +31,13 @@
 #include "porttime.h"
 #include "sys/time.h"
 #include "sys/resource.h"
-#include "sys/timeb.h"
 #include "pthread.h"
 
 #define TRUE 1
 #define FALSE 0
 
 static int time_started_flag = FALSE;
-static struct timeb time_offset = {0, 0, 0, 0};
+static struct timeval time_offset = {0};
 static pthread_t pt_thread_pid;
 static int pt_thread_created = FALSE;
 
@@ -79,7 +78,7 @@
 PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
 {
     if (time_started_flag) return ptNoError;
-    ftime(&time_offset); /* need this set before process runs */
+    gettimeofday(&time_offset, 0);
     if (callback) {
         int res;
         pt_callback_parameters *parms = (pt_callback_parameters *) 
@@ -121,10 +120,10 @@
 PtTimestamp Pt_Time()
 {
     long seconds, milliseconds;
-    struct timeb now;
-    ftime(&now);
-    seconds = now.time - time_offset.time;
-    milliseconds = now.millitm - time_offset.millitm;
+    struct timeval now;
+    gettimeofday(&now, 0);
+    seconds = now.tv_sec - time_offset.tv_sec;
+    milliseconds = (now.tv_usec / 1000) - (time_offset.tv_usec / 1000);
     return seconds * 1000 + milliseconds;
 }
 




--- lib-src/portmixer/configure.ac.orig	2016-01-08 22:05:48 UTC
+++ lib-src/portmixer/configure.ac
@@ -35,6 +35,9 @@ AC_ARG_ENABLE([debug],
   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
 
+AC_ARG_ENABLE([alsa],
+	AC_HELP_STRING([--disable-alsa], []))
+
 PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19])
 
 #
@@ -43,7 +46,7 @@ PKG_CHECK_MODULES([PORTAUDIO], [portaudi
 
 dnl The following tests need to have the header files of portaudio available.
 cppflags_save="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"
+CPPFLAGS="$PORTAUDIO_CFLAGS $CPPFLAGS"
 
 have_oss=no
 AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
@@ -123,8 +126,8 @@ if [[ $have_oss = "yes" ]] ; then
    have_support=yes
 fi
 
-AM_CONDITIONAL([USE_LINUX_ALSA], [test "$have_alsa" = yes])
-if [[ $have_alsa = "yes" ]] ; then
+AM_CONDITIONAL([USE_LINUX_ALSA], [test "$have_alsa" = yes -a "x$enable_alsa" != "xno"])
+if [[ $have_alsa = "yes" -a "x$enable_alsa" != "xno" ]] ; then
    AC_MSG_NOTICE([Including support for ALSA])
    AC_DEFINE(PX_USE_LINUX_ALSA)
    have_support=yes

Lines 1-10 Link Here

(-)audacity-new/files/patch-lib-src_portmixer_src_px__linux__alsa.c (-10 lines)
1	--- lib-src/portmixer/src/px_linux_alsa.c.orig 2016-07-26 13:34:06 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"




--- 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.

Line 0 Link Here

(-)audacity-new/files/patch-src_AudioIO.cpp (+11 lines)
	1	--- src/AudioIO.cpp.orig 2018-02-22 14:12:03.835431000 -0800
	2	+++ src/AudioIO.cpp 2018-02-22 14:01:49.487127000 -0800
	3	@@ -985,7 +985,7 @@
	4	if (usingAlsa) {
	5	struct timespec now;
	6	// CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time
	7	- clock_gettime(CLOCK_MONOTONIC_RAW, &now);
	8	+ clock_gettime(CLOCK_REALTIME, &now);
	9	//return now.tv_sec + now.tv_nsec * 0.000000001;
	10	return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime;
	11	}

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_BatchCommands.cpp (-11 lines)
1	--- src/BatchCommands.cpp.orig 2016-07-26 13:34:06 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);

Lines 1-6 Link Here

(-)audacity-new/files/patch-src_Makefile.am (-1 / +1 lines)
1	--- src/Makefile.am.orig 2016-07-26 13:34:06 UTC	1	--- src/Makefile.am.orig 2016-07-26 13:34:06 UTC
2	+++ src/Makefile.am	2	+++ src/Makefile.am
3	@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \	3	@@ -79,8 +79,7 @@ audacity_CPPFLAGS = \
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	# ^




--- src/MemoryX.h.orig	2018-02-22 14:12:04.240599000 -0800
+++ src/MemoryX.h	2018-02-22 14:01:53.685861000 -0800
@@ -1,6 +1,7 @@
 #ifndef __AUDACITY_MEMORY_X_H__
 #define __AUDACITY_MEMORY_X_H__
 
+#include <stdlib.h>
 // C++ standard header <memory> with a few extensions
 #include <memory>
 #ifndef safenew
@@ -1171,7 +1172,7 @@
    namespace tr1
    {
 #endif
-      template<typename T> struct hash;
+      //template<typename T> struct hash;
       template<> struct hash< wxString > {
          size_t operator () (const wxString &str) const // noexcept
          {

Lines 100-105 Link Here

(-)audacity-new/pkg-plist (+1 lines)
100	%%NLS%%share/locale/el/LC_MESSAGES/audacity.mo	100	%%NLS%%share/locale/el/LC_MESSAGES/audacity.mo
101	%%NLS%%share/locale/es/LC_MESSAGES/audacity.mo	101	%%NLS%%share/locale/es/LC_MESSAGES/audacity.mo
102	%%NLS%%share/locale/eu/LC_MESSAGES/audacity.mo	102	%%NLS%%share/locale/eu/LC_MESSAGES/audacity.mo
		103	%%NLS%%share/locale/eu_ES/LC_MESSAGES/audacity.mo
103	%%NLS%%share/locale/fa/LC_MESSAGES/audacity.mo	104	%%NLS%%share/locale/fa/LC_MESSAGES/audacity.mo
104	%%NLS%%share/locale/fi/LC_MESSAGES/audacity.mo	105	%%NLS%%share/locale/fi/LC_MESSAGES/audacity.mo
105	%%NLS%%share/locale/fr/LC_MESSAGES/audacity.mo	106	%%NLS%%share/locale/fr/LC_MESSAGES/audacity.mo

Return to bug 226136

Lines 2-10 Link Here

(-)audacity-new/Makefile (-15 / +12 lines)
2	# $FreeBSD: head/audio/audacity/Makefile 452570 2017-10-21 06:50:49Z jbeich $	2	# $FreeBSD: head/audio/audacity/Makefile 452570 2017-10-21 06:50:49Z jbeich $
3		3
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.1.3	5	PORTVERSION= 2.2.2
6	DISTVERSIONPREFIX= Audacity-	6	DISTVERSIONPREFIX= Audacity-
7	PORTREVISION= 3
8	CATEGORIES= audio	7	CATEGORIES= audio
9		8
10	MAINTAINER= xxjack12xx@gmail.com	9	MAINTAINER= xxjack12xx@gmail.com
Lines 15-23 Link Here
15		14
16	BUILD_DEPENDS= autogen:devel/autogen \	15	BUILD_DEPENDS= autogen:devel/autogen \
17	bash:shells/bash \	16	bash:shells/bash \
18	cmake:devel/cmake	17	cmake:devel/cmake
19	LIB_DEPENDS= libexpat.so:textproc/expat2 \	18
20	libsndfile.so:audio/libsndfile	19	LIB_DEPENDS= libasound.so:audio/alsa-lib \
		20	libexpat.so:textproc/expat2 \
		21	libsndfile.so:audio/libsndfile \
		22	libsoxr.so:audio/libsoxr
21		23
22	BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse... no	24	BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse... no
23	BROKEN_powerpc64= fails to build	25	BROKEN_powerpc64= fails to build
Lines 36-42 Link Here
36	SHEBANG_FILES= lib-src/lv2/build	38	SHEBANG_FILES= lib-src/lv2/build
37	USE_GITHUB= yes	39	USE_GITHUB= yes
38		40
39	OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \	41	OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
40	MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	42	MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
41	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \	43	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \
42	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	44	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
Lines 65-71 Link Here
65	--with-lib-preference="local" \	67	--with-lib-preference="local" \
66	--with-expat=system \	68	--with-expat=system \
67	--with-libsndfile=system \	69	--with-libsndfile=system \
68	--with-libsoxr \	70	--with-libsoxr=system \
69	--with-midi \	71	--with-midi \
70	--with-portaudio \	72	--with-portaudio \
71	--with-portmixer=yes \	73	--with-portmixer=yes \
Lines 78-90 Link Here
78	DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \	80	DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \
79	docbook2man:textproc/docbook-utils	81	docbook2man:textproc/docbook-utils
80		82
81	ALSA_CONFIGURE_OFF= --disable-alsa
82	ALSA_CONFIGURE_WITH= alsa
83	ALSA_CFLAGS= -I${LOCALBASE}/include
84	ALSA_CXXFLAGS= -I${LOCALBASE}/include
85	ALSA_LDFLAGS= -L${LOCALBASE}/lib
86	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
87
88	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg	83	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
89	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame	84	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame
90	DYNLOAD_CONFIGURE_ENABLE= dynamic-loading	85	DYNLOAD_CONFIGURE_ENABLE= dynamic-loading
Lines 114-120 Link Here
114	LAME_LDFLAGS= -L${LOCALBASE}/lib	109	LAME_LDFLAGS= -L${LOCALBASE}/lib
115	LAME_LIB_DEPENDS= libmp3lame.so:audio/lame	110	LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
116		111
117	LV2_CONFIGURE_WITH= lv2	112	LV2_CONFIGURE_WITH= lv2=system
		113	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
		114	libsuil-0.so:audio/suil
118		115
119	SBSMS_CONFIGURE_WITH= sbsms	116	SBSMS_CONFIGURE_WITH= sbsms
120		117

Lines 1-12 Link Here

(-)audacity-new/files/patch-configure.ac (-3 / +3 lines)
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	@@ -235,20 +236,7 @@	3	@@ -235,20 +235,7 @@
4	dnl Solaris builds, by defining HAVE_ALLOCA_H	4	dnl Solaris builds, by defining HAVE_ALLOCA_H
5	AC_CHECK_HEADERS_ONCE(alloca.h)	5	AC_CHECK_HEADERS_ONCE(alloca.h)
6		6
7	-	7	-
8	-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions	8	-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
9	-if test "${ax_cv_c_compiler_vendor}" = "gnu"; then	9	-if "${CXX}" -v 2>&1 \| grep -q '^gcc version'; then
10	-	10	-
11	- dnl GCC < 4.9 has known bugs (#1397) and can't be used	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])	12	- AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])

Lines 1-10 Link Here

(-)audacity-new/files/patch-include_audacity_Types.h (-5 / +5 lines)
1	--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC	1	--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC
2	+++ include/audacity/Types.h	2	+++ include/audacity/Types.h
3	@@ -70,7 +70,7 @@ public:	3	@@ -72,7 +72,7 @@
4	sampleCount ( int v ) : value { v } {}
5	sampleCount ( unsigned v ) : value { v } {}
6	sampleCount ( long v ) : value { v } {}	4	sampleCount ( long v ) : value { v } {}
7	- sampleCount ( unsigned long v ) : value { v } {}	5
		6	// unsigned long is 64 bit on some platforms. Let it narrow.
		7	- sampleCount ( unsigned long v ) : value ( v ) {}
8	+ sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}	8	+ sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
9		9
10	// Beware implicit conversions from floating point values!	10	// Beware implicit conversions from floating point values!

Lines 1-33 Link Here

(-)audacity-new/files/patch-lib-src_libmad_configure.ac (-33 lines)
1	--- lib-src/libmad/configure.ac.orig 2016-01-08 22:05:48 UTC
2	+++ lib-src/libmad/configure.ac
3	@@ -141,22 +141,25 @@ then
4
5	case "$optimize" in
6	-O\|"-O "*)
7	+dnl (using audio/libmad/files/patch-configure as reference)
8	+AC_PROG_GREP
9	+AS_IF([$CC -v 2>&1 \| $GREP -q clang], [CLANG=yes], [CLANG=])
10	optimize="-O"
11	: #x optimize="$optimize -fforce-mem"
12	: #x optimize="$optimize -fforce-addr"
13	: #x optimize="$optimize -finline-functions"
14	: #- optimize="$optimize -fstrength-reduce"
15	- optimize="$optimize -fthread-jumps"
16	- optimize="$optimize -fcse-follow-jumps"
17	- optimize="$optimize -fcse-skip-blocks"
18	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fthread-jumps" ; fi
19	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-follow-jumps" ; fi
20	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-skip-blocks" ; fi
21	: #x optimize="$optimize -frerun-cse-after-loop"
22	: #x optimize="$optimize -frerun-loop-opt"
23	: #x optimize="$optimize -fgcse"
24	optimize="$optimize -fexpensive-optimizations"
25	- optimize="$optimize -fregmove"
26	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fregmove" ; fi
27	: #* optimize="$optimize -fdelayed-branch"
28	: #x optimize="$optimize -fschedule-insns"
29	- optimize="$optimize -fschedule-insns2"
30	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fschedule-insns2" ; fi
31	: #? optimize="$optimize -ffunction-sections"
32	: #? optimize="$optimize -fcaller-saves"
33	: #> optimize="$optimize -funroll-loops"

Line 0 Link Here

(-)audacity-new/files/patch-lib-src_portmidi_porttime_ptlinux.c (+42 lines)
	1	--- lib-src/portmidi/porttime/ptlinux.c.orig 2018-02-22 17:57:15.438232000 -0800
	2	+++ lib-src/portmidi/porttime/ptlinux.c 2018-02-22 19:12:15.820418000 -0800
	3	@@ -31,14 +31,13 @@
	4	#include "porttime.h"
	5	#include "sys/time.h"
	6	#include "sys/resource.h"
	7	-#include "sys/timeb.h"
	8	#include "pthread.h"
	9
	10	#define TRUE 1
	11	#define FALSE 0
	12
	13	static int time_started_flag = FALSE;
	14	-static struct timeb time_offset = {0, 0, 0, 0};
	15	+static struct timeval time_offset = {0};
	16	static pthread_t pt_thread_pid;
	17	static int pt_thread_created = FALSE;
	18
	19	@@ -79,7 +78,7 @@
	20	PtError Pt_Start(int resolution, PtCallback callback, void userData)
	21	{
	22	if (time_started_flag) return ptNoError;
	23	- ftime(&time_offset); /* need this set before process runs */
	24	+ gettimeofday(&time_offset, 0);
	25	if (callback) {
	26	int res;
	27	pt_callback_parameters parms = (pt_callback_parameters )
	28	@@ -121,10 +120,10 @@
	29	PtTimestamp Pt_Time()
	30	{
	31	long seconds, milliseconds;
	32	- struct timeb now;
	33	- ftime(&now);
	34	- seconds = now.time - time_offset.time;
	35	- milliseconds = now.millitm - time_offset.millitm;
	36	+ struct timeval now;
	37	+ gettimeofday(&now, 0);
	38	+ seconds = now.tv_sec - time_offset.tv_sec;
	39	+ milliseconds = (now.tv_usec / 1000) - (time_offset.tv_usec / 1000);
	40	return seconds * 1000 + milliseconds;
	41	}
	42

Lines 1-32 Link Here

(-)audacity-new/files/patch-lib-src_portmixer_configure.ac (-32 lines)
1	--- lib-src/portmixer/configure.ac.orig 2016-01-08 22:05:48 UTC
2	+++ lib-src/portmixer/configure.ac
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)])
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
15	dnl The following tests need to have the header files of portaudio available.
16	cppflags_save="$CPPFLAGS"
17	-CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"
18	+CPPFLAGS="$PORTAUDIO_CFLAGS $CPPFLAGS"
19
20	have_oss=no
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

Lines 1-16 Link Here

(-)audacity-new/files/patch-src_Audacity.h (-16 lines)
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.

Line 0 Link Here

(-)audacity-new/files/patch-src_MemoryX.h (+19 lines)
	1	--- src/MemoryX.h.orig 2018-02-22 14:12:04.240599000 -0800
	2	+++ src/MemoryX.h 2018-02-22 14:01:53.685861000 -0800
	3	@@ -1,6 +1,7 @@
	4	#ifndef __AUDACITY_MEMORY_X_H__
	5	#define __AUDACITY_MEMORY_X_H__
	6
	7	+#include <stdlib.h>
	8	// C++ standard header <memory> with a few extensions
	9	#include <memory>
	10	#ifndef safenew
	11	@@ -1171,7 +1172,7 @@
	12	namespace tr1
	13	{
	14	#endif
	15	- template<typename T> struct hash;
	16	+ //template<typename T> struct hash;
	17	template<> struct hash< wxString > {
	18	size_t operator () (const wxString &str) const // noexcept
	19	{