svn commit: r474923 - in head/audio/audacity: . files

[Tobias Kortkamp]

Author: tobik
Date: Thu Jul 19 03:18:53 2018
New Revision: 474923
URL: https://svnweb.freebsd.org/changeset/ports/474923

Log:
  audio/audacity: Unbundle portaudio and use audio/portaudio instead
  
  PR:		229853
  Submitted by:	tobik
  Approved by:	xxjack12xx at gmail.com (maintainer)

Modified:
  head/audio/audacity/Makefile
  head/audio/audacity/files/patch-src_AudioIO.cpp

Modified: head/audio/audacity/Makefile
==============================================================================
--- head/audio/audacity/Makefile	Thu Jul 19 00:02:37 2018	(r474922)
+++ head/audio/audacity/Makefile	Thu Jul 19 03:18:53 2018	(r474923)
@@ -4,7 +4,7 @@
 PORTNAME=	audacity
 PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	Audacity-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	xxjack12xx at gmail.com
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	autogen:devel/autogen \
 		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 @@ CONFIGURE_ARGS+=	--disable-option-checking \
 			--with-libsndfile=system \
 			--with-libsoxr=system \
 			--with-midi \
-			--with-portaudio \
+			--with-portaudio=system \
 			--with-portmixer=yes \
 			--with-widgetextra
 

Modified: head/audio/audacity/files/patch-src_AudioIO.cpp
==============================================================================
--- head/audio/audacity/files/patch-src_AudioIO.cpp	Thu Jul 19 00:02:37 2018	(r474922)
+++ head/audio/audacity/files/patch-src_AudioIO.cpp	Thu Jul 19 03:18:53 2018	(r474923)
@@ -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