Date: Fri, 5 Jul 2024 10:32:58 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 96edc74da20b - main - net/freerdp3: update 3.5.1 =?utf-8?Q?=E2=86=92?= 3.6.2 Message-ID: <202407051032.465AWwlK025904@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=96edc74da20b27d99bdf4641bd821507b8bc019b commit 96edc74da20b27d99bdf4641bd821507b8bc019b Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-07-05 10:29:45 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-07-05 10:29:45 +0000 net/freerdp3: update 3.5.1 → 3.6.2 Changelog: https://github.com/FreeRDP/FreeRDP/releases/tag/3.6.2 MFH: 2023Q3 --- net/freerdp3/Makefile | 80 ++++++++++++++++++++++++++++++++++---------------- net/freerdp3/distinfo | 6 ++-- net/freerdp3/pkg-plist | 1 + 3 files changed, 59 insertions(+), 28 deletions(-) diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile index 7017dc74b70b..0f49bd6b23b1 100644 --- a/net/freerdp3/Makefile +++ b/net/freerdp3/Makefile @@ -1,5 +1,5 @@ PORTNAME= freerdp -DISTVERSION= 3.5.1 +DISTVERSION= 3.6.2 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ @@ -26,36 +26,42 @@ 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 \ WITH_FREERDP_DEPRECATED WITH_FREERDP_DEPRECATED_COMMANDLINE WITH_WINPR_DEPRECATED -CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_FUSE 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 \ +CMAKE_OFF= CHANNEL_TSMF WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF WITH_GSTREAMER_0_10 \ + WITH_GSTREAMER_1_0 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_CHANNELS WITH_SERVER_INTERFACE \ WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK +# WITH_WEBVIEW_QT 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_DEFINE= ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG GSM ICU \ + JPEG LAME MANPAGES OPENH264 OPUS PCSC PKCS11 \ + PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11 OPTIONS_DEFINE_aarch64= NEON OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_armv6= NEON OPTIONS_DEFINE_armv7= NEON OPTIONS_DEFINE_i386= SSE -OPTIONS_DEFAULT= AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \ - SDL SWSCALE WAYLAND X11 +OPTIONS_DEFAULT= AAD_JSONC CUPS GSSAPI_HEIMDAL ICU MANPAGES SDL \ + SWSCALE WAYLAND WEBKIT X11 OPTIONS_DEFAULT_aarch64= NEON OPTIONS_DEFAULT_amd64= SSE OPTIONS_DEFAULT_armv7= NEON OPTIONS_GROUP= CLIPBOARD_IMAGE OPTIONS_GROUP_CLIPBOARD_IMAGE= JPEG_CB PNG WEBP -OPTIONS_RADIO= GSSAPI SCALE +OPTIONS_RADIO= AAD GSSAPI SCALE WEBVIEW +OPTIONS_RADIO_AAD= AAD_CJSON AAD_JSONC OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_RADIO_SCALE= CAIRO SWSCALE +OPTIONS_RADIO_WEBVIEW= WEBENGINE WEBKIT OPTIONS_SUB= yes -AAD_DESC= Compile with support for Azure AD authentication +AAD_CJSON_DESC= Use cJSON library (devel/libcjson) +AAD_DESC= Compile with support for Azure AD authentication (require SDL) +AAD_JSONC_DESC= Use JSON-C library (devel/json-c) BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908) CAIRO_DESC= Use CAIRO image library for screen resizing CLIPBOARD_IMAGE_DESC= Add "to/from" BMP conversion support to clipboard (experimental) @@ -68,11 +74,17 @@ SDL_DESC= Build FreeRDP SDL client SWSCALE_DESC= Use SWScale image library for screen resizing (recommended) URIPARSER_DESC= Use uriparser RFC 3986 URI parsing library to handle URIs WAYLAND_DESC= Build FreeRDP Wayland client +WEBVIEW_DESC= Build with WebView support for AAD login popup browser X11_DESC= Build FreeRDP X11 client -AAD_LIB_DEPENDS= libcjson.so:devel/libcjson \ +AAD_CJSON_IMPLIES= SDL +AAD_CJSON_LIB_DEPENDS= libcjson.so:devel/libcjson \ libcjson_utils.so:devel/libcjson -AAD_CMAKE_BOOL= WITH_AAD +AAD_CJSON_CMAKE_BOOL= WITH_AAD WITH_CJSON_REQUIRED + +AAD_JSONC_IMPLIES= ${AAD_CJSON_IMPLIES} +AAD_JSONC_LIB_DEPENDS= libjson-c.so:devel/json-c +AAD_JSONC_CMAKE_BOOL= WITH_AAD WITH_JSONC_REQUIRED ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA @@ -102,11 +114,6 @@ GSM_CMAKE_BOOL= WITH_GSM GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit -GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 -GSTREAMER_USES= gettext gnome gstreamer xorg -GSTREAMER_USE= gnome=glib20 xorg=x11,xext,xorgproto,xrandr -GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF - ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_CMAKE_ON= -DWITH_UNICODE_BUILTIN=OFF ICU_CMAKE_OFF= -DWITH_UNICODE_BUILTIN=ON @@ -144,12 +151,8 @@ PNG_CMAKE_BOOL= WINPR_UTILS_IMAGE_PNG PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE -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_USES= gettext gnome sdl -SDL_USE= gnome=cairo,gdkpixbuf2,glib20,gtk30,pango sdl=sdl2,ttf2,image2 +SDL_USES= sdl +SDL_USE= sdl=sdl2,ttf2,image2 SDL_CMAKE_BOOL= WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr @@ -172,6 +175,18 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ WAYLAND_RUN_DEPENDS= wayland-scanner:graphics/wayland WAYLAND_CMAKE_BOOL= WITH_WAYLAND +WEBENGINE_USES_= qt:5 +WEBENGINE_USE_QT= core declarative gui location network printsupport webchannel webengine widgets +WEBENGINE_CMAKE_BOOL= WITH_WEBVIEW_QT +WEBENGINE_CMAKE_ON= -DWITH_WEBVIEW:BOOL=ON + +WEBKIT_LIB_DEPENDS_= libsoup-2.4.so:devel/libsoup \ + libharfbuzz.so:print/harfbuzz \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 +WEBKIT_USES_= gettext gnome +WEBKIT_USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango +WEBKIT_CMAKE_ON= -DWITH_WEBVIEW:BOOL=ON + WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CMAKE_BOOL= WINPR_UTILS_IMAGE_WEBP @@ -186,6 +201,21 @@ X11_CMAKE_OFF= -DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MAAD_CJSON} || ${PORT_OPTIONS:MAAD_JSONC} +. if ${PORT_OPTIONS:MWEBENGINE} +USES+= ${WEBENGINE_USES_} +USE_QT+= ${WEBENGINE_USE_QT} +. elif ${PORT_OPTIONS:MWEBKIT} +LIB_DEPENDS+= ${WEBKIT_LIB_DEPENDS_} +USES+= ${WEBKIT_USES_} +USE_GNOME+= ${WEBKIT_USE_GNOME} +. else +CMAKE_OFF+= WITH_WEBVIEW +. endif +.else +CMAKE_OFF+= WITH_WEBVIEW +.endif + .if ${PORT_OPTIONS:MGSSAPI_HEIMDAL} || ${PORT_OPTIONS:MGSSAPI_MIT} CMAKE_ON+= WITH_KRB5 .else diff --git a/net/freerdp3/distinfo b/net/freerdp3/distinfo index 890d0eb398ee..9def4ba3ce11 100644 --- a/net/freerdp3/distinfo +++ b/net/freerdp3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713795685 -SHA256 (freerdp-3.5.1.tar.gz) = 28036fd3c7d23ad320fd3eb2463119d1bde0dddb624b5a8353bf43197f1044c0 -SIZE (freerdp-3.5.1.tar.gz) = 9338947 +TIMESTAMP = 1720089587 +SHA256 (freerdp-3.6.2.tar.gz) = aa15e9bc0df0886048edc8b0dad8537f57066a624db4bc0edae583f3a6322fde +SIZE (freerdp-3.6.2.tar.gz) = 10195789 diff --git a/net/freerdp3/pkg-plist b/net/freerdp3/pkg-plist index da59a47b4968..eb59e12a7427 100644 --- a/net/freerdp3/pkg-plist +++ b/net/freerdp3/pkg-plist @@ -212,6 +212,7 @@ include/winpr%%MAJORVERSION%%/winpr/input.h include/winpr%%MAJORVERSION%%/winpr/interlocked.h include/winpr%%MAJORVERSION%%/winpr/intrin.h include/winpr%%MAJORVERSION%%/winpr/io.h +include/winpr%%MAJORVERSION%%/winpr/json.h include/winpr%%MAJORVERSION%%/winpr/library.h include/winpr%%MAJORVERSION%%/winpr/memory.h include/winpr%%MAJORVERSION%%/winpr/ncrypt.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407051032.465AWwlK025904>