diff --git a/comms/scrcpy/Makefile b/comms/scrcpy/Makefile
index 7539c7a9b497..4c96365e7905 100644
--- a/comms/scrcpy/Makefile
+++ b/comms/scrcpy/Makefile
@@ -1,54 +1,50 @@
 PORTNAME=	scrcpy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0
-PORTREVISION=	2
+DISTVERSION=	2.1
 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}
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	6b769675fa68e60c9765022e43c4d7b1e329353a.patch:-p1
-
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Display and control your Android device
 WWW=		https://github.com/Genymobile/scrcpy
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	adb:devel/android-tools
 
-USES=		compiler:c++11-lang desktop-file-utils meson pkgconfig sdl
+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 \
 		etc/bash_completion.d/scrcpy \
 		man/man1/scrcpy.1.gz \
 		share/applications/scrcpy-console.desktop \
 		share/applications/scrcpy.desktop \
 		share/icons/hicolor/256x256/apps/scrcpy.png \
 		${DATADIR}/scrcpy-server \
 		share/zsh/site-functions/_scrcpy
 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 eecda976e961..ebc498ded1b3 100644
--- a/comms/scrcpy/distinfo
+++ b/comms/scrcpy/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1678617692
-SHA256 (scrcpy-server-v2.0) = 9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2
-SIZE (scrcpy-server-v2.0) = 52867
-SHA256 (Genymobile-scrcpy-v2.0_GH0.tar.gz) = a256241dd178ab103e4a119d0387f348c10ac513f25a7ca4859bd53ca5e7d43f
-SIZE (Genymobile-scrcpy-v2.0_GH0.tar.gz) = 375902
-SHA256 (6b769675fa68e60c9765022e43c4d7b1e329353a.patch) = b9eebe81d56c7e91b6834db00725059cf41ef3ad4e1b3bfa6875fa0f1576f30c
-SIZE (6b769675fa68e60c9765022e43c4d7b1e329353a.patch) = 2139
+TIMESTAMP = 1687851395
+SHA256 (scrcpy-server-v2.1) = 5b8bf1940264b930c71a1c614c57da2247f52b2d4240bca865cc6d366dff6688
+SIZE (scrcpy-server-v2.1) = 56955
+SHA256 (Genymobile-scrcpy-v2.1_GH0.tar.gz) = 57a277238d19d3471f37003d0d567bb8cde0a2b487b5cf91416129b463d9e8d5
+SIZE (Genymobile-scrcpy-v2.1_GH0.tar.gz) = 385830
diff --git a/comms/scrcpy/files/patch-app_meson.build b/comms/scrcpy/files/patch-app_meson.build
index e4bd3fdd970f..ba903216f3fc 100644
--- a/comms/scrcpy/files/patch-app_meson.build
+++ b/comms/scrcpy/files/patch-app_meson.build
@@ -1,26 +1,26 @@
---- app/meson.build.orig	2023-03-12 01:05:37 UTC
+--- app/meson.build.orig	2023-06-21 23:15:44 UTC
 +++ app/meson.build
-@@ -54,8 +54,8 @@ src = [
+@@ -56,8 +56,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'
-@@ -236,10 +236,10 @@ install_data('data/icon.png',
+@@ -238,10 +238,10 @@ install_data('data/icon.png',
  install_data('data/zsh-completion/_scrcpy',
               install_dir: join_paths(datadir, 'zsh/site-functions'))
  install_data('data/bash-completion/scrcpy',
 -             install_dir: join_paths(datadir, 'bash-completion/completions'))
 +             install_dir: 'etc/bash_completion.d')
  
  # Desktop entry file for application launchers
 -if host_machine.system() == 'linux'
 +if host_machine.system() == 'linux' or host_machine.system() == 'freebsd'
      # Install a launcher (ex: /usr/local/share/applications/scrcpy.desktop)
      install_data('data/scrcpy.desktop',
                   install_dir: join_paths(datadir, 'applications'))