From aa2c92d5a6d28dbaee9ba20dd8ba3603794641af Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 30 Nov 2019 14:58:52 +0100 Subject: [PATCH] audacity: update to 2.3.3. Use vendored portaudio, drop patches. --- srcpkgs/audacity/patches/PaUtil_GetTime.patch | 33 ------------------- srcpkgs/audacity/template | 6 ++-- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/audacity/patches/PaUtil_GetTime.patch diff --git a/srcpkgs/audacity/patches/PaUtil_GetTime.patch b/srcpkgs/audacity/patches/PaUtil_GetTime.patch deleted file mode 100644 index e720f337fd4..00000000000 --- a/srcpkgs/audacity/patches/PaUtil_GetTime.patch +++ /dev/null @@ -1,33 +0,0 @@ -Source: https://svnweb.freebsd.org/ports/head/audio/audacity/files/patch-src_AudioIO.cpp?view=markup -Upstream: No -Reason: For system portaudio - - -diff --git src/AudioIO.cpp src/AudioIO.cpp -index 03972d700..51913ce9f 100644 ---- src/AudioIO.cpp -+++ src/AudioIO.cpp -@@ -467,7 +467,6 @@ TimeTrack and AudioIOListener and whether the playback is looped. - #define ROUND(x) (int) ((x)+0.5) - //#include - #include "../lib-src/portmidi/pm_common/portmidi.h" -- #include "../lib-src/portaudio-v19/src/common/pa_util.h" - #include "NoteTrack.h" - #endif - -@@ -787,6 +786,15 @@ 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__ diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index 0cbe7f7b662..599e2a45ad1 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -1,6 +1,6 @@ # Template file for 'audacity' pkgname=audacity -version=2.3.2 +version=2.3.3 revision=1 wrksrc="${pkgname}-Audacity-${version}" build_style=gnu-configure @@ -10,14 +10,14 @@ hostmakedepends="pkg-config cmake libtool m4 python" makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel libmad-devel soundtouch-devel libsoxr-devel vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel - ffmpeg-devel twolame-devel portaudio-devel" + ffmpeg-devel twolame-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Graphical cross-platform audio editor" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://www.audacityteam.org" distfiles="https://github.com/${pkgname}/${pkgname}/archive/Audacity-${version}.tar.gz" -checksum=cc477a71ff5571c72887a7a155365b07a1a50bcea1abf490a4de7b884376c731 +checksum=404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) ;;