diff --git a/net/neatvnc/Makefile b/net/neatvnc/Makefile
index ad7c9391dc15..33b8f3b1a72e 100644
--- a/net/neatvnc/Makefile
+++ b/net/neatvnc/Makefile
@@ -1,36 +1,56 @@
 PORTNAME=	neatvnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
+DISTVERSION=	0.5.0
 CATEGORIES=	net
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	4baeaa43fd67.patch:-p1 # https://github.com/any1/neatvnc/pull/65
+PATCHFILES+=	f4f8f0bdb366.patch:-p1 # https://github.com/any1/neatvnc/issues/66
+PATCHFILES+=	86dd97ed0aee.patch:-p1 # https://github.com/any1/neatvnc/issues/66
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Liberally licensed VNC server library
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm
 LIB_DEPENDS=	libaml.so:devel/aml
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	any1
 
-OPTIONS_DEFINE=	GNUTLS JPEG
-OPTIONS_DEFAULT=GNUTLS JPEG
+OPTIONS_DEFINE=	FFMPEG GNUTLS JPEG OPENGL
+OPTIONS_DEFAULT=FFMPEG GNUTLS JPEG OPENGL
+
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+FFMPEG_MESON_ENABLED=	h264
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_MESON_ENABLED=	tls
 
 JPEG_LIB_DEPENDS=	libturbojpeg.so:graphics/libjpeg-turbo
 JPEG_MESON_ENABLED=	jpeg
 
+OPENGL_LIB_DEPENDS=	libdrm.so:graphics/libdrm
+OPENGL_USES=		gl
+OPENGL_USE=		GL=gbm
+OPENGL_MESON_ENABLED=	gbm
+
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
+pre-test:
+	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
+		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
+		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true"; \
+		${TOUCH} ${WRKDIR}/.meson_build_tests; \
+	fi
+
 .include <bsd.port.mk>
diff --git a/net/neatvnc/distinfo b/net/neatvnc/distinfo
index 2cefbbecbeae..8bf13472f589 100644
--- a/net/neatvnc/distinfo
+++ b/net/neatvnc/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1607263370
-SHA256 (any1-neatvnc-v0.4.0_GH0.tar.gz) = 8a833d488f579e4acf7abb1c7832f8e571bddd6da054e71ed9be3b8396955a81
-SIZE (any1-neatvnc-v0.4.0_GH0.tar.gz) = 555438
+TIMESTAMP = 1657389787
+SHA256 (any1-neatvnc-v0.5.0_GH0.tar.gz) = 380683b626162d3a8400e195a6e80e60b7d163c522d8fd55320e3ecd5c143985
+SIZE (any1-neatvnc-v0.5.0_GH0.tar.gz) = 577548
+SHA256 (4baeaa43fd67.patch) = bf31bbe2d8b00145d12bc77b5daa089c217dd2a1c166edc3565c6a1e9d263677
+SIZE (4baeaa43fd67.patch) = 697
+SHA256 (f4f8f0bdb366.patch) = a768351dd487362c7d768b6d9e00fb2e027434602127f954065eaeef1bdc6027
+SIZE (f4f8f0bdb366.patch) = 804
+SHA256 (86dd97ed0aee.patch) = 9dd6b2692b1233b8f4f8da31223391e99662bc5302041b57c011bf4a5e694654
+SIZE (86dd97ed0aee.patch) = 550