Index: head/multimedia/miro/Makefile
===================================================================
--- head/multimedia/miro/Makefile	(revision 469016)
+++ head/multimedia/miro/Makefile	(revision 469017)
@@ -1,75 +1,73 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	miro
 PORTVERSION=	6.0
 PORTREVISION=	18
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Video player to get internet TV broadcasts
 
 LICENSE=	GPLv2
 
-BROKEN=		fails to build with ffmpeg 4.0
-
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk@${FLAVOR} \
 		update-mime-database:misc/shared-mime-info \
 		${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:devel/boost-libs \
 		${LOCALBASE}/include/taglib/taglib.h:audio/taglib
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/libtorrent.so:net-p2p/libtorrent-rasterbar-python \
 		${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen@${FLAVOR}
 
 BUILD_WRKSRC=	${WRKSRC}/linux
 INSTALL_WRKSRC=	${WRKSRC}/linux
 
 USE_GNOME=	gconf2 gtk20
 USE_GSTREAMER=	python gconf
 USES=		gettext gmake pkgconfig desktop-file-utils python:2.7 shared-mime-info shebangfix
 SHEBANG_FILES=	resources/testdata/7digital-replies/generate.py \
 		resources/testdata/echonest-replies/generate.py
 USE_PYTHON=	distutils
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
 .SILENT:
 
 post-patch:
 .for file in setup.py plat/resources.py plat/options.py
 	${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g ; \
 		 s|%%MANPREFIX%%|${MANPREFIX}|g' \
 		${BUILD_WRKSRC}/${file}
 .endfor
 .for file in miro.real
 	${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|g' \
 		${BUILD_WRKSRC}/${file}
 .endfor
 .for file in run.sh
 	${REINPLACE_CMD} -e 's|^PREFIX=.*|PREFIX=${PREFIX}|g' \
 		${BUILD_WRKSRC}/${file}
 .endfor
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	${PREFIX}/bin/miro --unittest
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/miro/files/patch-linux_miro-segmenter.c
===================================================================
--- head/multimedia/miro/files/patch-linux_miro-segmenter.c	(revision 469016)
+++ head/multimedia/miro/files/patch-linux_miro-segmenter.c	(revision 469017)
@@ -1,25 +1,56 @@
 --- linux/miro-segmenter.c.orig	2013-04-05 16:02:42 UTC
 +++ linux/miro-segmenter.c
 @@ -25,6 +25,10 @@
  #include <sys/types.h>
  #include <sys/socket.h>
  
 +#ifdef __FreeBSD__
 +#include <netinet/in.h>
 +#endif
 +
  #include <arpa/inet.h>
  
  #include <errno.h>
 @@ -74,7 +78,11 @@ static AVStream *add_output_stream(AVFor
              output_codec_context->sample_rate = input_codec_context->sample_rate;
              output_codec_context->channels = input_codec_context->channels;
              output_codec_context->frame_size = input_codec_context->frame_size;
 +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
              if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == CODEC_ID_MP3) || input_codec_context->codec_id == CODEC_ID_AC3) {
 +#else
 +            if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == AV_CODEC_ID_MP3) || input_codec_context->codec_id == AV_CODEC_ID_AC3) {
 +#endif
                  output_codec_context->block_align = 0;
              }
              else {
+@@ -92,7 +100,11 @@ static AVStream *add_output_stream(AVFormatContext *ou
+             output_codec_context->has_b_frames = input_codec_context->has_b_frames;
+ 
+             if (output_format_context->oformat->flags & AVFMT_GLOBALHEADER) {
++#if LIBAVCODEC_VERSION_MAJOR > 57
++                output_codec_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++#else
+                 output_codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
++#endif
+             }
+             break;
+     default:
+@@ -259,10 +271,18 @@ int main(int argc, char **argv)
+ #else
+         if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
+ #endif
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55,40,100)
++            segment_time = (double)av_stream_get_end_pts(video_st) * video_st->time_base.num / video_st->time_base.den;
++#else
+             segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
++#endif
+         }
+         else if (video_index < 0) {
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55,40,100)
++            segment_time = (double)av_stream_get_end_pts(audio_st) * audio_st->time_base.num / audio_st->time_base.den;
++#else
+             segment_time = (double)audio_st->pts.val * audio_st->time_base.num / audio_st->time_base.den;
++#endif
+         }
+         else {
+             segment_time = prev_segment_time;