Attachment #195226 for bug #229853

View | Details | Raw Unified | Return to bug 229853 | Differences between
Collapse All | Expand All




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

MAINTAINER=	xxjack12xx@gmail.com

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


			--with-libsndfile=system \
			--with-libsoxr=system \
			--with-midi \
			--with-portaudio=system \
			--with-portmixer=yes \
			--with-widgetextra



VST_CONFIGURE_ENABLE=	vst

post-extract:
# Unbundle PortAudio
	@${RM} -r ${WRKSRC}/lib-src/portaudio-v19

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt




--- lib-src/Makefile.am.orig	2018-07-17 23:33:11 UTC
+++ lib-src/Makefile.am
@@ -152,10 +152,6 @@ if USE_LOCAL_LV2
 SUBDIRS += lv2
 endif
 
-if USE_LOCAL_PORTAUDIO
-SUBDIRS += portaudio-v19
-endif
-
 # Note: portmixer needs to be linked against (the local or system) portaudio.
 SUBDIRS += portmixer
 




--- src/AudioIO.cpp.orig	2018-07-17 20:25:01 UTC
+++ src/AudioIO.cpp
@@ -465,7 +465,6 @@ TimeTrack and AudioIOListener and whether the playback
    #define ROUND(x) (int) ((x)+0.5)
    //#include <string.h>
    #include "../lib-src/portmidi/pm_common/portmidi.h"
-   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
    #include "NoteTrack.h"
 #endif
 
@@ -979,13 +978,22 @@ struct AudioIO::ScrubQueue (private)
 // return the system time as a double
 static double streamStartTime = 0; // bias system time to small number
 
+// PaUtil_GetTime is an internal PortAudio function.  Unfortunately
+// it's used twice in AudioIO.cpp.  It's a simple function so just
+// provide the implementation here.
+static double PaUtil_GetTime(void) {
+   struct timespec tp;
+   clock_gettime(CLOCK_REALTIME, &tp);
+   return (double)(tp.tv_sec + tp.tv_nsec * 1e-9);
+}
+
 static double SystemTime(bool usingAlsa)
 {
 #ifdef __WXGTK__
    if (usingAlsa) {
       struct timespec now;
       // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time

Return to bug 229853

Lines 4-10 Link Here

(-)Makefile (-2 / +7 lines)
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.2.2	5	PORTVERSION= 2.2.2
6	DISTVERSIONPREFIX= Audacity-	6	DISTVERSIONPREFIX= Audacity-
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= audio	8	CATEGORIES= audio
9		9
10	MAINTAINER= xxjack12xx@gmail.com	10	MAINTAINER= xxjack12xx@gmail.com
Lines 21-26 Link Here
21	cmake:devel/cmake	21	cmake:devel/cmake
22	LIB_DEPENDS= libasound.so:audio/alsa-lib \	22	LIB_DEPENDS= libasound.so:audio/alsa-lib \
23	libexpat.so:textproc/expat2 \	23	libexpat.so:textproc/expat2 \
		24	libportaudio.so:audio/portaudio \
24	libsoxr.so:audio/libsoxr \	25	libsoxr.so:audio/libsoxr \
25	libsndfile.so:audio/libsndfile	26	libsndfile.so:audio/libsndfile
26		27
Lines 69-75 Link Here
69	--with-libsndfile=system \	70	--with-libsndfile=system \
70	--with-libsoxr=system \	71	--with-libsoxr=system \
71	--with-midi \	72	--with-midi \
72	--with-portaudio \	73	--with-portaudio=system \
73	--with-portmixer=yes \	74	--with-portmixer=yes \
74	--with-widgetextra	75	--with-widgetextra
75		76
Lines 132-137 Link Here
132		133
133	VST_CONFIGURE_ENABLE= vst	134	VST_CONFIGURE_ENABLE= vst
134		135
		136	post-extract:
		137	# Unbundle PortAudio
		138	@${RM} -r ${WRKSRC}/lib-src/portaudio-v19
		139
135	post-install:	140	post-install:
136	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	141	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
137	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt	142	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt

Line 0 Link Here

(-)files/patch-lib-src_Makefile.am (+13 lines)
	1	--- lib-src/Makefile.am.orig 2018-07-17 23:33:11 UTC
	2	+++ lib-src/Makefile.am
	3	@@ -152,10 +152,6 @@ if USE_LOCAL_LV2
	4	SUBDIRS += lv2
	5	endif
	6
	7	-if USE_LOCAL_PORTAUDIO
	8	-SUBDIRS += portaudio-v19
	9	-endif
	10	-
	11	# Note: portmixer needs to be linked against (the local or system) portaudio.
	12	SUBDIRS += portmixer
	13

Lines 1-6 Link Here

(-)files/patch-src_AudioIO.cpp (-3 / +26 lines)
1	--- src/AudioIO.cpp.orig 2018-02-22 14:12:03.835431000 -0800	1	--- src/AudioIO.cpp.orig 2018-07-17 20:25:01 UTC
2	+++ src/AudioIO.cpp 2018-02-22 14:01:49.487127000 -0800	2	+++ src/AudioIO.cpp
3	@@ -985,7 +985,7 @@	3	@@ -465,7 +465,6 @@ TimeTrack and AudioIOListener and whether the playback
		4	#define ROUND(x) (int) ((x)+0.5)
		5	//#include <string.h>
		6	#include "../lib-src/portmidi/pm_common/portmidi.h"
		7	- #include "../lib-src/portaudio-v19/src/common/pa_util.h"
		8	#include "NoteTrack.h"
		9	#endif
		10
		11	@@ -979,13 +978,22 @@ struct AudioIO::ScrubQueue (private)
		12	// return the system time as a double
		13	static double streamStartTime = 0; // bias system time to small number
		14
		15	+// PaUtil_GetTime is an internal PortAudio function. Unfortunately
		16	+// it's used twice in AudioIO.cpp. It's a simple function so just
		17	+// provide the implementation here.
		18	+static double PaUtil_GetTime(void) {
		19	+ struct timespec tp;
		20	+ clock_gettime(CLOCK_REALTIME, &tp);
		21	+ return (double)(tp.tv_sec + tp.tv_nsec * 1e-9);
		22	+}
		23	+
		24	static double SystemTime(bool usingAlsa)
		25	{
		26	#ifdef __WXGTK__
4	if (usingAlsa) {	27	if (usingAlsa) {
5	struct timespec now;	28	struct timespec now;
6	// CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time	29	// CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time