From owner-svn-ports-head@freebsd.org Mon Jul 27 13:44:47 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 114CC9AC108; Mon, 27 Jul 2015 13:44:47 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBE101CB; Mon, 27 Jul 2015 13:44:46 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6RDikNV079029; Mon, 27 Jul 2015 13:44:46 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6RDikPb079027; Mon, 27 Jul 2015 13:44:46 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201507271344.t6RDikPb079027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Mon, 27 Jul 2015 13:44:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392979 - in head/audio/audacity: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 13:44:47 -0000 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 Approved by: xxjack12xx@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(