diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile
index 97553bc2f3b6..e308928b3e43 100644
--- a/multimedia/dav1d/Makefile
+++ b/multimedia/dav1d/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	dav1d
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Small and fast AV1 decoder
 WWW=		https://code.videolan.org/videolan/dav1d
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		compiler:c11 meson
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
 GL_COMMIT=	99172b11470776177939c3d2bc366fe8d904eab7
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE=	SDL TEST
 OPTIONS_SUB=	yes
 
 SDL_USES=	pkgconfig sdl
 SDL_USE=	SDL=sdl2
 SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 SDL_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo \
 			libvulkan.so:graphics/vulkan-loader
 SDL_MESON_TRUE=	enable_examples
 
 TEST_GL_TUPLE=	videolan:dav1d-test-data:0214ee7342c646b238f98267adf8503c56d9df53:testdata/tests/dav1d-test-data
 TEST_MESON_TRUE=enable_tests testdata_tests
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
 # https://github.com/llvm/llvm-project/issues/39981
 .if !empty(CFLAGS:M-flto*)
 MESON_ARGS+=	${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}}
 MESON_ARGS_clang_amd64=	-Dstack_alignment=16
 MESON_ARGS_clang_i386=	-Dstack_alignment=4
 .endif
 
 pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
diff --git a/multimedia/dav1d/files/patch-i386 b/multimedia/dav1d/files/patch-i386
new file mode 100644
index 000000000000..a6d2e328e3cc
--- /dev/null
+++ b/multimedia/dav1d/files/patch-i386
@@ -0,0 +1,14 @@
+https://code.videolan.org/videolan/dav1d/-/issues/408
+
+--- src/lib.c.orig	2022-03-18 13:31:21 UTC
++++ src/lib.c
+@@ -726,6 +726,9 @@ uint8_t *dav1d_data_create(Dav1dData *const buf, const
+     return dav1d_data_create_internal(buf, sz);
+ }
+ 
++#ifdef __i386__
++__attribute__((optnone))
++#endif
+ int dav1d_data_wrap(Dav1dData *const buf, const uint8_t *const ptr,
+                     const size_t sz,
+                     void (*const free_callback)(const uint8_t *data,