diff --git a/comms/scrcpy/Makefile b/comms/scrcpy/Makefile
index b011489639a9..fb1389521d2e 100644
--- a/comms/scrcpy/Makefile
+++ b/comms/scrcpy/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	scrcpy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20
+DISTVERSION=	1.21
 CATEGORIES=	comms net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:server
 DISTFILES=	${SERVER_FILE}:server
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Display and control your Android device
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	adb:devel/android-tools-adb
 
 USES=		compiler:c++11-lang meson pkgconfig sdl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Genymobile
 
 USE_SDL=	sdl2
 
 MESON_ARGS=	-Dportable=false \
 		-Dprebuilt_server=${WRKSRC}/${SERVER_FILE}
 
 PLIST_FILES=	bin/scrcpy man/man1/scrcpy.1.gz \
 		share/icons/hicolor/256x256/apps/scrcpy.png \
 		${DATADIR}/scrcpy-server
 PORTDOCS=	FAQ.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 SERVER_FILE=	${PORTNAME}-server-${DISTVERSIONFULL}
 
 post-extract:
 	${CP} ${DISTDIR}/${SERVER_FILE} ${WRKSRC}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/scrcpy/distinfo b/comms/scrcpy/distinfo
index 86276d025143..7658613a26cc 100644
--- a/comms/scrcpy/distinfo
+++ b/comms/scrcpy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1637752710
-SHA256 (scrcpy-server-v1.20) = b20aee4951f99b060c4a44000ba94de973f9604758ef62beb253b371aad3df34
-SIZE (scrcpy-server-v1.20) = 37139
-SHA256 (Genymobile-scrcpy-v1.20_GH0.tar.gz) = 0c667e7de043a67a740be99d3f236a7aa4107ff62c408e7c462f4fe291f045a7
-SIZE (Genymobile-scrcpy-v1.20_GH0.tar.gz) = 343592
+TIMESTAMP = 1638420118
+SHA256 (scrcpy-server-v1.21) = dbcccab523ee26796e55ea33652649e4b7af498edae9aa75e4d4d7869c0ab848
+SIZE (scrcpy-server-v1.21) = 40067
+SHA256 (Genymobile-scrcpy-v1.21_GH0.tar.gz) = 76e16a894bdb483b14b7ae7dcc1be8036ec17924dfab070cf0cb3b47653a6822
+SIZE (Genymobile-scrcpy-v1.21_GH0.tar.gz) = 360667
diff --git a/comms/scrcpy/files/patch-app_meson.build b/comms/scrcpy/files/patch-app_meson.build
new file mode 100644
index 000000000000..134b89c40ade
--- /dev/null
+++ b/comms/scrcpy/files/patch-app_meson.build
@@ -0,0 +1,13 @@
+--- app/meson.build.orig	2021-12-02 04:47:49 UTC
++++ app/meson.build
+@@ -44,8 +44,8 @@ src = [
+ 
+ conf = configuration_data()
+ 
+-conf.set('_POSIX_C_SOURCE', '200809L')
+-conf.set('_XOPEN_SOURCE', '700')
++# conf.set('_POSIX_C_SOURCE', '200809L')
++# conf.set('_XOPEN_SOURCE', '700')
+ conf.set('_GNU_SOURCE', true)
+ 
+ if host_machine.system() == 'windows'
diff --git a/comms/scrcpy/files/patch-app_src_compat.h b/comms/scrcpy/files/patch-app_src_compat.h
deleted file mode 100644
index d5cd7624b497..000000000000
--- a/comms/scrcpy/files/patch-app_src_compat.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- app/src/compat.h.orig	2021-11-07 06:03:53 UTC
-+++ app/src/compat.h
-@@ -1,8 +1,8 @@
- #ifndef COMPAT_H
- #define COMPAT_H
- 
--#define _POSIX_C_SOURCE 200809L
--#define _XOPEN_SOURCE 700
-+// #define _POSIX_C_SOURCE 200809L
-+// #define _XOPEN_SOURCE 700
- #define _GNU_SOURCE
- #ifdef __APPLE__
- # define _DARWIN_C_SOURCE