net/freerdp: update to 2.11.4 and small sort out of build options

Changelog: https://github.com/FreeRDP/FreeRDP/blob/2.11.4/ChangeLog WITH_GSSAPI_HEIMDAL doesn't work without WITH_GSSAPI, but build fails with WITH_GSSAPI. It fixed in released few days ago 3.0.0 and I have patch already, but consumers of the FreeRDP doesn't support 3.x yet: multimedia/vlc, net/gnome-connections, net/guacamole-server, net/remmina. USES=gettext used by GSTREAMER only. Approved by: arrowd (mentor, implicit) MFH: 2023Q4
freebsd · Dec 18, 2023 · 38f4049 · 38f4049
1 parent 1f05884
commit 38f4049
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
@@ -1,15 +1,12 @@
 PORTNAME=	freerdp
-DISTVERSION=	2.11.2
-PORTREVISION=	2
+DISTVERSION=	2.11.4
 CATEGORIES=	net comms
 MASTER_SITES=	https://pub.freerdp.com/releases/ \
 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 
 PATCH_SITES=	https://github.com/FreeRDP/FreeRDP/commit/
 PATCHFILES+=	61983cd6dcb86097d91b7ef405abc1266444a368.patch:-p1 # ffmpeg6 support: AVPicture
 								   # https://github.com/FreeRDP/FreeRDP/pull/8941
-PATCHFILES+=	b27b20b2a27217be44fbc5d734299dc45572a207.patch:-p1 # Advertise Image RFX GUID when rfx-mode:image
-								   # https://github.com/FreeRDP/FreeRDP/pull/9428
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
@@ -23,15 +20,15 @@ BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispa
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
-USES=		alias cmake compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
+USES=		alias cmake compiler:c++11-lib cpe localbase pathfix pkgconfig ssl
 USE_LDCONFIG=	yes
 
 PATCHVERSION=	${PORTVERSION}
 MAJORVERSION=	${PORTVERSION:R:R}
 
 CMAKE_ARGS+=	${CMAKE_ARGS_${ARCH}}
 CMAKE_ON=	WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB CHANNEL_URBDRC_CLIENT
-CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \
+CMAKE_OFF=	WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSSAPI 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 \
@@ -44,9 +41,9 @@ PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
 PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
 
 OPTIONS_DEFINE=		ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG GSM GSTREAMER \
-			ICU JPEG KERBEROS LAME MANPAGES OPENH264 PCSC \
+			ICU JPEG LAME MANPAGES OPENH264 PCSC \
 			PULSEAUDIO SOXR WAYLAND X11
-OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES SWSCALE WAYLAND X11
+OPTIONS_DEFAULT=	CUPS GSTREAMER ICU MANPAGES SWSCALE WAYLAND X11
 OPTIONS_RADIO=		SCALE
 OPTIONS_RADIO_SCALE=	CAIRO SWSCALE
 OPTIONS_SUB=		yes
@@ -84,7 +81,7 @@ GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		WITH_GSM
 
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0 CHANNEL_TSMF
-GSTREAMER_USES=		gnome gstreamer xorg
+GSTREAMER_USES=		gettext gnome gstreamer xorg
 GSTREAMER_USE=		gnome=glib20 xorg=x11,xext,xorgproto,xrandr
 GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
 
@@ -94,14 +91,11 @@ ICU_CMAKE_BOOL=		WITH_ICU
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG
 
-KERBEROS_CMAKE_BOOL=	WITH_GSSAPI_HEIMDAL
-
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_BOOL=	WITH_LAME
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
-MANPAGES_CMAKE_OFF=	-DWITH_MANPAGES=OFF
 
 NEON_DESC=		Enable	Media Processing Engine instructions
 NEON_CMAKE_BOOL=	WITH_NEON
@@ -114,6 +108,7 @@ OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CMAKE_BOOL=	WITH_OPENH264
 
 PCSC_DESC=		Smart card support (smart card device redirection)
+# LoadLibraryA("libpcsclite.so")
 PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 PCSC_CMAKE_BOOL=	WITH_PCSC
 

diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1695981844
-SHA256 (freerdp-2.11.2.tar.gz) = 17e36553065cb59126f8fee987ec74783db50232b361574dac86b7a768dea3b4
-SIZE (freerdp-2.11.2.tar.gz) = 7326213
+TIMESTAMP = 1702863387
+SHA256 (freerdp-2.11.4.tar.gz) = 2534e5bc53e3fd1b55611c0753a7c2b73242da33f058771cbf053e4f77483146
+SIZE (freerdp-2.11.4.tar.gz) = 7380487
 SHA256 (61983cd6dcb86097d91b7ef405abc1266444a368.patch) = be68ff4ab63c15592ff576af34d4592340b70e7b6d7b5ef3cfe5ba97b5fdccf2
 SIZE (61983cd6dcb86097d91b7ef405abc1266444a368.patch) = 2826
-SHA256 (b27b20b2a27217be44fbc5d734299dc45572a207.patch) = 41d2bdaf0ef3f2a8a7470697bcc57cb5ceb75b7bd2993940fe260f910a1e2385
-SIZE (b27b20b2a27217be44fbc5d734299dc45572a207.patch) = 909