svn commit: r392979 - in head/audio/audacity: . files
Ruslan Makhmatkhanov
rm at FreeBSD.org
Mon Jul 27 13:44:47 UTC 2015
Author: rm
Date: Mon Jul 27 13:44:45 2015
New Revision: 392979
URL: https://svnweb.freebsd.org/changeset/ports/392979
Log:
audio/audacity: fix build with new ffmpeg
- 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 at gmail.com>
Approved by: xxjack12xx at gmail.com
Added:
head/audio/audacity/files/patch-src_FFmpeg.h (contents, props changed)
Modified:
head/audio/audacity/Makefile
Modified: head/audio/audacity/Makefile
==============================================================================
--- head/audio/audacity/Makefile Mon Jul 27 13:06:48 2015 (r392978)
+++ head/audio/audacity/Makefile Mon Jul 27 13:44:45 2015 (r392979)
@@ -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
Added: head/audio/audacity/files/patch-src_FFmpeg.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-src_FFmpeg.h Mon Jul 27 13:44:45 2015 (r392979)
@@ -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(
More information about the svn-ports-head
mailing list