kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

audio/audacity: fix build with new ffmpeg

Browse source 
- add patch to fix build with ffmpeg 2.7
- add ffmpeg to LIB_DEPENDS to fix build in rare cases

PR:		201589
Submitted by:	Christian Heckendorf <heckendorfc@gmail.com>
Approved by:	xxjack12xx@gmail.com
This commit is contained in:
Ruslan Makhmatkhanov 2015-07-27 13:44:45 +00:00
parent f086d5f251
commit 78af363b06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=392979
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio/audacity/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= audacity
PORTVERSION= 2.1.0
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-minsrc-${PORTVERSION}
@ -62,7 +63,8 @@ CONFIGURE_ARGS+= --disable-sse
DEBUG_CONFIGURE_WITH= debug
FFMPEG_CONFIGURE_WITH= ffmpeg
FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
FFMPEG_LIB_DEPENDS= libavformat.so:${PORTSDIR}/multimedia/ffmpeg
FFMPEG_CFLAGS= -I${LOCALBASE}/include/ffmpeg
FFMPEG_CPPFLAGS= -I${LOCALBASE}/include/ffmpeg
FFMPEG_CXXFLAGS= -I${LOCALBASE}/include/ffmpeg

29
audio/audacity/files/patch-src_FFmpeg.h Normal file
View file

@ -0,0 +1,29 @@
--- src/FFmpeg.h.orig 2015-03-02 01:06:57 UTC
+++ src/FFmpeg.h
@@ -688,7 +688,7 @@ extern "C" {
FFMPEG_FUNCTION_WITH_RETURN(
AVOutputFormat*,
av_oformat_next,
- (AVOutputFormat *f),
+ (const AVOutputFormat *f),
(f)
);
FFMPEG_FUNCTION_WITH_RETURN(
@@ -755,7 +755,7 @@ extern "C" {
FFMPEG_FUNCTION_WITH_RETURN(
int,
av_fifo_size,
- (AVFifoBuffer *f),
+ (const AVFifoBuffer *f),
(f)
);
FFMPEG_FUNCTION_WITH_RETURN(
@@ -801,7 +801,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(