git: fce808c4c70c - main - net/freerdp: Update to 2.4.0

[Craig Leres]

The branch main has been updated by leres:

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

commit fce808c4c70c98d812688df395e8164d5e9b3e40
Author:     Craig Leres <leres at FreeBSD.org>
AuthorDate: 2021-08-21 20:36:29 +0000
Commit:     Craig Leres <leres at FreeBSD.org>
CommitDate: 2021-08-21 20:36:29 +0000

    net/freerdp: Update to 2.4.0
    
    Also: add options CAIRO, SWSCALE and turn on WITH_DSP_FFMPEG if
    FFMPEG is on
    
    PR:             254914
    Approved by:    Aleksandr Konkov (maintainer)
---
 net/freerdp/Makefile | 30 +++++++++++++++++++-----------
 net/freerdp/distinfo |  6 +++---
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 0c1ae613d110..b0b09c9e47cf 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -1,8 +1,7 @@
 # Created by: Alexander Logvinov <avl at FreeBSD.org>
 
 PORTNAME=	freerdp
-DISTVERSION=	2.3.2
-PORTREVISION=	1
+DISTVERSION=	2.4.0
 CATEGORIES=	net comms
 MASTER_SITES=   https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
@@ -31,19 +30,20 @@ PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
 
 CMAKE_ARGS+=	${CMAKE_ARGS_${ARCH}}
 CMAKE_ON=	WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB CHANNEL_URBDRC_CLIENT
-CMAKE_OFF=	WITH_DIRECTFB WITH_DSP_EXPERIMENTAL WITH_DSP_FFMPEG WITH_GPROF \
-		WITH_GSTREAMER_0_10 WITH_IPP WITH_LIBSYSTEMD \
-		WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER WITH_SAMPLE \
-		WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY WITH_SANITIZE_THREAD \
-		WITH_SERVER WITH_SERVER_INTERFACE WITH_SMARTCARD_INSPECT \
-		WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK WITH_X264
+CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \
+		WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \
+		WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \
+		WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
+		WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK WITH_X264
 
 CMAKE_ARGS_aarch64+=	-DWITH_NEON=ON
 CFLAGS_aarch64+=	-D__ARM_NEON__=__ARM_NEON # clang
 
 OPTIONS_DEFINE=		ALSA CUPS FAAC FAAD FFMPEG GSM GSTREAMER ICU JPEG KERBEROS \
 			LAME MANPAGES OPENH264 PCSC PULSEAUDIO SOXR WAYLAND X11
-OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11
+OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES SWSCALE WAYLAND X11
+OPTIONS_RADIO=		SCALE
+OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
 OPTIONS_SUB=		yes
 
 OPTIONS_DEFINE_armv6=	NEON
@@ -55,6 +55,10 @@ OPTIONS_DEFAULT_amd64=	SSE
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
+CAIRO_DESC=		Use CAIRO image library for screen resizing
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
+CAIRO_CMAKE_BOOL=	WITH_CAIRO
+
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
@@ -66,12 +70,12 @@ FAAD_CMAKE_BOOL=	WITH_FAAD2
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
-FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
+FFMPEG_CMAKE_BOOL=	WITH_FFMPEG WITH_DSP_FFMPEG
 
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		WITH_GSM
 
-GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
 GSTREAMER_USES=		gnome xorg
 GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr
 GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
@@ -113,6 +117,10 @@ SOXR_CMAKE_BOOL=	WITH_SOXR
 
 SSE_CMAKE_BOOL=		WITH_SSE2
 
+SWSCALE_DESC=		Use SWScale image library for screen resizing (recommended)
+SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
+SWSCALE_CMAKE_BOOL=	WITH_SWSCALE
+
 WAYLAND_DESC=		Build FreeRDP Wayland client
 WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index da1e8a0d13da..31eb352960c8 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616353658
-SHA256 (freerdp-2.3.2.tar.gz) = deb888034a441c7f76dc8b3ddea67fac3c0d815739fc2146e1243480ce56c91c
-SIZE (freerdp-2.3.2.tar.gz) = 7284490
+TIMESTAMP = 1629080374
+SHA256 (freerdp-2.4.0.tar.gz) = 10ec9b06d74182b354ae288c8e621d94c0fb189b0c3b14a59867ab4c414c08b5
+SIZE (freerdp-2.4.0.tar.gz) = 7244549