git: 7d4242997008 - main - net/freerdp3: update to 3.3.0

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7d42429970081e5a319d2f8f8f695c090331f05c

commit 7d42429970081e5a319d2f8f8f695c090331f05c
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-02-23 07:57:33 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-02-23 07:57:33 +0000

    net/freerdp3: update to 3.3.0
    
    Add clipboard support for JPEG, PNG, WEBP formats (non-default options, experimental)
    Changelog:
    https://github.com/FreeRDP/FreeRDP/releases/tag/3.3.0
    
    Approved by:    arrowd (mentor, implicit)
---
 net/freerdp3/Makefile | 39 +++++++++++++++++++++++++--------------
 net/freerdp3/distinfo |  6 +++---
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile
index 86d1cf396a9a..e75ea2829cdd 100644
--- a/net/freerdp3/Makefile
+++ b/net/freerdp3/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freerdp
-DISTVERSION=	3.2.0
+DISTVERSION=	3.3.0
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
@@ -21,9 +21,6 @@ USES=		alias cmake compiler:c++11-lib cpe localbase:ldflags pathfix pkgconfig ss
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
 
-PATCHVERSION=	${DISTVERSION}
-MAJORVERSION=	${DISTVERSION:R:R}
-
 CMAKE_ARGS+=	${CMAKE_ARGS_${ARCH}}
 CMAKE_ON=	CHANNEL_URBDRC_CLIENT RDTK_FORCE_STATIC_BUILD UWAC_FORCE_STATIC_BUILD \
 		WITH_BINARY_VERSIONING WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB \
@@ -34,14 +31,16 @@ CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF WITH_GSTREAMER_0_10 WITH_I
 		WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
 		WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
 
-PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
-PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
+PLIST_SUB+=	PATCHVERSION="${DISTVERSION}"
+PLIST_SUB+=	MAJORVERSION="${DISTVERSION:R:R}"
 
 OPTIONS_DEFINE=		AAD ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG \
 			GSM GSTREAMER ICU JPEG LAME MANPAGES OPENH264 OPUS PCSC \
 			PKCS11 PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11
 OPTIONS_DEFAULT=	AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \
 			SDL SWSCALE WAYLAND X11
+OPTIONS_GROUP=		CLIPBOARD_IMAGE
+OPTIONS_GROUP_CLIPBOARD_IMAGE=	JPEG_CB PNG WEBP
 OPTIONS_RADIO=		GSSAPI SCALE
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
@@ -72,14 +71,7 @@ CAIRO_CMAKE_BOOL=	WITH_CAIRO
 CAIRO_USES=		gnome
 CAIRO_USE=		gnome=cairo
 
-SDL_DESC=		Build FreeRDP SDL client
-SDL_LIB_DEPENDS=	libatk-1.0.so:accessibility/at-spi2-core \
-			libsoup-2.4.so:devel/libsoup \
-			libharfbuzz.so:print/harfbuzz \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3
-SDL_CMAKE_BOOL=		WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
-SDL_USES=		gettext gnome sdl
-SDL_USE=		gnome=cairo,gdkpixbuf2,glib20,gtk30,pango sdl=sdl2,ttf2,image2
+CLIPBOARD_IMAGE_DESC=	Add "to/from" BMP conversion support to clipboard (experimental)
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
@@ -112,6 +104,10 @@ ICU_CMAKE_OFF=		-DWITH_UNICODE_BUILTIN=ON
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
+JPEG_CB_DESC=		${JPEG_DESC}
+JPEG_CB_CMAKE_BOOL=	WINPR_UTILS_IMAGE_JPEG
+JPEG_CB_USES=		jpeg
+
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_BOOL=	WITH_LAME
 
@@ -137,9 +133,21 @@ PKCS11_DESC=		Use security/pkcs11-helper
 PKCS11_BUILD_DEPENDS=	${LOCALBASE}/include/pkcs11-helper-1.0/pkcs11.h:security/pkcs11-helper
 PKCS11_CMAKE_BOOL=	WITH_PKCS11
 
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_CMAKE_BOOL=		WINPR_UTILS_IMAGE_PNG
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
+SDL_DESC=		Build FreeRDP SDL client
+SDL_LIB_DEPENDS=	libatk-1.0.so:accessibility/at-spi2-core \
+			libsoup-2.4.so:devel/libsoup \
+			libharfbuzz.so:print/harfbuzz \
+			libwebkit2gtk-4.0.so:www/webkit2-gtk3
+SDL_CMAKE_BOOL=		WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
+SDL_USES=		gettext gnome sdl
+SDL_USE=		gnome=cairo,gdkpixbuf2,glib20,gtk30,pango sdl=sdl2,ttf2,image2
+
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	WITH_SOXR
 
@@ -163,6 +171,9 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 WAYLAND_RUN_DEPENDS=	wayland-scanner:graphics/wayland
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+WEBP_CMAKE_BOOL=	WINPR_UTILS_IMAGE_WEBP
+
 X11_DESC=		Build FreeRDP X11 client
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
 			-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
diff --git a/net/freerdp3/distinfo b/net/freerdp3/distinfo
index 4d1b5561d79b..babac64062bd 100644
--- a/net/freerdp3/distinfo
+++ b/net/freerdp3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705745583
-SHA256 (freerdp-3.2.0.tar.gz) = 50922e142eecf68372e0a4ba6881c84076636e47a56c9c844a3ae6037c3b7083
-SIZE (freerdp-3.2.0.tar.gz) = 8407869
+TIMESTAMP = 1708617605
+SHA256 (freerdp-3.3.0.tar.gz) = 6b8db22249143c672a188cbcc2d215a0c108cfc1ef4d933e268e0b61a712cfb6
+SIZE (freerdp-3.3.0.tar.gz) = 9318199