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

Accepting request 402891 from home:marxin:branches:multimedia:apps

Browse Source 
Fix GCC6 errors.

OBS-URL: https://build.opensuse.org/request/show/402891
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=91
This commit is contained in:
Alexei Sorokin 2016-06-17 10:05:11 +00:00 committed by Git OBS Bridge
parent 36e91d974d
commit 874346b63b
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
audacity-gcc6.patch Normal file
View File

@ -0,0 +1,63 @@
diff -r -u /tmp/audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp
--- audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp 2015-07-10 19:35:40.000000000 +0200
+++ audacity-minsrc-2.1.1/src/effects/vamp/LoadVamp.cpp 2016-06-17 11:18:54.897140407 +0200
@@ -266,7 +266,7 @@
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
diff -r -u /tmp/audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp
--- audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp 2015-07-10 19:35:40.000000000 +0200
+++ audacity-minsrc-2.1.1/src/import/ImportFLAC.cpp 2016-06-17 11:17:46.555821274 +0200
@@ -296,7 +296,7 @@
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 @@
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 -r -u /tmp/audacity-minsrc-2.1.1/src/WaveTrack.cpp audacity-minsrc-2.1.1/src/WaveTrack.cpp
--- audacity-minsrc-2.1.1/src/WaveTrack.cpp 2015-07-10 19:35:40.000000000 +0200
+++ audacity-minsrc-2.1.1/src/WaveTrack.cpp 2016-06-17 11:17:12.099156221 +0200
@@ -2561,7 +2561,7 @@
const sampleCount len0 = mPTrack->GetBestBlockSize(start0);
wxASSERT(len0 <= mBufferSize);
if (!mPTrack->Get(samplePtr(mBuffers[0].data), floatSample, start0, len0))
- return false;
+ return 0;
mBuffers[0].start = start0;
mBuffers[0].len = len0;
if (!fillSecond &&
@@ -2587,7 +2587,7 @@
const sampleCount len1 = mPTrack->GetBestBlockSize(start1);
wxASSERT(len1 <= mBufferSize);
if (!mPTrack->Get(samplePtr(mBuffers[1].data), floatSample, start1, len1))
- return false;
+ return 0;
mBuffers[1].start = start1;
mBuffers[1].len = len1;
mNValidBuffers = 2;
@@ -2637,7 +2637,7 @@
// Very big request!
// Fall back to direct fetch
if (!mPTrack->Get(buffer, format, start, remaining))
- return false;
+ return 0;
}
return mOverlapBuffer.ptr();

5
audacity.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 17 09:37:05 UTC 2016 - martin.liska@suse.com
- Add audacity-gcc6.patch: Fix GCC6 warnings.
-------------------------------------------------------------------
Sun Apr 24 21:35:43 UTC 2016 - sor.alexei@meowr.ru

3
audacity.spec
View File

@ -41,6 +41,8 @@ Patch2: %{name}-fix-nonsense.patch
Patch3: %{name}-ffmpeg.patch
# PATCH-FIX-UPSTREAM audacity-2.1.1-fix-tempdir.patch boo#976964 -- Fix usage of custom temp directories (commit 2a6d423).
Patch4: %{name}-2.1.1-fix-tempdir.patch
# PATCH-FIX-UPSTREAM audacity-gcc6.patch mliska@suse.cz -- Fix GCC6 warnings.
Patch5: %{name}-gcc6.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cmake
@ -100,6 +102,7 @@ than the physical memory size of your computer.
%patch2 -p1
%patch3
%patch4 -p1
%patch5 -p1
cp -f %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions.
rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/