Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Dec 2024 15:58:54 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: f88acd864793 - main - net/freerdp3: Update 3.9.0 =?utf-8?Q?=E2=86=92?= 3.10.0
Message-ID:  <202412141558.4BEFwssA018206@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=f88acd86479370f71e151a4f0b575011fa99a43a

commit f88acd86479370f71e151a4f0b575011fa99a43a
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-12-14 15:54:05 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-12-14 15:54:05 +0000

    net/freerdp3: Update 3.9.0 → 3.10.0
    
    Changelog:
    https://github.com/FreeRDP/FreeRDP/releases/tag/3.10.0
---
 net/freerdp3/Makefile                              | 37 +++++++++++-----------
 net/freerdp3/distinfo                              | 10 ++++--
 .../patch-channels_rdpdr_client_CMakeLists.txt     | 16 +++++-----
 net/freerdp3/pkg-plist                             |  6 ++++
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile
index 4d3dd8e710ee..8a54c619cd6a 100644
--- a/net/freerdp3/Makefile
+++ b/net/freerdp3/Makefile
@@ -1,11 +1,14 @@
 PORTNAME=	freerdp
-DISTVERSION=	3.9.0
-PORTREVISION=	1
+DISTVERSION=	3.10.0
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	3
 
+PATCH_SITES=	https://github.com/FreeRDP/FreeRDP/commit/
+PATCHFILES+=	9f02fb017f9d84c1a0199a07efe551d162c0986a.patch:-p1 # case insensitive simd check
+PATCHFILES+=	aacb2dd10a41c254883bd33defd26893dbad7630.patch:-p1 # fix heimdal return compat
+
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 WWW=		https://www.freerdp.com/
@@ -15,7 +18,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
-USES=		alias cmake compiler:c++11-lib cpe localbase:ldflags pathfix pkgconfig ssl xorg
+USES=		alias cmake compiler:c++11-lib cpe desktop-file-utils \
+		localbase:ldflags pathfix pkgconfig ssl xorg
 
 BROKEN_SSL=	libressl-devel
 BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
@@ -25,8 +29,9 @@ USE_XORG=	ice sm x11 xext
 
 CMAKE_ON=	CHANNEL_SERIAL 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
+		WITH_FREERDP_DEPRECATED WITH_FREERDP_DEPRECATED_COMMANDLINE \
+		WITH_INSTALL_CLIENT_DESKTOP_FILES WITH_OPENSSL WITH_OSS \
+		WITH_WINPR_DEPRECATED WITH_ZLIB
 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 \
@@ -40,16 +45,15 @@ PLIST_SUB+=	MAJORVERSION="${DISTVERSION:R:R}"
 OPTIONS_DEFINE=			ALSA BROKENFOCUS CUPS FAAC FAAD FDKAAC 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_DEFINE_aarch64=		SIMD
+OPTIONS_DEFINE_amd64=		SIMD
+OPTIONS_DEFINE_armv7=		SIMD
+OPTIONS_DEFINE_i386=		SIMD
 OPTIONS_DEFAULT=		AAD CUPS GSSAPI_HEIMDAL ICU JSON_C KEYBOARD_LAYOUT \
 				MANPAGES SDL SWSCALE TIMEZONE_FILE WAYLAND WEBKIT X11
-OPTIONS_DEFAULT_aarch64=	NEON
-OPTIONS_DEFAULT_amd64=		SSE
-OPTIONS_DEFAULT_armv7=		NEON
+OPTIONS_DEFAULT_aarch64=	SIMD
+OPTIONS_DEFAULT_amd64=		SIMD
+OPTIONS_DEFAULT_armv7=		SIMD
 OPTIONS_GROUP=			CLIPBOARD_IMAGE REQUIRE_JSON
 OPTIONS_GROUP_CLIPBOARD_IMAGE=	JPEG_CB PNG WEBP
 OPTIONS_GROUP_REQUIRE_JSON=	AAD KEYBOARD_LAYOUT TIMEZONE_FILE
@@ -68,7 +72,6 @@ CLIPBOARD_IMAGE_DESC=	Add "to/from" BMP conversion support to clipboard (experim
 FDKAAC_DESC=		Support for FDK-AAC for sound and microphone redirection
 JPEG_CB_DESC=		${JPEG_DESC}
 KEYBOARD_LAYOUT_DESC=	Use keyboard definitions from JSON file
-NEON_DESC=		Enable Media Processing Engine instructions
 OPENH264_DESC=		H.264 video codec support via OpenH264
 PCSC_DESC=		Smart card support (smart card device redirection)
 PKCS11_DESC=		Use security/pkcs11-helper
@@ -139,8 +142,6 @@ LAME_CMAKE_BOOL=	WITH_LAME
 
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
 
-NEON_CMAKE_BOOL=	WITH_NEON
-
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CMAKE_BOOL=	WITH_OPENH264
 
@@ -164,11 +165,11 @@ SDL_USES=		sdl
 SDL_USE=		sdl=sdl2,ttf2,image2
 SDL_CMAKE_BOOL=		WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
 
+SIMD_CMAKE_BOOL=	WITH_SIMD
+
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CMAKE_BOOL=	WITH_SOXR
 
-SSE_CMAKE_BOOL=		WITH_SSE2
-
 SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 SWSCALE_CMAKE_BOOL=	WITH_SWSCALE
 
diff --git a/net/freerdp3/distinfo b/net/freerdp3/distinfo
index fcf3176d4a14..b1fffbb30846 100644
--- a/net/freerdp3/distinfo
+++ b/net/freerdp3/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1729615382
-SHA256 (freerdp-3.9.0.tar.gz) = 2eef25f2b421dbe7b6ca64a96045afe57a4b8c559339baca8cb8528c42518b83
-SIZE (freerdp-3.9.0.tar.gz) = 10308500
+TIMESTAMP = 1734132732
+SHA256 (freerdp-3.10.0.tar.gz) = 8efe23b3ac0d983167b63f01f5440b9c829e7a646bf8cc72f9e14430c61b277f
+SIZE (freerdp-3.10.0.tar.gz) = 10341304
+SHA256 (9f02fb017f9d84c1a0199a07efe551d162c0986a.patch) = 36fb1e8bdffaf8c20da8e93da3c860a2cc71c14e07cfcc35ad044bb45810a799
+SIZE (9f02fb017f9d84c1a0199a07efe551d162c0986a.patch) = 2686
+SHA256 (aacb2dd10a41c254883bd33defd26893dbad7630.patch) = c5ff2e74af3ebc47eadd322ccb102550553105b96169f6027b20251efbc37d53
+SIZE (aacb2dd10a41c254883bd33defd26893dbad7630.patch) = 823
diff --git a/net/freerdp3/files/patch-channels_rdpdr_client_CMakeLists.txt b/net/freerdp3/files/patch-channels_rdpdr_client_CMakeLists.txt
index a0e4df8dcfd4..8ed389eb1d8c 100644
--- a/net/freerdp3/files/patch-channels_rdpdr_client_CMakeLists.txt
+++ b/net/freerdp3/files/patch-channels_rdpdr_client_CMakeLists.txt
@@ -1,10 +1,10 @@
---- channels/rdpdr/client/CMakeLists.txt.orig	2024-09-03 15:27:18 UTC
+--- channels/rdpdr/client/CMakeLists.txt.orig	2024-12-13 18:46:44 UTC
 +++ channels/rdpdr/client/CMakeLists.txt
 @@ -30,6 +30,7 @@ set(${MODULE_PREFIX}_SRCS
- 	irp.h
- 	devman.c
- 	devman.h
-+	mntent_compat.c
- 	rdpdr_main.c
- 	rdpdr_main.h
- 	rdpdr_capabilities.c
+     irp.h
+     devman.c
+     devman.h
++    mntent_compat.c
+     rdpdr_main.c
+     rdpdr_main.h
+     rdpdr_capabilities.c
diff --git a/net/freerdp3/pkg-plist b/net/freerdp3/pkg-plist
index fe725daf86ee..52620406449c 100644
--- a/net/freerdp3/pkg-plist
+++ b/net/freerdp3/pkg-plist
@@ -274,6 +274,10 @@ libdata/pkgconfig/winpr-tools%%MAJORVERSION%%.pc
 libdata/pkgconfig/winpr%%MAJORVERSION%%.pc
 %%JSON%%%%KEYBOARD_LAYOUT%%share/FreeRDP/KeyboardLayoutMap.json
 %%JSON%%%%TIMEZONE_FILE%%share/WinPR/TimeZoneNameMap.json
+share/applications/sdl-freerdp%%MAJORVERSION%%-file.desktop
+share/applications/sdl-freerdp%%MAJORVERSION%%.desktop
+share/applications/xfreerdp%%MAJORVERSION%%-file.desktop
+share/applications/xfreerdp%%MAJORVERSION%%.desktop
 share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientConfig.cmake
 share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientConfigVersion.cmake
 share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -290,6 +294,7 @@ share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsConfig.cmake
 share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsConfigVersion.cmake
 share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets.cmake
+share/icons/hicolor/scalable/apps/FreeRDP.svg
 %%SDL%%%%MANPAGES%%share/man/man1/sdl-freerdp%%MAJORVERSION%%.1.gz
 %%MANPAGES%%share/man/man1/winpr-hash%%MAJORVERSION%%.1.gz
 %%MANPAGES%%share/man/man1/winpr-makecert%%MAJORVERSION%%.1.gz
@@ -297,4 +302,5 @@ share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets.cmake
 %%X11%%%%MANPAGES%%share/man/man1/xfreerdp%%MAJORVERSION%%.1.gz
 %%MANPAGES%%share/man/man7/wlog%%MAJORVERSION%%.7.gz
 @dir include/winpr%%MAJORVERSION%%/CMakeFiles
+@dir include/winpr%%MAJORVERSION%%/cfg
 @dir include/winpr%%MAJORVERSION%%/config



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412141558.4BEFwssA018206>