FreeBSD Bugzilla – Attachment 161868 Details for
Bug 203607
[patch] audio/audacity: Update to 2.1.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated diff with soxr as default
audacity.diff (text/plain), 13.01 KB, created by
Jack
on 2015-10-10 01:59:29 UTC
(
hide
)
Description:
Updated diff with soxr as default
Filename:
MIME Type:
Creator:
Jack
Created:
2015-10-10 01:59:29 UTC
Size:
13.01 KB
patch
obsolete
>diff -urN audacity/Makefile audacity-new/Makefile >--- audacity/Makefile 2015-10-07 01:08:09.272690000 -0700 >+++ audacity-new/Makefile 2015-10-09 18:48:02.069208000 -0700 >@@ -2,11 +2,11 @@ > # $FreeBSD: head/audio/audacity/Makefile 397077 2015-09-16 19:51:26Z bapt $ > > PORTNAME= audacity >-PORTVERSION= 2.1.0 >-PORTREVISION= 5 >+PORTVERSION= 2.1.1 >+PORTREVISION= 0 > CATEGORIES= audio >-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} >-DISTNAME= ${PORTNAME}-minsrc-${PORTVERSION} >+MASTER_SITES= https://github.com/audacity/audacity/archive/ >+DISTNAME= Audacity-${PORTVERSION} > > MAINTAINER= xxjack12xx@gmail.com > COMMENT= GUI editor for digital audio waveforms >@@ -16,23 +16,23 @@ > > LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile > >-WRKSRC= ${WRKDIR}/${PORTNAME}-minsrc-${PORTVERSION} >+BUILD_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ >+ bash:${PORTSDIR}/shells/bash \ >+ autogen:${PORTSDIR}/devel/autogen >+ >+WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION} > > GNU_CONFIGURE= yes >-USES= cpe desktop-file-utils gettext gmake pkgconfig shared-mime-info \ >- tar:xz >+USES= cpe desktop-file-utils gettext gmake pkgconfig shared-mime-info shebangfix zip:infozip > USE_WX= 2.8+ >-WX_UNICODE= yes > WX_COMPS= wx > INSTALLS_ICONS= yes > PORTDOCS= README.txt > >-OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \ >+OPTIONS_DEFINE= DEBUG DOCS FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \ > PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST >-OPTIONS_SINGLE= SAMPLERATED >-OPTIONS_SINGLE_SAMPLERATED= SAMPLERATE #SOXR >-OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \ >- PORTMIXER SBSMS SOUNDTOUCH SAMPLERATE TWOLAME VAMP VORBIS VST >+OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST \ >+ PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST > OPTIONS_DEFINE_amd64= SSE > OPTIONS_DEFINE_i386= SSE > OPTIONS_DEFAULT_amd64= SSE >@@ -43,12 +43,9 @@ > MAD_DESC= Use libmad for mp2/3 decoding support > MIDI_DESC= Use portSMF for Midi support > NYQUIST_DESC= Nyquist plug-in support >-SAMPLERATE_DESC= Use libsamplerate for sample rate conversion >-SAMPLERATED_DESC= Default sample rate conversion support > PORTMIXER_DESC= Compile with PortMixer support > SBSMS_DESC= Use libsbsms for pitch and tempo changing > SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing >-#SOXR_DESC= Use libsoxr for sample rate conversion > TAGLIB_DESC= Use TagLib for metadata support > TWOLAME_DESC= Use libtwolame for MP2 export support > VAMP_DESC= Vamp plug-in support >@@ -56,17 +53,12 @@ > > CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" > >-CONFIGURE_ARGS+= --with-lib-preference="local system" \ >+CONFIGURE_ARGS+= --with-lib-preference="local system" --without-lv2 --without-ffmpeg \ > --enable-portaudio --enable-unicode > >-DEBUG_CONFIGURE_WITH= debug >+CONFIGURE_SHELL?=${LOCALBASE}/bin/bash > >-FFMPEG_CONFIGURE_WITH= ffmpeg >-FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg >-FFMPEG_LIB_DEPENDS= libavformat.so:${PORTSDIR}/multimedia/ffmpeg >-FFMPEG_CFLAGS= -I${LOCALBASE}/include/ffmpeg >-FFMPEG_CPPFLAGS= -I${LOCALBASE}/include/ffmpeg >-FFMPEG_CXXFLAGS= -I${LOCALBASE}/include/ffmpeg >+DEBUG_CONFIGURE_WITH= debug > > FLAC_CONFIGURE_WITH= libflac > FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac >@@ -91,16 +83,13 @@ > > PORTMIXER_CONFIGURE_WITH= portmixer > >-SAMPLERATE_CONFIGURE_WITH= libsamplerate >-SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate >- > SBSMS_CONFIGURE_WITH= sbsms > > SOUNDTOUCH_CONFIGURE_WITH= soundtouch > SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch > >-#SOXR_CONFIGURE_WITH= libsoxr >-#SOXR_BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake >+SOXR_CONFIGURE_WITH= libsoxr >+SOXR_BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake > > SSE_CONFIGURE_ENABLE= sse > >diff -urN audacity/distinfo audacity-new/distinfo >--- audacity/distinfo 2015-10-07 01:08:09.273136000 -0700 >+++ audacity-new/distinfo 2015-10-06 03:03:51.960859000 -0700 >@@ -1,2 +1,2 @@ >-SHA256 (audacity-minsrc-2.1.0.tar.xz) = b0d98d89b38be233e88af81e1add649732484b6f8feec95dc5977accdde042b3 >-SIZE (audacity-minsrc-2.1.0.tar.xz) = 5104924 >+SHA256 (Audacity-2.1.1.zip) = 1ec4c3b92e3653a83b30b37f67d1778050eb87bd651266865a1e30fe1f402892 >+SIZE (Audacity-2.1.1.zip) = 28838970 >diff -urN audacity/files/patch-lib-src__libmad__configure audacity-new/files/patch-lib-src__libmad__configure >--- audacity/files/patch-lib-src__libmad__configure 1969-12-31 16:00:00.000000000 -0800 >+++ audacity-new/files/patch-lib-src__libmad__configure 2015-10-06 03:03:51.961074000 -0700 >@@ -0,0 +1,20 @@ >+--- ./lib-src/libmad/configure.orig 2015-10-06 02:16:15.066866000 -0700 >++++ ./lib-src/libmad/configure 2015-10-06 02:18:15.918107000 -0700 >+@@ -11983,17 +11983,12 @@ >+ : #x optimize="$optimize -fforce-addr" >+ : #x optimize="$optimize -finline-functions" >+ : #- optimize="$optimize -fstrength-reduce" >+- optimize="$optimize -fthread-jumps" >+- optimize="$optimize -fcse-follow-jumps" >+- optimize="$optimize -fcse-skip-blocks" >+ : #x optimize="$optimize -frerun-cse-after-loop" >+ : #x optimize="$optimize -frerun-loop-opt" >+ : #x optimize="$optimize -fgcse" >+ optimize="$optimize -fexpensive-optimizations" >+- optimize="$optimize -fregmove" >+ : #* optimize="$optimize -fdelayed-branch" >+ : #x optimize="$optimize -fschedule-insns" >+- optimize="$optimize -fschedule-insns2" >+ : #? optimize="$optimize -ffunction-sections" >+ : #? optimize="$optimize -fcaller-saves" >+ : #> optimize="$optimize -funroll-loops" >diff -urN audacity/files/patch-lib-src__libsoxr__configure audacity-new/files/patch-lib-src__libsoxr__configure >--- audacity/files/patch-lib-src__libsoxr__configure 1969-12-31 16:00:00.000000000 -0800 >+++ audacity-new/files/patch-lib-src__libsoxr__configure 2015-10-06 03:03:51.961260000 -0700 >@@ -0,0 +1,9 @@ >+--- ./lib-src/libsoxr/configure.orig 2011-05-04 17:18:48.000000000 +0200 >++++ ./lib-src/libsoxr/configure 2011-05-04 17:19:13.000000000 +0200 >+@@ -12,6 +12,5 @@ >+ >+ srcdir="$@" >+ srcdir="${srcdir#*--srcdir=}" >+-srcdir="./${srcdir/ */}" >+ >+ cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF "${srcdir}" >diff -urN audacity/files/patch-lib-src__lv2__Makefile audacity-new/files/patch-lib-src__lv2__Makefile >--- audacity/files/patch-lib-src__lv2__Makefile 1969-12-31 16:00:00.000000000 -0800 >+++ audacity-new/files/patch-lib-src__lv2__Makefile 2015-10-06 03:03:51.961439000 -0700 >@@ -0,0 +1,10 @@ >+--- ./lib-src/lv2/Makefile.orig 2015-10-06 01:01:13.907852000 -0700 >++++ ./lib-src/lv2/Makefile 2015-10-06 01:01:25.214853000 -0700 >+@@ -1,7 +1,6 @@ >+ include srcdir.mk >+ >+ all: >+- ./build --srcdir=$(srcdir) >+ >+ check: >+ >diff -urN audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am audacity-new/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am >--- audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am 1969-12-31 16:00:00.000000000 -0800 >+++ audacity-new/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am 2015-10-06 19:48:35.579351000 -0700 >@@ -0,0 +1,11 @@ >+--- ./lib-src/soundtouch/source/SoundTouch/Makefile.am.orig 2015-10-06 02:52:33.727584000 -0700 >++++ ./lib-src/soundtouch/source/SoundTouch/Makefile.am 2015-10-06 02:52:46.928526000 -0700 >+@@ -32,7 +32,7 @@ >+ >+ >+ # Compiler flags >+-AM_CXXFLAGS=-O3 -fcheck-new -I../../include >++AM_CXXFLAGS=-O3 -I../../include >+ >+ # Compile the files that need MMX and SSE individually. >+ libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la >diff -urN audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in audacity-new/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in >--- audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in 1969-12-31 16:00:00.000000000 -0800 >+++ audacity-new/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in 2015-10-06 19:48:43.002882000 -0700 >@@ -0,0 +1,11 @@ >+--- ./lib-src/soundtouch/source/SoundTouch/Makefile.in.orig 2015-07-11 03:02:22.000000000 -0700 >++++ ./lib-src/soundtouch/source/SoundTouch/Makefile.in 2015-10-06 02:32:04.051849000 -0700 >+@@ -346,7 +346,7 @@ >+ libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86.cpp BPMDetect.cpp PeakFinder.cpp >+ >+ # Compiler flags >+-AM_CXXFLAGS = -O3 -fcheck-new -I../../include >++AM_CXXFLAGS = -O3 -I../../include >+ >+ # Compile the files that need MMX and SSE individually. >+ libSoundTouch_la_LIBADD = libSoundTouchMMX.la libSoundTouchSSE.la >diff -urN audacity/files/patch-src_FFmpeg.h audacity-new/files/patch-src_FFmpeg.h >--- audacity/files/patch-src_FFmpeg.h 2015-10-07 01:08:09.275316000 -0700 >+++ audacity-new/files/patch-src_FFmpeg.h 2015-10-06 03:03:51.961833000 -0700 >@@ -1,6 +1,6 @@ > --- src/FFmpeg.h.orig 2015-03-02 01:06:57 UTC > +++ src/FFmpeg.h >-@@ -688,7 +688,7 @@ extern "C" { >+@@ -689,7 +689,7 @@ extern "C" { > FFMPEG_FUNCTION_WITH_RETURN( > AVOutputFormat*, > av_oformat_next, >@@ -9,7 +9,7 @@ > (f) > ); > FFMPEG_FUNCTION_WITH_RETURN( >-@@ -755,7 +755,7 @@ extern "C" { >+@@ -756,7 +756,7 @@ extern "C" { > FFMPEG_FUNCTION_WITH_RETURN( > int, > av_fifo_size, >@@ -18,7 +18,7 @@ > (f) > ); > FFMPEG_FUNCTION_WITH_RETURN( >-@@ -801,7 +801,7 @@ extern "C" { >+@@ -802,7 +802,7 @@ extern "C" { > FFMPEG_FUNCTION_WITH_RETURN( > AVDictionaryEntry *, > av_dict_get, >diff -urN audacity/files/patch-src__Makefile.in audacity-new/files/patch-src__Makefile.in >--- audacity/files/patch-src__Makefile.in 2015-10-07 01:08:09.276902000 -0700 >+++ audacity-new/files/patch-src__Makefile.in 2015-10-06 03:03:51.961972000 -0700 >@@ -1,6 +1,6 @@ > --- src/Makefile.in.orig 2014-09-22 20:38:13 UTC > +++ src/Makefile.in >-@@ -1055,8 +1055,7 @@ >+@@ -1118,8 +1118,7 @@ > # /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") ); > # ^ >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 2015-10-07 01:08:09.279450000 -0700 >+++ audacity-new/files/patch-src_effects_VST_VSTEffect.cpp 2015-10-06 03:03:51.962113000 -0700 >@@ -1,6 +1,6 @@ > --- src/effects/VST/VSTEffect.cpp 2015-03-31 23:03:30.000000000 -0700 > +++ src/effects/VST/VSTEffect.cpp 2015-03-01 17:06:58.000000000 -0800 >-@@ -2609,7 +2609,7 @@ >+@@ -2576,7 +2576,7 @@ > // symbols. > // > // Once we define a proper external API, the flags can be removed. >diff -urN audacity/files/patch-xlisp.h audacity-new/files/patch-xlisp.h >--- audacity/files/patch-xlisp.h 2015-10-07 01:08:09.276459000 -0700 >+++ audacity-new/files/patch-xlisp.h 2015-10-06 03:03:51.962247000 -0700 >@@ -1,6 +1,6 @@ > --- lib-src/libnyquist/nyquist/xlisp/xlisp.h 2009-07-15 20:27:36.000000000 -0700 > +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h 2009-07-19 00:24:11.000000000 -0700 >-@@ -152,6 +152,15 @@ >+@@ -153,6 +153,15 @@ > #endif > #endif > >diff -urN audacity/pkg-plist audacity-new/pkg-plist >--- audacity/pkg-plist 2015-10-07 01:08:09.271989000 -0700 >+++ audacity-new/pkg-plist 2015-10-06 19:45:39.903961000 -0700 >@@ -11,7 +11,6 @@ > %%DATADIR%%/include/audacity/ModuleInterface.h > %%DATADIR%%/include/audacity/PluginInterface.h > %%DATADIR%%/include/audacity/Types.h >-%%DATADIR%%/nyquist/bug.lsp > %%DATADIR%%/nyquist/dspprims.lsp > %%DATADIR%%/nyquist/envelopes.lsp > %%DATADIR%%/nyquist/equalizer.lsp >@@ -49,28 +48,38 @@ > %%DATADIR%%/nyquist/sndfnint.lsp > %%DATADIR%%/nyquist/stk.lsp > %%DATADIR%%/nyquist/system.lsp >+%%DATADIR%%/nyquist/test.lsp >+%%DATADIR%%/nyquist/upic.sal >+%%DATADIR%%/nyquist/velocity.lsp > %%DATADIR%%/nyquist/xlinit.lsp > %%DATADIR%%/nyquist/xm.lsp > %%DATADIR%%/plug-ins/SilenceMarker.ny > %%DATADIR%%/plug-ins/SoundFinder.ny >+%%DATADIR%%/plug-ins/SpectralEditMulti.ny >+%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny >+%%DATADIR%%/plug-ins/SpectralEditShelves.ny > %%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 > %%DATADIR%%/plug-ins/delay.ny > %%DATADIR%%/plug-ins/equalabel.ny > %%DATADIR%%/plug-ins/highpass.ny >+%%DATADIR%%/plug-ins/limiter.ny > %%DATADIR%%/plug-ins/lowpass.ny > %%DATADIR%%/plug-ins/notch.ny > %%DATADIR%%/plug-ins/pluck.ny > %%DATADIR%%/plug-ins/rissetdrum.ny > %%DATADIR%%/plug-ins/sample-data-export.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 >@@ -84,7 +93,7 @@ > share/locale/bn/LC_MESSAGES/audacity.mo > share/locale/bs/LC_MESSAGES/audacity.mo > share/locale/ca/LC_MESSAGES/audacity.mo >-share/locale/ca@valencia/LC_MESSAGES/audacity.mo >+share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo > share/locale/cs/LC_MESSAGES/audacity.mo > share/locale/cy/LC_MESSAGES/audacity.mo > share/locale/da/LC_MESSAGES/audacity.mo
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 203607
:
161788
|
161868
|
162719
|
162720
|
162725
|
162727
|
162791
|
162802
|
162803
|
162804
|
162825
|
163070
|
163072
|
163078
|
163209
|
163409
|
163410