hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Matteo Bernardini 2015-06-03 10:50:36 +02:00 committed by Willy Sudiarto Raharjo
parent c039560041
commit 9b26285f8e
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
audio/audacity/audacity-ffmpeg.patch Normal file
View File

@ -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(

5
audio/audacity/audacity.SlackBuild
View File

@ -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" \