--- multimedia/emby-server/Makefile	(revision 487425)
+++ multimedia/emby-server/Makefile	(working copy)
@@ -4,15 +4,18 @@ 
 PORTNAME=	emby-server
 PORTVERSION=	3.5.3.0
 CATEGORIES=	multimedia
-MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/
-DISTNAME=	emby-server-freebsd_${PORTVERSION}_amd64
+MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
+		https://mediabrowser.github.io/embytools/
+DISTNAME=	${PORTNAME}-freebsd_${PORTVERSION}_amd64
+DISTFILES=	${PORTNAME}-freebsd_${PORTVERSION}_amd64.tar.xz \
+		ffmpeg-2018_12_01.tar.gz
 
-MAINTAINER=	apps@emby.media
+MAINTAINER=	alucryd@archlinux.org
 COMMENT=	Media server to organize, play & stream audio/video to various devices
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	custom
-LICENSE_FILE=	${WRKSRC}/license.docx
+LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/license.docx
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64
@@ -23,6 +26,8 @@ 
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgnutls.so:security/gnutls \
+		libiconv.so:converters/libiconv \
+		libmp3lame.so:audio/lame \
 		libopus.so:audio/opus \
 		libsmbclient.so:net/samba48 \
 		libsqlite3.so:databases/sqlite3 \
@@ -32,12 +37,11 @@ 
 		libwebp.so:graphics/webp \
 		libx264.so:multimedia/libx264 \
 		libzvbi.so:devel/libzvbi
+BUILD_DEPENDS=	nasm:devel/nasm
 
-USES=		iconv:wchar_t tar:xz
-USE_XORG=	x11 xcb
+USES=		gmake pkgconfig tar:xz
 
-NO_BUILD=	true
-WRKSRC=		${WRKDIR}/emby-server-${PORTVERSION}
+NOPRECIOUSMAKEVARS= yes
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST=	PORTNAME=${PORTNAME} USER=${USERS} GROUP=${GROUPS} RC_NAME=emby_server
@@ -44,11 +48,49 @@ 
 USERS=		emby
 GROUPS=		emby
 
+do-build:
+	(cd ${WRKDIR}/ffmpeg-2018_12_01 && \
+		./configure \
+		--disable-bzlib \
+		--disable-doc \
+		--disable-ffplay \
+		--disable-shared \
+		--disable-vdpau \
+		--disable-libxcb \
+		--disable-libxcb-shm \
+		--disable-libxcb-xfixes \
+		--disable-libxcb-shape \
+		--disable-lzma \
+		--disable-sdl2 \
+		--disable-xlib \
+		--enable-fontconfig \
+		--enable-gmp \
+		--enable-gnutls \
+		--enable-gpl \
+		--enable-libass \
+   		--enable-libdrm \
+		--enable-libfreetype \
+		--enable-libfribidi \
+		--enable-libmp3lame \
+		--enable-libopus \
+		--enable-libsmbclient \
+		--enable-libtheora \
+		--enable-libvorbis \
+		--enable-libwebp \
+		--enable-libx264 \
+		--enable-libzvbi \
+		--enable-static \
+		--enable-vaapi \
+		--enable-version3 && \
+		gmake)
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server
-	(cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
-	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/lib)
-	(cd ${WRKSRC}/system && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/system)
+	(cd ${WRKDIR}/ffmpeg-2018_12_01 && \
+		${COPYTREE_BIN} ffmpeg ${STAGEDIR}${PREFIX}/lib/emby-server/bin && \
+		${COPYTREE_BIN} ffprobe ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
+	(cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/lib)
+	(cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/system && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/system)
 	(cd ${STAGEDIR}${PREFIX}/lib/emby-server/system && \
 		ln -s ../../libsqlite3.so ./libsqlite3.so && \
 		ln -s ../lib/libSkiaSharp.so ./libSkiaSharp.so)
--- multimedia/emby-server/distinfo	(revision 487425)
+++ multimedia/emby-server/distinfo	(working copy)
@@ -1,3 +1,5 @@ 
-TIMESTAMP = 1537705721
-SHA256 (emby-server-freebsd_3.5.3.0_amd64.tar.xz) = 522497d0539f1ad5176ab3a3406d6d9dfaa9e292bdee5ccf17286b55a487df5d
-SIZE (emby-server-freebsd_3.5.3.0_amd64.tar.xz) = 14279500
+TIMESTAMP = 1544792102
+SHA256 (emby-server-freebsd_3.5.3.0_amd64.tar.xz) = dae593f7b9ca40967f03bf5fbfb255e29e068620524c8a02e185850cb8daf97e
+SIZE (emby-server-freebsd_3.5.3.0_amd64.tar.xz) = 16612924
+SHA256 (ffmpeg-2018_12_01.tar.gz) = 1129e1bfb7fc4090cdd6e055d57b0cd90c9881f0db8b9ceb80fdd145de4ffc71
+SIZE (ffmpeg-2018_12_01.tar.gz) = 12421000
--- multimedia/emby-server/files/emby-server.in	(revision 487425)
+++ multimedia/emby-server/files/emby-server.in	(working copy)
@@ -45,8 +45,6 @@ 
 : ${%%RC_NAME%%_ffmpeg:="%%PREFIX%%/lib/emby-server/bin/ffmpeg"}
 : ${%%RC_NAME%%_ffprobe:="%%PREFIX%%/lib/emby-server/bin/ffprobe"}
 
-export LD_LIBRARY_PATH=%%PREFIX%%/lib/emby-server/lib
-
 pidfile="/var/run/%%PORTNAME%%.pid"
 procname="%%LOCALBASE%%/bin/mono"
 command="/usr/sbin/daemon"
--- multimedia/emby-server/pkg-message	(revision 487425)
+++ multimedia/emby-server/pkg-message	(working copy)
@@ -1,19 +1,3 @@ 
-Emby Server uses FFmpeg for transcoding and ImageMagick for
-generating thumbnails. The default ports/pkg builds of FFmpeg
-and ImageMagick on FreeBSD have a number of options which
-could be SET/UNSET to improve your Emby Server experience.
-
-It is recommended to recompile the multimedia/ffmpeg package
-from ports with the following options ENABLED (SET):
- - ASS (required for subtitle rendering)
- - LAME (required for mp3 audio transcoding, disabled by default due to mp3 licensing restrictions)
- - OPUS (required for opus audio codec support)
- - X265 (required for H.265 video codec support
-
-It is recommended to recompile the graphics/ImageMagick package
-from ports with the following options DISABLED (UNSET):
- - 16BIT_PIXEL (to increase thumbnail generation performance)
-
 If you had mediabrowser installed before the project was
 renamed to emby-server, you may want to rename the user and
 group (note that moving the database is not supported):
--- multimedia/emby-server/pkg-plist	(revision 487425)
+++ multimedia/emby-server/pkg-plist	(working copy)
@@ -30,6 +30,8 @@ 
 lib/emby-server/lib/libswscale.so
 lib/emby-server/lib/libswscale.so.5
 lib/emby-server/lib/libswscale.so.5.1.100
+lib/emby-server/lib/libx264.so
+lib/emby-server/lib/libx264.so.152
 lib/emby-server/system/BDInfo.dll
 lib/emby-server/system/DvdLib.dll
 lib/emby-server/system/Emby.Dlna.dll