Attachment 236892 Details for Bug 266668 – Patch to upgrade audacity to 3.2.0 from 3.1.3

[patch] Patch to upgrade audacity to 3.2.0 from 3.1.3

audacity.txt (text/plain), 7.99 KB, created by Jack on 2022-09-28 04:14:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2022-09-28 04:14:53 UTC

Size: 7.99 KB

patch

obsolete

>diff -urN audacity/Makefile audacity-new/Makefile
>--- audacity/Makefile	2022-09-27 21:05:08.846360000 -0700
>+++ audacity-new/Makefile	2022-09-27 21:05:39.060026000 -0700
>@@ -1,7 +1,6 @@
> PORTNAME=	audacity
> DISTVERSIONPREFIX=	Audacity-
>-DISTVERSION=	3.1.3
>-PORTREVISION=	2
>+DISTVERSION=	3.2.0
> CATEGORIES=	audio
> 
> MAINTAINER=	xxjack12xx@gmail.com
>@@ -46,8 +45,9 @@
> 		-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 -urN audacity/distinfo audacity-new/distinfo
>--- audacity/distinfo	2022-09-27 21:05:08.846384000 -0700
>+++ audacity-new/distinfo	2022-09-27 20:45:25.899638000 -0700
>@@ -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 -urN audacity/files/patch-cmake-proxies_CMakeLists.txt audacity-new/files/patch-cmake-proxies_CMakeLists.txt
>--- audacity/files/patch-cmake-proxies_CMakeLists.txt	2022-09-27 21:05:08.846429000 -0700
>+++ audacity-new/files/patch-cmake-proxies_CMakeLists.txt	2022-09-27 20:45:25.899681000 -0700
>@@ -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 -urN audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h audacity-new/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
>--- audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	2022-09-27 21:05:08.846468000 -0700
>+++ audacity-new/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	2022-09-27 20:45:25.899721000 -0700
>@@ -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 -urN audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp audacity-new/files/patch-libraries_lib-basic-ui_BasicUI.cpp
>--- audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-libraries_lib-basic-ui_BasicUI.cpp	2022-09-27 20:58:04.524757000 -0700
>@@ -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 <string>
>+ 
>++extern char** environ;
>+ namespace
>+ {
>+ 
>diff -urN audacity/files/patch-src_AboutDialog.cpp audacity-new/files/patch-src_AboutDialog.cpp
>--- audacity/files/patch-src_AboutDialog.cpp	2022-09-27 21:05:08.846478000 -0700
>+++ audacity-new/files/patch-src_AboutDialog.cpp	2022-09-27 20:45:25.899756000 -0700
>@@ -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 -urN audacity/files/patch-src_CMakeLists.txt audacity-new/files/patch-src_CMakeLists.txt
>--- audacity/files/patch-src_CMakeLists.txt	2022-09-27 21:05:08.846488000 -0700
>+++ audacity-new/files/patch-src_CMakeLists.txt	2022-09-27 20:45:25.899782000 -0700
>@@ -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 -urN audacity/files/patch-src_MIDIPlay.cpp audacity-new/files/patch-src_MIDIPlay.cpp
>--- audacity/files/patch-src_MIDIPlay.cpp	2022-09-27 21:05:08.846498000 -0700
>+++ audacity-new/files/patch-src_MIDIPlay.cpp	2022-09-27 20:45:25.899819000 -0700
>@@ -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 -urN audacity/pkg-plist audacity-new/pkg-plist
>--- audacity/pkg-plist	2022-09-27 21:05:08.846529000 -0700
>+++ audacity-new/pkg-plist	2022-09-27 20:45:25.899899000 -0700
>@@ -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
>@@ -96,6 +103,7 @@
> %%DATADIR%%/plug-ins/tremolo.ny
> %%DATADIR%%/plug-ins/vocalrediso.ny
> %%DATADIR%%/plug-ins/vocoder.ny
>+%%PORTDOCS%%%%DOCSDIR%%/README.txt
> share/icons/hicolor/16x16/audacity.png
> share/icons/hicolor/22x22/audacity.png
> share/icons/hicolor/24x24/audacity.png
>@@ -159,6 +167,7 @@
> %%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

Flags:

xxjack12xx: maintainer-approval+

Actions: View | Diff

Attachments on bug 266668: 236892 | 236959 | 236977