Attachment 181177 Details for Bug 218104 – Patch to upgrade audacity from 2.1.2 to 2.1.3 with extra patches deleted

[patch] Patch to upgrade audacity from 2.1.2 to 2.1.3 with extra patches deleted

audacity.txt (text/plain), 5.82 KB, created by Jack on 2017-03-25 03:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2017-03-25 03:37:52 UTC

Size: 5.82 KB

patch

obsolete

>diff -urN audacity/Makefile audacity-new/Makefile
>--- audacity/Makefile	2017-03-24 20:34:54.403237000 -0700
>+++ audacity-new/Makefile	2017-03-24 20:03:48.230107000 -0700
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/audio/audacity/Makefile 428352 2016-12-11 15:22:47Z jbeich $
> 
> PORTNAME=	audacity
>-PORTVERSION=	2.1.2
>-PORTREVISION=	4
>+PORTVERSION=	2.1.3
> CATEGORIES=	audio
> MASTER_SITES=	https://github.com/audacity/audacity/archive/
> DISTNAME=	Audacity-${PORTVERSION}
>@@ -25,11 +24,12 @@
> WRKSRC=		${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
>+USES=		autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
> NLS_USES=	gettext-runtime
> NLS_CONFIGURE_ENABLE=	nls
> NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
> OPTIONS_SUB=	yes
>+USE_GCC=	4.9+
> USE_WX=		3.0+
> WX_COMPS=	wx
> INSTALLS_ICONS=	yes
>@@ -137,10 +137,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${CHOSEN_COMPILER_TYPE} == gcc
>-CXXFLAGS+=	-std=c++11
>-.endif
>-
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> 
>diff -urN audacity/distinfo audacity-new/distinfo
>--- audacity/distinfo	2017-03-24 20:34:54.403745000 -0700
>+++ audacity-new/distinfo	2017-03-24 19:26:22.031319000 -0700
>@@ -1,2 +1,3 @@
>-SHA256 (Audacity-2.1.2.tar.gz) = 90007b50cdc3885607b1afef2f158777a61c1658e869a88ec4d98c59c133f9bd
>-SIZE (Audacity-2.1.2.tar.gz) = 24718129
>+TIMESTAMP = 1490408781
>+SHA256 (Audacity-2.1.3.tar.gz) = cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
>+SIZE (Audacity-2.1.3.tar.gz) = 24106855
>diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h audacity-new/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h
>--- audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h	2017-03-24 20:35:26.400986000 -0700
>+++ audacity-new/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig	2016-07-26 13:34:06 UTC
>-+++ lib-src/libnyquist/nyquist/nyqsrc/sound.h
>-@@ -459,7 +459,7 @@ double step_to_hz(double);
>- 
>- #ifdef WIN32
>- double log2(double x);
>--#endif WIN32
>-+#endif /*WIN32*/
>- 
>- /* macros for access to samples within a suspension */
>- /* NOTE: assume suspension structure is named "susp" */
>diff -urN audacity/files/patch-src_effects_VST_VSTEffect.cpp audacity-new/files/patch-src_effects_VST_VSTEffect.cpp
>--- audacity/files/patch-src_effects_VST_VSTEffect.cpp	2017-03-24 20:35:42.694246000 -0700
>+++ audacity-new/files/patch-src_effects_VST_VSTEffect.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/effects/VST/VSTEffect.cpp.orig	2016-07-26 13:34:06 UTC
>-+++ src/effects/VST/VSTEffect.cpp
>-@@ -2129,7 +2129,7 @@ bool VSTEffect::Load()
>-    // symbols.
>-    //
>-    // Once we define a proper external API, the flags can be removed.
>--   void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
>-+   void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL);
>-    if (!lib) 
>-    {
>-       return false;
>diff -urN audacity/files/patch-src_effects_vamp_LoadVamp.cpp audacity-new/files/patch-src_effects_vamp_LoadVamp.cpp
>--- audacity/files/patch-src_effects_vamp_LoadVamp.cpp	2017-03-24 20:35:38.493843000 -0700
>+++ audacity-new/files/patch-src_effects_vamp_LoadVamp.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/effects/vamp/LoadVamp.cpp.orig	2016-07-26 13:34:06 UTC
>-+++ src/effects/vamp/LoadVamp.cpp
>-@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
>-    Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
>-    if (!vp)
>-    {
>--      return false;
>-+      return NULL;
>-    }
>- 
>-    // We limit the listed plugin outputs to those whose results can
>diff -urN audacity/files/patch-src_import_ImportFLAC.cpp audacity-new/files/patch-src_import_ImportFLAC.cpp
>--- audacity/files/patch-src_import_ImportFLAC.cpp	2017-03-24 20:35:31.326261000 -0700
>+++ audacity-new/files/patch-src_import_ImportFLAC.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,20 +0,0 @@
>---- src/import/ImportFLAC.cpp.orig	2016-07-26 13:34:06 UTC
>-+++ src/import/ImportFLAC.cpp
>-@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
>-    int cnt;
>-    wxFile binaryFile;
>-    if (!binaryFile.Open(filename)) {
>--      return false; // File not found
>-+      return NULL; // File not found
>-    }
>- 
>- #ifdef USE_LIBID3TAG
>-@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
>- 
>-    if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
>-       // File is not a FLAC file
>--      return false;
>-+      return NULL;
>-    }
>- 
>-    // Open the file for import
>diff -urN audacity/pkg-plist audacity-new/pkg-plist
>--- audacity/pkg-plist	2017-03-24 20:34:54.430238000 -0700
>+++ audacity-new/pkg-plist	2017-03-24 20:01:16.388333000 -0700
>@@ -62,7 +62,6 @@
> %%DATADIR%%/plug-ins/StudioFadeOut.ny
> %%DATADIR%%/plug-ins/adjustable-fade.ny
> %%DATADIR%%/plug-ins/beat.ny
>-%%DATADIR%%/plug-ins/clicktrack.ny
> %%DATADIR%%/plug-ins/clipfix.ny
> %%DATADIR%%/plug-ins/crossfadeclips.ny
> %%DATADIR%%/plug-ins/crossfadetracks.ny
>@@ -73,13 +72,16 @@
> %%DATADIR%%/plug-ins/lowpass.ny
> %%DATADIR%%/plug-ins/notch.ny
> %%DATADIR%%/plug-ins/pluck.ny
>+%%DATADIR%%/plug-ins/rhythmtrack.ny
> %%DATADIR%%/plug-ins/rissetdrum.ny
> %%DATADIR%%/plug-ins/sample-data-export.ny
>+%%DATADIR%%/plug-ins/sample-data-import.ny
> %%DATADIR%%/plug-ins/tremolo.ny
> %%DATADIR%%/plug-ins/vocalrediso.ny
> %%DATADIR%%/plug-ins/vocalremover.ny
> %%DATADIR%%/plug-ins/vocoder.ny
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.txt
> share/icons/hicolor/16x16/apps/audacity.png
> share/icons/hicolor/22x22/apps/audacity.png
> share/icons/hicolor/24x24/apps/audacity.png

Actions: View | Diff

Attachments on bug 218104: 181176 | 181177 | 183543 | 183551 | 183636 | 183697 | 183724