Attachment 195226 Details for Bug 229853 – audacity.diff

[patch] audacity.diff

audacity.diff (text/plain), 3.22 KB, created by Tobias Kortkamp on 2018-07-18 03:08:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2018-07-18 03:08:17 UTC

Size: 3.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 474831)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	audacity
> PORTVERSION=	2.2.2
> DISTVERSIONPREFIX=	Audacity-
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	audio
> 
> MAINTAINER=	xxjack12xx@gmail.com
>@@ -21,6 +21,7 @@
> 		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
> 
>@@ -69,7 +70,7 @@
> 			--with-libsndfile=system \
> 			--with-libsoxr=system \
> 			--with-midi \
>-			--with-portaudio \
>+			--with-portaudio=system \
> 			--with-portmixer=yes \
> 			--with-widgetextra
> 
>@@ -132,6 +133,10 @@
> 
> 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
>Index: files/patch-lib-src_Makefile.am
>===================================================================
>--- files/patch-lib-src_Makefile.am	(nonexistent)
>+++ files/patch-lib-src_Makefile.am	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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
>+ 
>
>Property changes on: files/patch-lib-src_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_AudioIO.cpp
>===================================================================
>--- files/patch-src_AudioIO.cpp	(revision 474831)
>+++ files/patch-src_AudioIO.cpp	(working copy)
>@@ -1,6 +1,29 @@
>---- src/AudioIO.cpp.orig	2018-02-22 14:12:03.835431000 -0800
>-+++ src/AudioIO.cpp	2018-02-22 14:01:49.487127000 -0800
>-@@ -985,7 +985,7 @@
>+--- 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

Flags:

tobik: maintainer-approval? (xxjack12xx)

Actions: View | Diff

Attachments on bug 229853: 195226 | 195260