Attachment 197654 Details for Bug 231837 – Patch to update audacity with uses moved to options

[patch] Patch to update audacity with uses moved to options

audacity.txt (text/plain), 7.69 KB, created by Jack on 2018-10-01 04:57:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2018-10-01 04:57:44 UTC

Size: 7.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 480996)
>+++ Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	audacity
>-PORTVERSION=	2.2.2
>+PORTVERSION=	2.3.0
> DISTVERSIONPREFIX=	Audacity-
>-PORTREVISION=	3
> CATEGORIES=	audio
> 
> MAINTAINER=	xxjack12xx@gmail.com
>@@ -40,7 +39,7 @@
> USE_GITHUB=	yes
> 
> OPTIONS_DEFINE=	NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
>-		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
>+		MAD MOD_SCRIPT_PIPE MOD_NYQ_BENCH SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
> OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD \
> 			SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
> 
>@@ -53,6 +52,8 @@
> LAME_DESC=	Use lame for import and export support
> LV2_DESC=	Add LV2 plug-in support
> MAD_DESC=	Use libmad for mp2/3 decoding support
>+MOD_SCRIPT_PIPE_DESC=	mod-script-pipe scripting support
>+MOD_NYQ_BENCH_DESC=	Enable Nyquist Workbench
> SBSMS_DESC=	Use libsbsms for pitch and tempo changing
> SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
> TAGLIB_DESC=	Use TagLib for metadata support
>@@ -101,9 +102,6 @@
> LADSPA_CONFIGURE_ENABLE=	ladspa
> LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa
> 
>-MAD_CONFIGURE_WITH=	libmad=system
>-MAD_LIB_DEPENDS=	libmad.so:audio/libmad
>-
> LAME_CONFIGURE_ON=	--with-lame=system
> LAME_CONFIGURE_OFF=	--with-lame	# --without-lame is broken
> LAME_CPPFLAGS=		-I${LOCALBASE}/include
>@@ -114,6 +112,14 @@
> LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
> 			libsuil-0.so:audio/suil
> 
>+MAD_CONFIGURE_WITH=	libmad=system
>+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
>+
>+MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe
>+MOD_SCRIPT_PIPE_USES=	python:3.6+
>+MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
>+MOD_NYQ_BENCH_USES=	python:3.6+
>+
> SBSMS_CONFIGURE_WITH=	sbsms
> 
> SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
>Index: distinfo
>===================================================================
>--- distinfo	(revision 480996)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519297034
>-SHA256 (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3
>-SIZE (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 25947462
>+TIMESTAMP = 1538360236
>+SHA256 (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 37127f68dceeb5da08d008ec9373a65e2d5d0a9b937c808a5d7c3b88aa9e275e
>+SIZE (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 27479664
>Index: files/patch-include_audacity_Types.h
>===================================================================
>--- files/patch-include_audacity_Types.h	(revision 480996)
>+++ files/patch-include_audacity_Types.h	(working copy)
>@@ -1,6 +1,6 @@
> --- include/audacity/Types.h.orig       2017-03-13 21:02:21 UTC
> +++ include/audacity/Types.h
>-@@ -72,7 +72,7 @@
>+@@ -73,7 +73,7 @@
>     sampleCount ( long v ) : value { v } {}
>  
>     // unsigned long is 64 bit on some platforms.  Let it narrow.
>Index: files/patch-lib-src_FileDialog_Makefile.am
>===================================================================
>--- files/patch-lib-src_FileDialog_Makefile.am	(revision 480996)
>+++ files/patch-lib-src_FileDialog_Makefile.am	(working copy)
>@@ -7,8 +7,8 @@
> +DIST_SUBDIRS=	gtk mac win
>  lib_LTLIBRARIES = libFileDialog.la
>  
>- libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
>-@@ -7,22 +9,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
>+ libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
>+@@ -8,22 +10,32 @@
>  libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
>  
>  if GTK
>Index: files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
>===================================================================
>--- files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	(revision 480996)
>+++ files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	(working copy)
>@@ -1,6 +1,6 @@
> --- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2016-07-26 13:34:06 UTC
> +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
>-@@ -153,6 +153,15 @@ extern long ptrtoabs();
>+@@ -160,6 +160,15 @@ extern long ptrtoabs();
>  #endif
>  #endif
>  
>Index: files/patch-src_AudioIO.cpp
>===================================================================
>--- files/patch-src_AudioIO.cpp	(revision 480996)
>+++ files/patch-src_AudioIO.cpp	(working copy)
>@@ -1,6 +1,6 @@
> --- 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
>+@@ -467,7 +467,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"
>@@ -8,7 +8,7 @@
>     #include "NoteTrack.h"
>  #endif
>  
>-@@ -979,13 +978,22 @@ struct AudioIO::ScrubQueue (private)
>+@@ -787,13 +787,22 @@ struct AudioIO::ScrubQueue (private)
>  // return the system time as a double
>  static double streamStartTime = 0; // bias system time to small number
>  
>Index: files/patch-src_FFmpeg.h
>===================================================================
>--- files/patch-src_FFmpeg.h	(revision 480996)
>+++ files/patch-src_FFmpeg.h	(working copy)
>@@ -1,6 +1,6 @@
> --- src/FFmpeg.h.orig	2016-07-26 13:34:06 UTC
> +++ src/FFmpeg.h
>-@@ -689,7 +689,7 @@ extern "C" {
>+@@ -705,7 +705,7 @@
>     FFMPEG_FUNCTION_WITH_RETURN(
>        AVOutputFormat*,
>        av_oformat_next,
>@@ -8,9 +8,9 @@
> +      (const AVOutputFormat *f),
>        (f)
>     );
>+ #endif
>+@@ -786,7 +786,7 @@
>     FFMPEG_FUNCTION_WITH_RETURN(
>-@@ -756,7 +756,7 @@ extern "C" {
>-    FFMPEG_FUNCTION_WITH_RETURN(
>        int,
>        av_fifo_size,
> -      (AVFifoBuffer *f),
>@@ -17,9 +17,9 @@
> +      (const AVFifoBuffer *f),
>        (f)
>     );
>+ #endif
>+@@ -848,7 +848,7 @@
>     FFMPEG_FUNCTION_WITH_RETURN(
>-@@ -802,7 +802,7 @@ extern "C" {
>-    FFMPEG_FUNCTION_WITH_RETURN(
>        AVDictionaryEntry *,
>        av_dict_get,
> -      (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
>@@ -26,4 +26,4 @@
> +      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
>        (m, key, prev, flags)
>     );
>-    FFMPEG_FUNCTION_WITH_RETURN(
>+ #endif
>Index: files/patch-src_Makefile.am
>===================================================================
>--- files/patch-src_Makefile.am	(revision 480996)
>+++ files/patch-src_Makefile.am	(working copy)
>@@ -1,6 +1,6 @@
> --- src/Makefile.am.orig	2016-07-26 13:34:06 UTC
> +++ src/Makefile.am
>-@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \
>+@@ -79,8 +79,7 @@ audacity_CPPFLAGS = \
>  #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
>  #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
>  #           ^
>Index: files/patch-src_MemoryX.h
>===================================================================
>--- files/patch-src_MemoryX.h	(revision 480996)
>+++ files/patch-src_MemoryX.h	(working copy)
>@@ -1,5 +1,5 @@
>---- src/MemoryX.h.orig	2018-02-22 14:12:04.240599000 -0800
>-+++ src/MemoryX.h	2018-02-22 14:01:53.685861000 -0800
>+--- src/MemoryX.h.orig	2018-09-30 19:45:06.332028000 -0700
>++++ src/MemoryX.h	2018-09-30 19:45:59.977440000 -0700
> @@ -1,6 +1,7 @@
>  #ifndef __AUDACITY_MEMORY_X_H__
>  #define __AUDACITY_MEMORY_X_H__
>@@ -7,13 +7,13 @@
> +#include <stdlib.h>
>  // C++ standard header <memory> with a few extensions
>  #include <memory>
>- #ifndef safenew
>-@@ -1171,7 +1172,7 @@
>-    namespace tr1
>-    {
>- #endif
>--      template<typename T> struct hash;
>-+      //template<typename T> struct hash;
>-       template<> struct hash< wxString > {
>-          size_t operator () (const wxString &str) const // noexcept
>-          {
>+ #include <cstdlib> // Needed for free.
>+@@ -706,7 +707,7 @@
>+ // For using std::unordered_map on wxString
>+ namespace std
>+ {
>+-   template<typename T> struct hash;
>++   //template<typename T> struct hash;
>+    template<> struct hash< wxString > {
>+       size_t operator () (const wxString &str) const // noexcept
>+       {

Actions: View | Diff

Attachments on bug 231837: 197652 | 197653 | 197654