diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2015-06-03 10:50:36 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-06-20 11:55:27 +0700 |
| commit | 9b26285f8e2bd162233f4e01fb6c042f541c649b (patch) | |
| tree | 1e2724d1506ec8849d29b6ad82febde618026a42 | |
| parent | c0395600415ebc17fb557b2e1722a7b8e128e730 (diff) | |
audio/audacity: Fix building against ffmpeg-2.6.x.
Thanks to John Vogel for pointing at the patch
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | audio/audacity/audacity-ffmpeg.patch | 30 | ||||
| -rw-r--r-- | audio/audacity/audacity.SlackBuild | 5 |
2 files changed, 34 insertions, 1 deletions
diff --git a/audio/audacity/audacity-ffmpeg.patch b/audio/audacity/audacity-ffmpeg.patch new file mode 100644 index 000000000000..d0b9935d3e15 --- /dev/null +++ b/audio/audacity/audacity-ffmpeg.patch @@ -0,0 +1,30 @@ +diff -Naur audacity-src-2.0.6-orig/src/FFmpeg.h audacity-src-2.0.6/src/FFmpeg.h +--- audacity-src-2.0.6-orig/src/FFmpeg.h 2014-09-28 21:54:55.159636208 -0400 ++++ audacity-src-2.0.6/src/FFmpeg.h 2014-09-28 21:55:11.246276766 -0400 +@@ -688,7 +688,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + AVOutputFormat*, + av_oformat_next, +- (AVOutputFormat *f), ++ (const AVOutputFormat *f), + (f) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -755,7 +755,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + int, + av_fifo_size, +- (AVFifoBuffer *f), ++ (const AVFifoBuffer *f), + (f) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -801,7 +801,7 @@ + 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/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild index 4a8384744cf5..3ac335fd25ae 100644 --- a/audio/audacity/audacity.SlackBuild +++ b/audio/audacity/audacity.SlackBuild @@ -31,7 +31,7 @@ PRGNAM=audacity VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -87,6 +87,9 @@ find -L . \ sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \ lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp || true +# fix building against ffmpeg-2.6.x, patch from archlinux +patch -p1 < $CWD/audacity-ffmpeg.patch + # libsoxr is the new default resampling library CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |