diff options
author | Ismael Luceno | 2016-11-23 14:23:48 -0200 |
---|---|---|
committer | Ismael Luceno | 2016-11-23 14:23:48 -0200 |
commit | 80a0b3b0d190a11fd3b029078f2c3a7021e798c3 (patch) | |
tree | 1605990e2df41e37d1535aa761548fdf7d81a8c8 | |
parent | 221a4d7b8bf7f428a51787d39574c378334d85da (diff) |
audacity: Build fixes (gcc and ffmpeg)
-rw-r--r-- | audio-creation/audacity/HISTORY | 4 | ||||
-rwxr-xr-x | audio-creation/audacity/PRE_BUILD | 3 | ||||
-rw-r--r-- | audio-creation/audacity/patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch | 40 | ||||
-rw-r--r-- | audio-creation/audacity/patches/fix-gcc6-ftbfs.patch | 38 |
4 files changed, 85 insertions, 0 deletions
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY index 460e349dfc..39b138fda0 100644 --- a/audio-creation/audacity/HISTORY +++ b/audio-creation/audacity/HISTORY @@ -1,3 +1,7 @@ +2016-11-23 Ismael Luceno <ismael@sourcemage.org> + * patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch, + patches/fix-gcc6-ftbfs.patch, PRE_BUILD: Fixed build + 2016-11-18 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: version 2.1.2, switch to my mirror as official download site is hostile to direct linking and breaks download via wget diff --git a/audio-creation/audacity/PRE_BUILD b/audio-creation/audacity/PRE_BUILD new file mode 100755 index 0000000000..c230ad14bf --- /dev/null +++ b/audio-creation/audacity/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && +apply_patch_dir patches diff --git a/audio-creation/audacity/patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch b/audio-creation/audacity/patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch new file mode 100644 index 0000000000..6d36982fd4 --- /dev/null +++ b/audio-creation/audacity/patches/0001-Fix-build-against-ffmpeg-svn-20160315.patch @@ -0,0 +1,40 @@ +From: Ismael Luceno <ismael@sourcemage.org> +Date: Fri, 12 Aug 2016 16:58:36 -0300 +Subject: [PATCH] Fix build against ffmpeg-svn 20160315 + +Signed-off-by: Ismael Luceno <ismael@sourcemage.org> +--- + FFmpeg.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/FFmpeg.h b/src/FFmpeg.h +index aef40ae8b103..78aa62e9fbf5 100644 +--- a/src/FFmpeg.h ++++ b/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( diff --git a/audio-creation/audacity/patches/fix-gcc6-ftbfs.patch b/audio-creation/audacity/patches/fix-gcc6-ftbfs.patch new file mode 100644 index 0000000000..e5e91482f8 --- /dev/null +++ b/audio-creation/audacity/patches/fix-gcc6-ftbfs.patch @@ -0,0 +1,38 @@ +Description: Fix FTBFS with gcc-6 +Author: mliska@suse.cz + +Index: src/effects/vamp/LoadVamp.cpp +=================================================================== +--- a/src/effects/vamp/LoadVamp.cpp.orig ++++ b/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 +=================================================================== +--- a/src/import/ImportFLAC.cpp.orig ++++ b/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 |