Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Apr 2019 20:53:29 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r499122 - head/net/freerdp
Message-ID:  <201904162053.x3GKrTqv046482@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Tue Apr 16 20:53:29 2019
New Revision: 499122
URL: https://svnweb.freebsd.org/changeset/ports/499122

Log:
  net/freerdp: add some options
  
  Additionally, pet portlint a bit while I'm here.
  
  PR:		230963
  Submitted by:	Ivan Rozhuk <rozhuk.im@gmail.com>
  Approved by:	kevans (maintainer)

Modified:
  head/net/freerdp/Makefile

Modified: head/net/freerdp/Makefile
==============================================================================
--- head/net/freerdp/Makefile	Tue Apr 16 20:18:37 2019	(r499121)
+++ head/net/freerdp/Makefile	Tue Apr 16 20:53:29 2019	(r499122)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freerdp
 DISTVERSION=	2.0.0-rc4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net comms ipv6
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -15,26 +15,45 @@ COMMENT=	Free implementation of Remote Desktop Protoco
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_SSL=	libressl-devel
+BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
+
 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 gettext gnome localbase pathfix pkgconfig ssl
 USE_LDCONFIG=	yes
+
 CPE_VENDOR=	freerdp_project
 
-BROKEN_SSL=	libressl-devel
-BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	${GH_ACCOUNT}
 
-CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
+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 \
+		${CMAKE_ARGS_${ARCH}}
 
 CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
 CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
 
-OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
-			PULSEAUDIO WAYLAND X11
+OPTIONS_DEFINE=		ALSA CUPS FAAC FAAD FFMPEG GSM \
+			GSTREAMER ICU KERBEROS LAME MANPAGES OPENH264 \
+			PCSC PULSEAUDIO SOXR WAYLAND X11
 OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11
 OPTIONS_SUB=		yes
 
@@ -50,10 +69,19 @@ ALSA_CMAKE_BOOL=	WITH_ALSA
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
+FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
+FAAC_CMAKE_BOOL=	WITH_FAAC
+
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
+FAAD_CMAKE_BOOL=	WITH_FAAD2
+
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
+GSM_CMAKE_BOOL=		WITH_GSM
+
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
 GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr
 GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
@@ -63,6 +91,9 @@ ICU_CMAKE_BOOL=		WITH_ICU
 
 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
@@ -73,9 +104,20 @@ NEON_CMAKE_BOOL=	WITH_NEON
 NEON_CFLAGS=		-march=armv7-a
 .endif
 
+OPENH264_DESC=		H.264 video codec support via OpenH264
+OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
+OPENH264_CMAKE_BOOL=	WITH_OPENH264
+
+PCSC_DESC=		Smart card support (smart card device redirection)
+PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
+PCSC_CMAKE_BOOL=	WITH_PCSC
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
+SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
+SOXR_CMAKE_BOOL=	WITH_SOXR
+
 SSE_CMAKE_BOOL=		WITH_SSE2
 
 WAYLAND_DESC=		Build FreeRDP Wayland client
@@ -86,8 +128,13 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/way
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
 X11_DESC=		Build FreeRDP X11 client
-X11_CMAKE_BOOL=		WITH_X11
-X11_CMAKE_OFF=		-DWITH_XKBFILE=OFF
+X11_CMAKE_ON=		-DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
+			-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
+			-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
+			-DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \
+			-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
+			-DWITH_XV:BOOL=ON
+X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
 X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 
 post-patch:
@@ -105,5 +152,8 @@ post-patch:
 		${WRKSRC}/server/CMakeLists.txt \
 		${WRKSRC}/server/shadow/CMakeLists.txt \
 		${WRKSRC}/libfreerdp/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
+		${WRKSRC}/cmake/FindGSM.cmake \
+		${WRKSRC}/libfreerdp/codec/dsp.c
 
 .include <bsd.port.mk>



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