From nobody Wed Oct 05 15:37:53 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MjJcK2qn7z4V3bv; Wed, 5 Oct 2022 15:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MjJcK2BLMz3hn8; Wed, 5 Oct 2022 15:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664984273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4rXn1xIO7OK6banSdEgtl9IcUTHYCymzqagfhXrIhiU=; b=B4tPWP/kkgPGK5q7iSvSqmsMmkISG9zeCt+WsIlLvG8kBoq5KdVYrHqfKGL0cCaI1TVvKm tpjfDySIKTD95dPj+6IPhXqG4cJdzQDKtO+YzvwbrxKeoh3qWQkf0fe9QfF5sMzzCqb5Tm nGNPseUN5LXbzM+InZaqBzLJVRgXIVuJxdh4PriRN1wAqHowYcUHvYOAcpCAuwRFpodLJ/ 3FS0/vcIoFNFJIWjmN8VEmMPznq9VnOdWedRuoKOY/urC4Mo2lRNictsFYPcGnqNmvL8CA 0aaI1+ENQm54robiHId5DdstjVxwaocU/EgV3ZbuqG79q+FxEYNkmxISVRbs1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MjJcK1BSwzxC3; Wed, 5 Oct 2022 15:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 295Fbr2H079068; Wed, 5 Oct 2022 15:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295FbrTN079067; Wed, 5 Oct 2022 15:37:53 GMT (envelope-from git) Date: Wed, 5 Oct 2022 15:37:53 GMT Message-Id: <202210051537.295FbrTN079067@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 6d9b7dea668d - main - audio/audacity: Update to 3.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d9b7dea668df2009e3fd41675991fa253bbbf34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664984273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4rXn1xIO7OK6banSdEgtl9IcUTHYCymzqagfhXrIhiU=; b=tjKOgAgU7avvy0Vg4MWsBbaysfjMrktV75Vp56cSqQU4utK8qy9y7HhsZBZVI7D+V12bam q4hBtM82UYAT+szRQ+WEp1yTG2J5XtDS/ASk4mwyASfEkQM1KbyxBG2BbbO1Da97V8/BED na0fso3hw8dvLufnyo17XxNdNuefLOdZsaEJRfpu9TOrC8wLMb1FTZ2dBG/iqyfuwMevCU 9YBOraYy4Z3oXo6RIkg7TmYY8ti1FDXZNhGQpEQZ4HADW/QVaabdiqC4SIalt5hY+k8VaE b6oK+IxT10RPqwZzCoEiESMCNu5h4/t47fA+flNtp4EN0uIi9Yd/hAa3SHQcqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664984273; a=rsa-sha256; cv=none; b=ES6Kdaje1UUMJRD6aOSOG/rl4y9E/9xzEOCYP5SWkvhkrHhqlMKMVD0cg7yxEwRXAguH4i envhcYEj6/Jz2gN8y7OCKZJz9my5m9JTKTh7GuMYlWY2xGYsBtmSqAD+9rVh6UZPYA5/O/ scyoejSYEnu1DRyIDB+KoW3kpTK8eHSl9/KJwSf1GneQcwK6ahSpvV2qCdNkQEh+FkjzUO x+LDSMephNVWeSz6hfydxCVtsl7OFbezCFTd/jHhsxrSR+ORLAqCXWzbvAU3kqFUyMspO2 Tev2sVuTmnf0C7Ozza2i1oQwSfs9xdcdRMAyHXnfjcP2ro+si140Khl6lxWGpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d9b7dea668df2009e3fd41675991fa253bbbf34 commit 6d9b7dea668df2009e3fd41675991fa253bbbf34 Author: Jack AuthorDate: 2022-10-01 12:02:47 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-05 15:34:11 +0000 audio/audacity: Update to 3.2.0 ChangeLog: https://www.audacityteam.org/ PR: 266668 Reported by: xxjack12xx@gmail.com (maintainer) --- audio/audacity/Makefile | 10 ++++++---- audio/audacity/distinfo | 6 +++--- .../audacity/files/patch-cmake-proxies_CMakeLists.txt | 18 +++++++++--------- .../patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h | 4 ++-- .../files/patch-libraries_lib-basic-ui_BasicUI.cpp | 10 ++++++++++ audio/audacity/files/patch-src_AboutDialog.cpp | 4 ++-- audio/audacity/files/patch-src_CMakeLists.txt | 11 ----------- audio/audacity/files/patch-src_MIDIPlay.cpp | 12 ++++++------ audio/audacity/pkg-plist | 14 +++++++++++--- 9 files changed, 49 insertions(+), 40 deletions(-) diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index dbbb5178d742..13e4fef4e1b6 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,7 +1,6 @@ PORTNAME= audacity DISTVERSIONPREFIX= Audacity- -DISTVERSION= 3.1.3 -PORTREVISION= 2 +DISTVERSION= 3.2.0 CATEGORIES= audio MAINTAINER= xxjack12xx@gmail.com @@ -15,12 +14,14 @@ BUILD_DEPENDS= conan:sysutils/conan LIB_DEPENDS= libasound.so:audio/alsa-lib \ libexpat.so:textproc/expat2 \ libmp3lame.so:audio/lame \ + libmpg123.so:audio/mpg123 \ libopus.so:audio/opus \ libportaudio.so:audio/portaudio \ libportmidi.so:audio/portmidi \ libsndfile.so:audio/libsndfile \ libsoxr.so:audio/libsoxr \ libsqlite3.so:databases/sqlite3 \ + libwavpack.so:audio/wavpack \ libuuid.so:misc/e2fsprogs-libuuid USES= cmake compiler:c++17-lang cpe desktop-file-utils gettext \ @@ -46,8 +47,9 @@ CMAKE_ARGS= -Daudacity_lib_preference:STRING=system \ -Daudacity_use_wxwidgets:STRING=system \ -Daudacity_use_zlib:STRING=system CMAKE_ON= audacity_use_pa_oss audacity_obey_system_dependencies -CMAKE_OFF= audacity_has_networking audacity_has_updates_check \ - audacity_use_pa_alsa audacity_use_pch +CMAKE_OFF= audacity_has_audiocom_upload audacity_has_networking audacity_has_updates_check \ + audacity_use_pa_alsa audacity_use_pch audacity_has_sentry_reporting \ + audacity_has_tests audacity_has_vst3 OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LV2 MAD \ OGG SBSMS SOUNDTOUCH TWOLAME VAMP \ diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index fd6da1ee09b9..91068f1e7879 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640677957 -SHA256 (audacity-audacity-Audacity-3.1.3_GH0.tar.gz) = 07aed333a20b8df381d5c0a167840883fff8ef65f5e5f71e654c0925d6c60de8 -SIZE (audacity-audacity-Audacity-3.1.3_GH0.tar.gz) = 56500219 +TIMESTAMP = 1664238989 +SHA256 (audacity-audacity-Audacity-3.2.0_GH0.tar.gz) = b6c3b15607a4925ea2ea5af12db8adaed759481fd1d3f51c5d8d9020171eea61 +SIZE (audacity-audacity-Audacity-3.2.0_GH0.tar.gz) = 56964814 diff --git a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt index 292e44f38c06..600659ad1b5c 100644 --- a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt +++ b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt @@ -1,11 +1,11 @@ ---- cmake-proxies/CMakeLists.txt.orig 2022-05-07 05:25:37 UTC +--- cmake-proxies/CMakeLists.txt.orig 2022-09-27 06:14:03 UTC +++ cmake-proxies/CMakeLists.txt -@@ -103,7 +103,7 @@ add_conan_lib( - libmad - libmad/0.15.2b@audacity/stable - OPTION_NAME libmad -- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file -+ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file - ) +@@ -130,7 +130,7 @@ else() + libmad + libmad/0.15.2b-1@ + OPTION_NAME libmad +- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file ++ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file + ) + endif() - add_conan_lib( diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h index 64e0f0276d9e..22ab44bcac78 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h @@ -1,6 +1,6 @@ ---- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2021-02-04 18:52:51 UTC +--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2022-09-22 16:16:06 UTC +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h -@@ -172,6 +172,15 @@ extern long ptrtoabs(); +@@ -181,6 +181,15 @@ extern long ptrtoabs(); #endif #endif diff --git a/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp b/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp new file mode 100644 index 000000000000..324ae029e6b1 --- /dev/null +++ b/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp @@ -0,0 +1,10 @@ +--- libraries/lib-basic-ui/BasicUI.cpp.orig 2022-09-28 03:57:45 UTC ++++ libraries/lib-basic-ui/BasicUI.cpp +@@ -29,6 +29,7 @@ Paul Licameli + + #include + ++extern char** environ; + namespace + { + diff --git a/audio/audacity/files/patch-src_AboutDialog.cpp b/audio/audacity/files/patch-src_AboutDialog.cpp index db7c2510c6de..0a9529d7fd51 100644 --- a/audio/audacity/files/patch-src_AboutDialog.cpp +++ b/audio/audacity/files/patch-src_AboutDialog.cpp @@ -1,6 +1,6 @@ ---- src/AboutDialog.cpp.orig 2021-09-22 19:37:04 UTC +--- src/AboutDialog.cpp.orig 2022-09-22 16:16:06 UTC +++ src/AboutDialog.cpp -@@ -64,7 +64,7 @@ hold information about one contributor to Audacity. +@@ -59,7 +59,7 @@ hold information about one contributor to Audacity. // RevisionIdent.h may contain #defines like these ones: //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e" //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100" diff --git a/audio/audacity/files/patch-src_CMakeLists.txt b/audio/audacity/files/patch-src_CMakeLists.txt deleted file mode 100644 index fcb46599dfa5..000000000000 --- a/audio/audacity/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CMakeLists.txt.orig 2021-10-28 09:14:30 UTC -+++ src/CMakeLists.txt -@@ -38,7 +38,7 @@ elseif( GIT_FOUND ) - else() - # No Git installed and no version data is available. - # Generate an empty file and let AboutDialog do the rest -- file( TOUCH "${_PRVDIR}/RevisionIdent.h" ) -+ file( WRITE "${_PRVDIR}/RevisionIdent.h" "\n" ) - endif() - - # Handle Audio Units option diff --git a/audio/audacity/files/patch-src_MIDIPlay.cpp b/audio/audacity/files/patch-src_MIDIPlay.cpp index 4c6b68156c20..44399cc73e0c 100644 --- a/audio/audacity/files/patch-src_MIDIPlay.cpp +++ b/audio/audacity/files/patch-src_MIDIPlay.cpp @@ -1,11 +1,11 @@ ---- src/MIDIPlay.cpp.orig 2021-10-31 02:53:52 UTC +--- src/MIDIPlay.cpp.orig 2022-09-27 05:35:02 UTC +++ src/MIDIPlay.cpp @@ -490,7 +490,7 @@ static double SystemTime(bool usingAlsa) if (usingAlsa) { struct timespec now; // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time -- clock_gettime(CLOCK_MONOTONIC_RAW, &now); -+ clock_gettime(CLOCK_REALTIME, &now); - //return now.tv_sec + now.tv_nsec * 0.000000001; - return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime; - } +-#ifdef FreeBSD ++#ifdef __FreeBSD__ + clock_gettime(CLOCK_REALTIME, &now); + #else + clock_gettime(CLOCK_MONOTONIC_RAW, &now); diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist index aeb769083027..0a5313d9aa2f 100644 --- a/audio/audacity/pkg-plist +++ b/audio/audacity/pkg-plist @@ -1,27 +1,34 @@ -audacity bin/audacity lib/audacity/lib-audio-devices.so +lib/audacity/lib-audio-graph.so lib/audacity/lib-basic-ui.so lib/audacity/lib-components.so lib/audacity/lib-exceptions.so lib/audacity/lib-ffmpeg-support.so lib/audacity/lib-files.so +lib/audacity/lib-graphics.so +lib/audacity/lib-ipc.so lib/audacity/lib-math.so +lib/audacity/lib-module-manager.so lib/audacity/lib-preferences.so +lib/audacity/lib-project-history.so lib/audacity/lib-project-rate.so lib/audacity/lib-project.so lib/audacity/lib-registries.so +lib/audacity/lib-sample-track.so lib/audacity/lib-screen-geometry.so lib/audacity/lib-string-utils.so lib/audacity/lib-strings.so +lib/audacity/lib-theme-resources.so lib/audacity/lib-theme.so +lib/audacity/lib-track.so +lib/audacity/lib-transactions.so lib/audacity/lib-utility.so lib/audacity/lib-uuid.so lib/audacity/lib-xml.so lib/audacity/modules/mod-script-pipe.so -share/man/man1/audacity.1.gz share/applications/audacity.desktop -%%DATADIR%%/EQDefaultCurves.xml +%%DATADIR%%/EffectsMenuDefaults.xml %%DATADIR%%/nyquist/aud-do-support.lsp %%DATADIR%%/nyquist/dspprims.lsp %%DATADIR%%/nyquist/envelopes.lsp @@ -159,6 +166,7 @@ share/icons/hicolor/scalable/apps/audacity.svg %%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo +share/man/man1/audacity.1.gz share/metainfo/audacity.appdata.xml share/mime/packages/audacity.xml share/pixmaps/audacity.xpm