diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index dac4cee84615..c7c3eb175fcd 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,67 +1,66 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6
-PORTREVISION=	3
+DISTVERSION=	1.7
 CATEGORIES=	x11 wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	787d13e36783.patch:-p1 # https://github.com/artemsen/swayimg/pull/23
 PATCHFILES+=	d12f10e9ebbd.patch:-p1 # https://github.com/artemsen/swayimg/pull/24
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image viewer for Sway/Wayland
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		gnome meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	artemsen
 USE_GNOME=	cairo
 MESON_ARGS=	-Dversion="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		man/man5/${PORTNAME}rc.5.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
 		${NULL}
 
 OPTIONS_DEFINE=	AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG WEBP
 OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG WEBP
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_MESON_ENABLED=	avif
 
 BASH_BUILD_DEPENDS=	bash-completion>0:shells/bash-completion
 BASH_MESON_ENABLED=	bash
 BASH_PLIST_FILES=	share/bash-completion/completions/${PORTNAME}
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_USES=		localbase:ldflags
 GIF_MESON_ENABLED=	gif
 
 JPEG_USES=		jpeg
 JPEG_MESON_ENABLED=	jpeg
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_ENABLED=	jxl
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_MESON_ENABLED=	exif
 
 LIBRSVG2_USE=		GNOME=librsvg2
 LIBRSVG2_MESON_ENABLED=	svg
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ENABLED=	png
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
 .include <bsd.port.mk>
diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo
index 8f0360783fc7..fa18ba2fec2d 100644
--- a/x11/swayimg/distinfo
+++ b/x11/swayimg/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1644401520
-SHA256 (artemsen-swayimg-v1.6_GH0.tar.gz) = 944ad0c547c7fa45f26001431305529f75a8685f47e939c20442a7c16a6b22c0
-SIZE (artemsen-swayimg-v1.6_GH0.tar.gz) = 74037
-SHA256 (787d13e36783.patch) = 9b7236eb0392e430615ba306c5e15589f2eb20a89f95fa18458b4fedc1e26382
-SIZE (787d13e36783.patch) = 2021
+TIMESTAMP = 1645346183
+SHA256 (artemsen-swayimg-v1.7_GH0.tar.gz) = 2bb7bde8f993396c9f2a32c2789abdf30667f3191bf6f69f9823cdc2f06aa932
+SIZE (artemsen-swayimg-v1.7_GH0.tar.gz) = 77022
 SHA256 (d12f10e9ebbd.patch) = 682a8889be251a91f4d70d9091de880a458651a9b32788b974a1ddb4f496a27c
 SIZE (d12f10e9ebbd.patch) = 973
diff --git a/x11/swayimg/files/patch-meson.build b/x11/swayimg/files/patch-meson.build
new file mode 100644
index 000000000000..31d18e49f70e
--- /dev/null
+++ b/x11/swayimg/files/patch-meson.build
@@ -0,0 +1,21 @@
+https://github.com/artemsen/swayimg/pull/36
+
+--- meson.build.orig	2022-02-20 08:36:23 UTC
++++ meson.build
+@@ -39,6 +39,8 @@ bash  = dependency('bash-completion', required: get_op
+ # optional dependencies: other features
+ exif  = dependency('libexif', required: get_option('exif'))
+ bash  = dependency('bash-completion', required: get_option('bash'))
++# Non-Linux
++epoll = dependency('epoll-shim', required: false)
+ 
+ # configuration file
+ conf = configuration_data()
+@@ -150,6 +152,7 @@ executable(
+   dependencies: [
+     avif,
+     cairo,
++    epoll,
+     exif,
+     gif,
+     jpeg,