diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 1b8fd0f79391..7e8cd9289c21 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,71 +1,73 @@
 PORTNAME=	dvdstyler
 DISTVERSION=	3.3b3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 #MASTER_SITES=	SF
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${DISTVERSION}
 DISTNAME=	DVDStyler-${DISTVERSION}
 
 MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	WxWidgets frontend to dvd recoding and authoring programs
 WWW=		https://www.dvdstyler.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		wxsvg>=1.2:graphics/wxsvg \
 		dvdauthor:multimedia/dvdauthor \
 		mplex:multimedia/mjpegtools \
 		growisofs:sysutils/dvd+rw-tools \
 		docbook-xml>=4.1.2:textproc/docbook-xml \
 		xmlto:textproc/xmlto
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libavcodec.so:multimedia/ffmpeg \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libdbus-1.so:devel/dbus \
 		libudev.so:devel/libudev-devd
 RUN_DEPENDS=	zip:archivers/zip \
 		wxsvg>=1.2:graphics/wxsvg \
 		dvdauthor:multimedia/dvdauthor \
 		mplex:multimedia/mjpegtools \
 		mkisofs:sysutils/cdrtools \
 		growisofs:sysutils/dvd+rw-tools
 
 USES=		autoreconf compiler:c++11-lib gettext gmake jpeg \
 		localbase:ldflags pkgconfig tar:bzip2
 USE_CXXSTD=	c++14
 USE_WX=		3.2+
 WX_CONF_ARGS=	absolute
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}"
+CFLAGS+=	-std=c17
+CPPFLAGS+=	-std=c++17
 
 OPTIONS_DEFINE=	DOCS
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
 DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 pre-everything::
 .if !defined(WITH_DVD_DEVICE)
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/doc_DATA/s|COPYING||' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|"sg\*"|"cd*"|g' \
 		${WRKSRC}/src/SysUtils.cpp
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
 		${WRKSRC}/src/Config.h
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp
new file mode 100644
index 000000000000..d1b28b3d4159
--- /dev/null
+++ b/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp
@@ -0,0 +1,11 @@
+--- wxVillaLib/ThumbnailFactory.cpp	2023-07-24 10:21:13.152544000 +0100
++++ wxVillaLib/ThumbnailFactory.cpp	2023-07-24 10:18:45.440168000 +0100
+@@ -363,7 +363,7 @@
+ 				img = decoder.GetNextFrame();
+ 		}
+ 		if (img.Ok() && decoder.GetFrameAspectRatio() > 0 
+-				&& labs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) {
++				&& std::abs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) {
+ 			if (lround(img.GetWidth() / decoder.GetFrameAspectRatio()) > img.GetHeight())
+ 				img.Rescale(img.GetWidth(), lround(img.GetWidth() / decoder.GetFrameAspectRatio()));
+ 			else
diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp
new file mode 100644
index 000000000000..feb4c16aa200
--- /dev/null
+++ b/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp
@@ -0,0 +1,10 @@
+--- wxVillaLib/imagjpg.cpp	2023-07-24 10:38:58.609790000 +0100
++++ wxVillaLib/imagjpg.cpp	2023-07-24 10:41:28.358164000 +0100
+@@ -1,7 +1,3 @@
+-#ifdef __GNUG__
+-#pragma implementation "imagjpg.h"
+-#endif
+-
+ // For compilers that support precompilation, includes "wx.h".
+ #include "wx/wxprec.h"
+ 
diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp
new file mode 100644
index 000000000000..6b18f2f1c11a
--- /dev/null
+++ b/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp
@@ -0,0 +1,11 @@
+--- wxVillaLib/thumb_md5.cpp	2023-07-24 10:20:48.138290000 +0100
++++ wxVillaLib/thumb_md5.cpp	2023-07-24 10:02:20.011636000 +0100
+@@ -199,7 +199,7 @@
+ static void 
+ thumb_md5_transform (wxUint32 buf[4], wxUint32 const in[16])
+ {
+-    register wxUint32 a, b, c, d;
++    wxUint32 a, b, c, d;
+ 
+     a = buf[0];
+     b = buf[1];