diff --git i/graphics/waffle/Makefile w/graphics/waffle/Makefile
index 44db944290d9..f9a88577cecf 100644
--- i/graphics/waffle/Makefile
+++ w/graphics/waffle/Makefile
@@ -1,58 +1,61 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	waffle
-DISTVERSION=	1.6.0-7
+DISTVERSION=	1.6.1-15
 CATEGORIES=	graphics
 
 # Wayland xdg-shell support (to run on sway/wayfire/etc. that have removed wl-shell)
-PATCH_SITES=	https://gitlab.freedesktop.org/oreaus/${PORTNAME}/-/commit/
-PATCHFILES=	3cdce7b38cbd91cd7288e21940b279bf7ddc5757.diff:-p1
+PATCH_SITES=	https://gitlab.freedesktop.org/bl4ckb0ne/${PORTNAME}/-/commit/
+PATCHFILES=	39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.diff:-p1 \
+		e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.diff:-p1 \
+		8c202f88ab4f0f851e3f19dd82bc6b5236120564.diff:-p1
+
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library that allows to defer selection of an OpenGL API until runtime
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	cmake:devel/cmake
 
 USES=		compiler:c11 gl localbase meson pkgconfig python:3.5+,build
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mesa
-GL_COMMIT=	b71cfa674db5828a2be04a42ce9996d6677629ee
+GL_COMMIT=	2485a41c321a29463b5c0af7813c2d1046e2f925
 USE_GL=		egl gl
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/waffle1
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		DOCS GBM MANPAGES SURFACELESS WAYLAND X11
 OPTIONS_DEFAULT=	GBM MANPAGES SURFACELESS WAYLAND X11
 OPTIONS_SUB=		yes
 
 GBM_DESC=		GBM/DRM/KMS direct-on-hardware support
 SURFACELESS_DESC=	Surfaceless EGL support
 
 GBM_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 GBM_USE=		GL=gbm
 GBM_MESON_ENABLED=	gbm
 
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MANPAGES_USES=		gnome
 MANPAGES_USE=		GNOME=libxslt:build
 MANPAGES_MESON_TRUE=	build-manpages
 
 SURFACELESS_MESON_ENABLED=	surfaceless_egl
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
 			wayland-scanner:graphics/wayland
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 WAYLAND_MESON_ENABLED=	wayland
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xcb
 X11_MESON_ENABLED=	glx x11_egl
 
 .include <bsd.port.mk>
diff --git i/graphics/waffle/distinfo w/graphics/waffle/distinfo
index 465978979a88..e9b61e0fdc59 100644
--- i/graphics/waffle/distinfo
+++ w/graphics/waffle/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1577365999
-SHA256 (mesa-waffle-b71cfa674db5828a2be04a42ce9996d6677629ee_GL0.tar.gz) = d1081c6f8fc1dd74edebbda9e095eac42df95ed1428a628914222d4233b6be44
-SIZE (mesa-waffle-b71cfa674db5828a2be04a42ce9996d6677629ee_GL0.tar.gz) = 340730
-SHA256 (3cdce7b38cbd91cd7288e21940b279bf7ddc5757.diff) = ccb72de1cc065fc24f8670f63db37ebf5f32c39020736b2bac11237882f54108
-SIZE (3cdce7b38cbd91cd7288e21940b279bf7ddc5757.diff) = 12960
+TIMESTAMP = 1598617850
+SHA256 (mesa-waffle-2485a41c321a29463b5c0af7813c2d1046e2f925_GL0.tar.gz) = 10d63acc125cde05545102617d1fb94ddee44db3798d217ae5cbea45caab134a
+SIZE (mesa-waffle-2485a41c321a29463b5c0af7813c2d1046e2f925_GL0.tar.gz) = 383080
+SHA256 (39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.diff) = c18214aaaea5acd7c210814739191f3287b473b611b348d0814d99b87df94d03
+SIZE (39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.diff) = 2962
+SHA256 (e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.diff) = 54f0a11c1963f9bc4651d60a801feb2575becebbfd9ac62259422209ceff11bf
+SIZE (e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.diff) = 10509
+SHA256 (8c202f88ab4f0f851e3f19dd82bc6b5236120564.diff) = dee0a0d805c8a60033e64a02c975b239c47a80390bbcfec681bcbb776a5b08aa
+SIZE (8c202f88ab4f0f851e3f19dd82bc6b5236120564.diff) = 815