rpm/audacity
SHA256
1
0
Fork 0
forked from pool/audacity
Code Pull Requests Activity

Accepting request 481027 from home:plater

Browse Source 
Update to 2.1.3

OBS-URL: https://build.opensuse.org/request/show/481027
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=96
This commit is contained in:
Dave Plater 2017-03-18 15:28:01 +00:00 committed by Git OBS Bridge
parent 022d52ce64
commit d22ca099a0
8 changed files with 110 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Audacity-2.1.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
size 24106855

31
audacity-ffmpeg.patch
View File

@ -1,31 +0,0 @@
Index: src/FFmpeg.h
===================================================================
--- src/FFmpeg.h.orig
+++ src/FFmpeg.h
@@ -689,7 +689,7 @@ extern "C" {
FFMPEG_FUNCTION_WITH_RETURN(
AVOutputFormat*,
av_oformat_next,
- (AVOutputFormat *f),
+ (const AVOutputFormat *f),
(f)
);
FFMPEG_FUNCTION_WITH_RETURN(
@@ -756,7 +756,7 @@ extern "C" {
FFMPEG_FUNCTION_WITH_RETURN(
int,
av_fifo_size,
- (AVFifoBuffer *f),
+ (const AVFifoBuffer *f),
(f)
);
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),
+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
(m, key, prev, flags)
);
FFMPEG_FUNCTION_WITH_RETURN(

20
audacity-fix-nonsense.patch
View File

@ -1,24 +1,28 @@
--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
+++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
@@ -603,7 +603,10 @@
Index: lib-src/libnyquist/nyquist/xlisp/xlbfun.c
===================================================================
--- lib-src/libnyquist/nyquist/xlisp/xlbfun.c.orig 2017-03-03 21:27:17.000000000 +0200
+++ lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2017-03-12 10:16:53.207654852 +0200
@@ -603,7 +603,10 @@ LVAL xcleanup(void)
{
xllastarg();
xlcleanup();
- /* compiler might (wrongly) complain there is no return value */
+ /* this point will never be reached because xlcleanup() does a
+ longjmp(). The return is added to avoid false positive
+ longjmp(). The return is added to avoid false positive
+ error messages from static analyzers and compilers */
+ return (NIL);
}
/* xtoplevel - special form 'top-level' */
--- a/src/PluginManager.h
+++ b/src/PluginManager.h
@@ -161,7 +161,6 @@
Index: src/PluginManager.h
===================================================================
--- src/PluginManager.h.orig 2017-03-03 21:27:17.000000000 +0200
+++ src/PluginManager.h 2017-03-12 10:16:53.207654852 +0200
@@ -167,7 +167,6 @@ typedef std::map<PluginID, PluginDescrip
typedef wxArrayString PluginIDList;
-class ProviderMap;
class PluginRegistrationDialog;
class PluginManager : public PluginManagerInterface
class PluginManager final : public PluginManagerInterface

35
audacity-gcc6.patch
View File

@ -1,35 +0,0 @@
Index: src/effects/vamp/LoadVamp.cpp
===================================================================
--- src/effects/vamp/LoadVamp.cpp.orig
+++ 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 0;
}
// We limit the listed plugin outputs to those whose results can
Index: src/import/ImportFLAC.cpp
===================================================================
--- src/import/ImportFLAC.cpp.orig
+++ 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

3
audacity-minsrc-2.1.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44
size 7233500

56
audacity-no_buildstamp.patch
View File

@ -1,27 +1,35 @@
Index: lib-src/portaudio-v19/src/common/pa_front.c
===================================================================
--- lib-src/portaudio-v19/src/common/pa_front.c.orig
+++ lib-src/portaudio-v19/src/common/pa_front.c
@@ -78,7 +78,7 @@
#define PA_VERSION_ 1899
-#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__ " " __TIME__ ")"
+#define PA_VERSION_TEXT_ "PortAudio V19-devel"
Index: src/AboutDialog.cpp
===================================================================
--- src/AboutDialog.cpp.orig
+++ src/AboutDialog.cpp
@@ -520,9 +520,6 @@ void AboutDialog::PopulateInformationPag
informationStr += _("Build Information");
informationStr += wxT("</h3>\n<table>");
--- src/AboutDialog.cpp.orig 2017-03-13 23:02:21.000000000 +0200
+++ src/AboutDialog.cpp 2017-03-18 16:42:02.355788390 +0200
@@ -59,7 +59,7 @@ hold information about one contributor t
#ifdef REV_LONG
#define REV_IDENT wxString( "[[http://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME
#else
-#define REV_IDENT wxT("No revision identifier was provided")
+#define REV_IDENT wxT("Official openSUSE Build")
#endif
- // Current date
- AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
-
// Uncomment the next two lines to test hyperlinks work from here.
// AddBuildinfoRow(&informationStr, wxT("Link Test:"),
// wxT("<a href=\"https:web.audacityteam.org\">Click bait</a>") );
extern wxString FormatHtmlText( const wxString & Text );
@@ -70,7 +70,7 @@ const wxString VerCheckArgs(){
#ifdef REV_LONG
result += wxString("&CommitId=")+wxString(REV_LONG).Left(6);
#endif
- result += wxString("&Time=") + wxString( __DATE__ ) + wxString( __TIME__ );
+ result += wxString("&Time=") + wxString( "17 March 2017" ) + wxString( "23:15" );
result.Replace(" ","");
return result;
}
Index: lib-src/portaudio-v19/qa/loopback/src/paqa.c
===================================================================
--- lib-src/portaudio-v19/qa/loopback/src/paqa.c.orig 2017-03-13 23:02:21.000000000 +0200
+++ lib-src/portaudio-v19/qa/loopback/src/paqa.c 2017-03-18 15:32:00.553429177 +0200
@@ -1460,7 +1460,7 @@ int main( int argc, char **argv )
int justMath = 0;
char *executableName = argv[0];
- printf("PortAudio LoopBack Test built " __DATE__ " at " __TIME__ "\n");
+ printf("PortAudio LoopBack Test built " "17 March 2017" " at " "23:15" "\n");
if( argc > 1 ){
printf("running with arguments:");

29
audacity.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sat Mar 18 13:53:54 UTC 2017 - davejplater@gmail.com
- Update to release 2.1.3
- Recreated audacity-no_buildstamp.patch with 2.1.3 release date
and time.
- Rebased audacity-fix-nonsense.patch
- Deleted audacity-ffmpeg.patch and audacity-gcc6.patch
- Upstream changes:
* Interface:
* Pinned option on waveform so waveform moves and
recording/playing head stays still.
* Timer Record options to save/export/exit after recording.
* Scrub Ruler and optional Scrub Toolbar.
* New shortcuts ALT+RIGHT and ALT+LEFT (move to labels without
editing).
* Effects:
* Effects no longer grayed out when paused.
* New Distortion effect (replaces Leveller).
* SBSMS (higher quality but slower) option on Change
Tempo/Change Pitch effects.
* New Rhythm Track generator (replaces Click Track).
* New Generator for Sample Data Import.
* Nyquist effects now significantly faster.
* Other Changes:
* Upgraded the PortAudio library to v19 rev r1966.
* Bug fixes:
* Over 60 bugs fixed, including five longstanding bugs.
-------------------------------------------------------------------
Mon Jun 27 13:19:29 UTC 2016 - davejplater@gmail.com

49
audacity.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package audacity
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,48 +19,60 @@
%bcond_with mad
%bcond_with lame
%bcond_with twolame
%bcond_without ffmpeg
Name: audacity
Version: 2.1.2
Version: 2.1.3
Release: 0
Summary: A Free, Cross-Platform Digital Audio Editor
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Editors and Convertors
Url: http://audacityteam.org/
Source: %{name}-minsrc-%{version}.tar.xz
Source: https://github.com/audacity/audacity/archive/Audacity-%{version}.tar.gz
#Source: %%{name}-minsrc-%%{version}.tar.xz
Source1: %{name}-license-nyquist
Source2: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch reddwarf@opensuse.org -- Remove the buildstamp.
# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp.
Patch0: %{name}-no_buildstamp.patch
# PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to fix build against libflac 1.3.0+.
Patch1: %{name}-flac_assert.h.patch
# PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason.
Patch2: %{name}-fix-nonsense.patch
# PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf@opensuse.org -- Patch to compile with latest ffmpeg.
Patch3: %{name}-ffmpeg.patch
# PATCH-FIX-UPSTREAM audacity-gcc6.patch mliska@suse.cz -- Fix GCC6 warnings.
Patch5: %{name}-gcc6.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cmake
BuildRequires: desktop-file-utils
#Audacity only builds with gcc >= 4.9
# WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff
%if 0%{?suse_version} < 1330
BuildRequires: cpp5
BuildRequires: gcc5
BuildRequires: gcc5-c++
%else
BuildRequires: gcc-c++
%endif
BuildRequires: hicolor-icon-theme
BuildRequires: wxWidgets-3_0-nostl-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(flac) >= 1.3.1
BuildRequires: pkgconfig(flac++)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0
BuildRequires: pkgconfig(id3tag)
BuildRequires: pkgconfig(jack)
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec) >= 51.53
BuildRequires: pkgconfig(libavformat) >= 52.12
BuildRequires: pkgconfig(libavutil)
%endif
BuildRequires: pkgconfig(lilv-0) >= 0.16
BuildRequires: pkgconfig(lv2)
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(soundtouch)
BuildRequires: pkgconfig(soxr)
BuildRequires: pkgconfig(suil-0) >= 0.8.2
BuildRequires: pkgconfig(vamp-hostsdk)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisenc)
@ -92,12 +104,11 @@ than the physical memory size of your computer.
%lang_package
%prep
%setup -q -n %{name}-minsrc-%{version}
%setup -q -n %{name}-Audacity-%{version}
%patch0
%patch1 -p1
%patch2 -p1
%patch3
%patch5
%patch2 -p0
#%%patch5
cp -f %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions.
rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/
@ -106,17 +117,25 @@ rm -rf lib-src/lame/
%endif
%build
%if 0%{?suse_version} < 1330
export CC=gcc-5
export CPP=cpp-5
export CXX=g++-5
%endif
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
export CXXFLAGS="$CFLAGS -std=gnu++11"
aclocal -I m4
autoconf
%configure \
%ifnarch %ix86 x86_64
--disable-sse \
%endif
%if %{with ffmpeg}
--with-ffmpeg=system \
%endif
--docdir=%{_docdir}/%{name}/
make %{?_smp_mflags}
make %{?_smp_mflags}
%install
%make_install