Attachment 223491 Details for Bug 253880 – Update to 2.3.2, CMAKE_ARGS => CMAKE_ON & CMAKE_OFF, take maintainership (v6)

[patch] Update to 2.3.2, CMAKE_ARGS => CMAKE_ON & CMAKE_OFF, take maintainership (v6)

freerdp_v6.diff (text/plain), 3.84 KB, created by Vladimir Druzenko on 2021-03-21 19:21:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-03-21 19:21:15 UTC

Size: 3.84 KB

patch

obsolete

>diff -ur net/freerdp.orig/Makefile net/freerdp/Makefile
>--- net/freerdp.orig/Makefile
>+++ net/freerdp/Makefile
>@@ -2,13 +2,12 @@
> # $FreeBSD: head/net/freerdp/Makefile 556318 2020-11-26 00:54:44Z jbeich $
> 
> PORTNAME=	freerdp
>-DISTVERSION=	2.2.0
>-PORTREVISION=	3
>+DISTVERSION=	2.3.2
> CATEGORIES=	net comms
> MASTER_SITES=   https://pub.freerdp.com/releases/ \
> 		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
> 
>-MAINTAINER=	kevans@FreeBSD.org
>+MAINTAINER=	vvd@unislabs.com
> COMMENT=	Free implementation of Remote Desktop Protocol
> 
> LICENSE=	APACHE20
>@@ -30,32 +29,20 @@
> PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
> PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
> 
>-CMAKE_ARGS+=	-DWITH_CHANNELS:BOOL=ON \
>-		-DWITH_DIRECTFB:BOOL=OFF \
>-		-DWITH_DSP_EXPERIMENTAL:BOOL=OFF \
>-		-DWITH_DSP_FFMPEG:BOOL=OFF -DWITH_GPROF:BOOL=OFF \
>-		-DWITH_GSTREAMER_0_10:BOOL=OFF -DWITH_IPP:BOOL=OFF \
>-		-DWITH_JPEG:BOOL=OFF -DWITH_LIBSYSTEMD:BOOL=OFF \
>-		-DWITH_MBEDTLS:BOOL=OFF -DWITH_OPENSLES=OFF \
>-		-DWITH_OPENSSL:BOOL=ON -DWITH_OSS=ON \
>-		-DWITH_PROFILER:BOOL=OFF -DWITH_SAMPLE:BOOL=OFF \
>-		-DWITH_SANITIZE_ADDRESS:BOOL=OFF \
>-		-DWITH_SANITIZE_MEMORY:BOOL=OFF \
>-		-DWITH_SANITIZE_THREAD:BOOL=OFF -DWITH_SERVER:BOOL=OFF \
>-		-DWITH_SERVER_INTERFACE:BOOL=OFF \
>-		-DWITH_SMARTCARD_INSPECT:BOOL=OFF \
>-		-DWITH_THIRD_PARTY:BOOL=OFF \
>-		-DWITH_VALGRIND_MEMCHECK:BOOL=OFF -DWITH_X264:BOOL=OFF \
>-		-DWITH_ZLIB:BOOL=ON \
>-		-DCHANNEL_URBDRC_CLIENT:BOOL=ON \
>-		${CMAKE_ARGS_${ARCH}}
>+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_ARGS_aarch64=	-DWITH_NEON=ON
>-CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
>+CMAKE_ARGS_aarch64+=	-DWITH_NEON=ON
>+CFLAGS_aarch64+=	-D__ARM_NEON__=__ARM_NEON # clang
> 
>-OPTIONS_DEFINE=		ALSA CUPS FAAC FAAD FFMPEG GSM \
>-			GSTREAMER ICU KERBEROS LAME MANPAGES OPENH264 \
>-			PCSC PULSEAUDIO SOXR WAYLAND X11
>+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_SUB=		yes
> 
>@@ -91,6 +78,9 @@
> 
> ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
> ICU_CMAKE_BOOL=		WITH_ICU
>+
>+JPEG_USES=		jpeg
>+JPEG_CMAKE_BOOL=	WITH_JPEG
> 
> KERBEROS_CMAKE_BOOL=	WITH_GSSAPI_HEIMDAL
> 
>diff -ur net/freerdp.orig/distinfo net/freerdp/distinfo
>--- net/freerdp.orig/distinfo
>+++ net/freerdp/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1595498870
>-SHA256 (freerdp-2.2.0.tar.gz) = 19b30759e324ce7a9767af880116a4c571761e9ad9c5d6c98c5b302ff8c24c6c
>-SIZE (freerdp-2.2.0.tar.gz) = 6878427
>+TIMESTAMP = 1616353658
>+SHA256 (freerdp-2.3.2.tar.gz) = deb888034a441c7f76dc8b3ddea67fac3c0d815739fc2146e1243480ce56c91c
>+SIZE (freerdp-2.3.2.tar.gz) = 7284490
>diff -ur net/freerdp.orig/pkg-descr net/freerdp/pkg-descr
>--- net/freerdp.orig/pkg-descr
>+++ net/freerdp/pkg-descr
>@@ -3,4 +3,4 @@
> software wherever you want, the way you want it, in a world where
> interoperability can finally liberate your computing experience.
> 
>-WWW: http://www.freerdp.com
>+WWW: https://www.freerdp.com/
>diff -ur net/freerdp.orig/pkg-plist net/freerdp/pkg-plist
>--- net/freerdp.orig/pkg-plist
>+++ net/freerdp/pkg-plist
>@@ -20,6 +20,7 @@
> include/freerdp2/freerdp/channels/channels.h
> include/freerdp2/freerdp/channels/cliprdr.h
> include/freerdp2/freerdp/channels/disp.h
>+include/freerdp2/freerdp/channels/echo.h
> include/freerdp2/freerdp/channels/encomsp.h
> include/freerdp2/freerdp/channels/geometry.h
> include/freerdp2/freerdp/channels/log.h

Flags:

vvd: maintainer-approval+

Actions: View | Diff

Attachments on bug 253880: 222854 | 222859 | 222860 | 223106 | 223273 | 223491