From owner-svn-ports-head@freebsd.org Fri May 4 11:41:00 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4973EFAA1E8; Fri, 4 May 2018 11:41:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F1072844D1; Fri, 4 May 2018 11:40:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC297662A; Fri, 4 May 2018 11:40:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w44BexIw057227; Fri, 4 May 2018 11:40:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w44BexuM057225; Fri, 4 May 2018 11:40:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805041140.w44BexuM057225@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 May 2018 11:40:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469019 - in head/audio/forked-daapd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/audio/forked-daapd: . files X-SVN-Commit-Revision: 469019 X-SVN-Commit-Repository: ports 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.25 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: Fri, 04 May 2018 11:41:00 -0000 Author: jbeich Date: Fri May 4 11:40:59 2018 New Revision: 469019 URL: https://svnweb.freebsd.org/changeset/ports/469019 Log: audio/forked-daapd: unbreak with ffmpeg 4.0 artwork.c:448:19: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' dst->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ transcode.c:29:10: fatal error: 'libavfilter/avfiltergraph.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ transcode.c:562:76: error: use of undeclared identifier 'CODEC_CAP_DELAY' if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & CODEC_CAP_DELAY)) ^ transcode.c:807:20: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' enc_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ PR: 227726 Reported by: antoine (via exp-run) Added: head/audio/forked-daapd/files/patch-ffmpeg4 (contents, props changed) Modified: head/audio/forked-daapd/Makefile (contents, props changed) Modified: head/audio/forked-daapd/Makefile ============================================================================== --- head/audio/forked-daapd/Makefile Fri May 4 11:40:44 2018 (r469018) +++ head/audio/forked-daapd/Makefile Fri May 4 11:40:59 2018 (r469019) @@ -12,8 +12,6 @@ COMMENT= DAAP (iTunes), MPD (Music Player Daemon) and LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with ffmpeg 4.0 - BUILD_DEPENDS= antlr3:devel/antlr3 LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libavahi-client.so:net/avahi-app \ Added: head/audio/forked-daapd/files/patch-ffmpeg4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/forked-daapd/files/patch-ffmpeg4 Fri May 4 11:40:59 2018 (r469019) @@ -0,0 +1,43 @@ +https://github.com/ejurgensen/forked-daapd/commit/5afed60a42fe +https://github.com/ejurgensen/forked-daapd/commit/e7f888645fd6 +https://github.com/ejurgensen/forked-daapd/commit/eec98e3b7e88 + +--- src/artwork.c.orig 2016-05-06 17:50:14 UTC ++++ src/artwork.c +@@ -445,7 +445,7 @@ artwork_rescale(struct evbuffer *evbuf, AVFormatContex + avcodec_get_context_defaults3(dst, NULL); + + if (dst_fmt->flags & AVFMT_GLOBALHEADER) +- dst->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ dst->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + dst->codec_id = dst_fmt->video_codec; + dst->codec_type = AVMEDIA_TYPE_VIDEO; +--- src/transcode.c.orig 2016-05-06 17:50:14 UTC ++++ src/transcode.c +@@ -26,7 +26,6 @@ + + #include + #include +-#include + #include + #include + #include +@@ -560,7 +559,7 @@ flush_encoder(struct encode_ctx *ctx, unsigned int str + + DPRINTF(E_DBG, L_XCODE, "Flushing output stream #%u encoder\n", stream_index); + +- if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & CODEC_CAP_DELAY)) ++ if (!(ctx->ofmt_ctx->streams[stream_index]->codec->codec->capabilities & AV_CODEC_CAP_DELAY)) + return; + + do +@@ -804,7 +803,7 @@ open_output(struct encode_ctx *ctx, struct decode_ctx + } + + if (ctx->ofmt_ctx->oformat->flags & AVFMT_GLOBALHEADER) +- enc_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ enc_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + // Notice, this will not write WAV header (so we do that manually)