Index: head/audio/forked-daapd/Makefile
===================================================================
--- head/audio/forked-daapd/Makefile	(revision 469018)
+++ head/audio/forked-daapd/Makefile	(revision 469019)
@@ -1,61 +1,59 @@
 # Created by: Takumi Takahashi <takumiiinn@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	forked-daapd
 PORTVERSION=	24.1
 PORTREVISION=	6
 CATEGORIES=	audio
 
 MAINTAINER=	takumiiinn@gmail.com
 COMMENT=	DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server
 
 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 \
 		libavcodec.so:multimedia/ffmpeg \
 		libconfuse.so:devel/libconfuse \
 		libevent.so:devel/libevent \
 		libgcrypt.so:security/libgcrypt \
 		libinotify.so:devel/libinotify \
 		libmxml.so:textproc/mxml \
 		libunistring.so:devel/libunistring
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ejurgensen
 
 USES=		autoreconf gettext gmake gperf iconv libtool localbase pathfix pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	${LOCALBASE}/lib/forked-daapd
 CONFIGURE_ARGS+=--localstatedir=/var
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 USERS=		daapd
 GROUPS=		daapd
 
 OPTIONS_DEFINE=	ALSA ITUNES LASTFM MPD
 OPTIONS_DEFAULT=ITUNES LASTFM MPD
 
 ITUNES_DESC=	iTunes XML support
 MPD_DESC=	Music Player Daemon protocol support
 
 ALSA_CONFIGURE_WITH=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ITUNES_CONFIGURE_ENABLE=itunes
 ITUNES_LIB_DEPENDS=	libplist.so:devel/libplist
 LASTFM_CONFIGURE_ENABLE=lastfm
 LASTFM_LIB_DEPENDS=	libcurl.so:ftp/curl
 MPD_CONFIGURE_ENABLE=	mpd
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample
 
 .include <bsd.port.mk>
Index: head/audio/forked-daapd/files/patch-ffmpeg4
===================================================================
--- head/audio/forked-daapd/files/patch-ffmpeg4	(nonexistent)
+++ head/audio/forked-daapd/files/patch-ffmpeg4	(revision 469019)
@@ -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 <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+-#include <libavfilter/avfiltergraph.h>
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #include <libavutil/opt.h>
+@@ -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)

Property changes on: head/audio/forked-daapd/files/patch-ffmpeg4
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property