Attachment #177362 for bug #212004




# Created by: Alexander Logvinov <avl@FreeBSD.org>
# $FreeBSD$

PORTNAME=	freerdp
PORTVERSION=	2.0.0.g2016.11.24
PORTREVISION=	7
CATEGORIES=	net comms ipv6

MAINTAINER=	bsdports@kyle-evans.net

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_LDCONFIG=	yes
USES=		alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib ssl
USE_GITHUB=	yes
GH_ACCOUNT=	FreeRDP
GH_PROJECT=	${GH_ACCOUNT}
GH_TAGNAME=	2a6dbab

USES=		alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl
USE_LDCONFIG=	yes
CPE_VENDOR=	freerdp_project

CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF -DARM_FP_ABI=hard
CFLAGS+=	-I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include

OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11
OPTIONS_DEFAULT=	CUPS GSTREAMER X11
OPTIONS_SUB=		yes

OPTIONS_DEFINE_armv6=	NEON
OPTIONS_DEFINE_aarch64=	NEON

ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL=	WITH_ALSA
ALSA_CMAKE_OFF=		-DWITH_ALSA=OFF

CUPS_LIB_DEPENDS=	libcups.so:print/cups
CUPS_CMAKE_BOOL=	WITH_CUPS
CUPS_CMAKE_OFF=		-DWITH_CUPS=OFF

# outdated and unmaintained upstream
DIRECTFB_DESC=		Build FreeRDP DirectFB client (outdated)
DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
DIRECTFB_CMAKE_ON=	-DWITH_DIRECTFB=ON
DIRECTFB_CMAKE_OFF=	-DWITH_DIRECTFB=OFF
# currently DirectFB option fails with clang
DIRECTFB_USE=		gcc=yes

FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
			libavutil.so:multimedia/ffmpeg
FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF

GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr
GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1

NEON_DESC=		Enable	Media Processing Engine instructions
NEON_CMAKE_BOOL=	WITH_NEON
NEON_CFLAGS=		-march=armv7-a

PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE=OFF

SSE_CMAKE_BOOL=		WITH_SSE2
SSE_CMAKE_OFF=		-DWITH_SSE2=OFF

X11_DESC=		Build FreeRDP X11 client
X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
X11_CMAKE_ON=		-DWITH_XKBDFILE=OFF
X11_CMAKE_BOOL=		WITH_X11
X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes,xrender
			xcursor,xrandr,xi,xfixes,xrender

post-patch:
	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
post-extract:
	${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
		-e '/CMAKE_INSTALL_RPATH /d' \
		${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \
		${WRKSRC}/winpr/CMakeLists.txt \
		${WRKSRC}/client/X11/CMakeLists.txt
	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
		${WRKSRC}/channels/drive/client/statvfs.c
	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net/freerdp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470755086	1	TIMESTAMP = 1480005507
2	SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32	2	SHA256 (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 2a8550c3b067f49353614c4dc13fff4b2c0cf7653dd765c8e44eccaf8c79f20b
3	SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856	3	SIZE (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 6417326




--- CMakeLists.txt.orig	2016-11-24 13:19:47 UTC
+++ CMakeLists.txt
@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
 		set(FREEBSD TRUE)
 	endif()
 endif()
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+	set(BSD TRUE)
+	set(FREEBSD TRUE)
+endif()
+
 # Configure MSVC Runtime
 if(MSVC)
 	include(MSVCRuntime)

Lines 1-11 Link Here

(-)net/freerdp/files/patch-cmake-FindOpenSSL.cmake (-11 lines)
1	--- cmake/FindOpenSSL.cmake.orig 2013-07-10 04:00:21.000000000 -0400
2	+++ cmake/FindOpenSSL.cmake 2015-03-25 19:26:35.154024000 -0400
3	@@ -270,7 +270,7 @@
4	set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
5	elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
6	file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
7	- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
8	+ REGEX "^#[\t ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.")
9
10	# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
11	# The status gives if this is a developer or prerelease and is ignored here.

Lines 1-11 Link Here

(-)net/freerdp/files/patch-cmake_ConfigOptions.cmake (-11 lines)
1	--- cmake/ConfigOptions.cmake.orig 2015-11-29 19:53:58 UTC
2	+++ cmake/ConfigOptions.cmake
3	@@ -6,7 +6,7 @@ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "
4	elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE))
5	# Mac is weird like that.
6	set(TARGET_ARCH "x64")
7	-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
8	+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*")
9	set(TARGET_ARCH "ARM")
10	endif()
11




Don't use custom code to find the include dirs for gstreamer 1.0 (core).
Since 1.6.0 there are multiple include paths. So use pkg-config to find
which. IMO the rest of this file should use pkg-config....

--- cmake/FindGStreamer_1_0.cmake.orig	2015-06-26 15:30:00.000000000 +0200
+++ cmake/FindGStreamer_1_0.cmake	2015-09-27 10:43:55.754514000 +0200
@@ -78,7 +78,8 @@
 # 1.1. Find headers and libraries
 set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
 find_package(Glib REQUIRED)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
 
 # 1.2. Check Gstreamer version




Since 1.6.0 there are multiple include paths. So use pkg-config to find
which. IMO the rest of this file should use pkg-config....

--- cmake/FindGStreamer_1_0.cmake.orig	2016-10-21 07:29:51 UTC
+++ cmake/FindGStreamer_1_0.cmake
@@ -78,7 +78,8 @@ endmacro()
 # 1.1. Find headers and libraries
 set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
 find_package(Glib REQUIRED)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
 
 # 1.2. Check Gstreamer version




--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2016-10-21 07:29:51 UTC
+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
 		av_picture_copy((AVPicture*) frame, (AVPicture*) mdecoder->frame,
 						mdecoder->codec_context->pix_fmt,
 						mdecoder->codec_context->width, mdecoder->codec_context->height);
-		av_free(frame);
+		av_frame_free(&frame);
 	}
 	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
-	mdecoder->frame = avcodec_alloc_frame();
+	mdecoder->frame = av_frame_alloc();
 	return TRUE;
 }
 
@@ -322,14 +322,14 @@
 									 mdecoder->codec_context->width, mdecoder->codec_context->height);
 			mdecoder->decoded_data = malloc(mdecoder->decoded_size);
 			ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
-			frame = avcodec_alloc_frame();
+			frame = av_frame_alloc();
 			avpicture_fill((AVPicture *) frame, mdecoder->decoded_data,
 						   mdecoder->codec_context->pix_fmt,
 						   mdecoder->codec_context->width, mdecoder->codec_context->height);
 			av_picture_copy((AVPicture *) frame, (AVPicture *) mdecoder->frame,
 							mdecoder->codec_context->pix_fmt,
 							mdecoder->codec_context->width, mdecoder->codec_context->height);
-			av_free(frame);
+			av_frame_free(&frame);
 		}
 	return ret;
@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
@@ -385,7 +385,7 @@
 									(int16_t *) dst, &frame_size, src, src_size);
 #else
 		{
-			AVFrame *decoded_frame = avcodec_alloc_frame();
+			AVFrame *decoded_frame = av_frame_alloc();
 			int got_frame = 0;
 			AVPacket pkt;
 			av_init_packet(&pkt);
@@ -398,7 +398,7 @@
 														decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);
 				memcpy(dst, decoded_frame->data[0], frame_size);
 			}

+			av_frame_free(&decoded_frame);
 		}
 #endif
 		if (len <= 0 || frame_size <= 0)
@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
 	TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder;
 	switch(mdecoder->codec_context->pix_fmt)
 	{
-		case PIX_FMT_YUV420P:
+		case AV_PIX_FMT_YUV420P:
 			return RDP_PIXFMT_I420;
 		default:
 			CLOG_ERR("unsupported pixel format %u",
@@ -492,7 +492,7 @@
 {
 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
 	if (mdecoder->frame)
-		av_free(mdecoder->frame);
+		av_frame_free(&mdecoder->frame);
 
 	free(mdecoder->decoded_data);
 
@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
 			avcodec_close(mdecoder->codec_context);
 
 		free(mdecoder->codec_context->extradata);
-		av_free(mdecoder->codec_context);
+		av_frame_free(&mdecoder->codec_context);
 	}




Index: freerdp.pc.in
diff -u freerdp.pc.in.orig freerdp.pc.in
--- freerdp.pc.in.orig	2014-09-12 07:46:32.000000000 +0900
+++ freerdp.pc.in	2015-05-26 02:05:37.874925433 +0900
@@ -9,7 +9,7 @@
 URL: http://www.freerdp.com/
 Version: @FREERDP_VERSION_FULL@
 Requires: 
-Requires.private: winpr zlib libssl
+Requires.private: winpr
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lpthread
 Cflags: -I${includedir}




The patch below comes from upstream and has been slightly adjusted to apply
on the tarball we build.

From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
Date: Fri, 12 Dec 2014 18:26:45 +0100
Subject: [PATCH] build: cmake 3.1 compatibility

* fix problem with REMOVE_DUPLICATES on undefined lists
* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
  previously - necessary adoptions for regex and matches done. Should
	work with all cmake versions.

Tested with 3.1.0-rc3
--- channels/CMakeLists.txt
+++ channels/CMakeLists.txt
@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake")
 file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
 
 foreach(FILEPATH ${FILEPATHS})
-	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
-		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
+	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
+		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
 		set(CHANNEL_OPTION)
 		include(${FILEPATH})
 		if(${CHANNEL_OPTION})
--- channels/client/CMakeLists.txt
+++ channels/client/CMakeLists.txt
@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/addin.c
 	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
 
+if(CHANNEL_STATIC_CLIENT_ENTRIES)
 list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
+endif()
 
 foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
 	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
--- third-party/CMakeLists.txt
+++ third-party/CMakeLists.txt
@@ -22,11 +22,11 @@
 file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
 
 foreach(dir ${all_valid_subdirs})
-	if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
-		string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
+	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
+		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
 		message(STATUS "Adding third-party component ${dir_trimmed}")
 		add_subdirectory(${dir_trimmed})
 	endif()
 endforeach(dir)
 
-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
\ No newline at end of file
+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)




From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001
From: ivan-83 <rozhuk.im@gmail.com>
Date: Tue, 10 Mar 2015 01:21:28 +0300
Subject: [PATCH] * BSD/FreeBSD build fix

---
 CMakeLists.txt                      | 14 ++++++++++++++
 winpr/libwinpr/synch/wait.c         |  2 +-
 winpr/libwinpr/sysinfo/sysinfo.c    |  1 +
 winpr/libwinpr/utils/CMakeLists.txt |  4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff CMakeLists.txt CMakeLists.txt
index 0a9144a..386ae67 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -358,6 +358,14 @@ if(APPLE)
 	endif()
 endif(APPLE)
 
+# BSD
+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+	set(BSD TRUE)
+	if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+		set(FREEBSD TRUE)
+	endif()
+endif()
+
 # Android
 if(ANDROID)
   set(WITH_LIBRARY_VERSIONING "OFF")
@@ -618,6 +626,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions")
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+if(BSD)
+	if(IS_DIRECTORY /usr/local/include)
+		include_directories(/usr/local/include)
+		link_directories(/usr/local/lib)
+	endif()
+endif()
 
 # Configure files
 add_definitions("-DHAVE_CONFIG_H")
diff winpr/libwinpr/sysinfo/sysinfo.c winpr/libwinpr/sysinfo/sysinfo.c
index 1529d54..457ab9d 100644
--- winpr/libwinpr/sysinfo/sysinfo.c
+++ winpr/libwinpr/sysinfo/sysinfo.c
@@ -54,6 +54,7 @@
 #ifndef _WIN32
 
 #include <time.h>
+#include <sys/time.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff winpr/libwinpr/utils/CMakeLists.txt winpr/libwinpr/utils/CMakeLists.txt
index e524bf9..501f605 100644
--- winpr/libwinpr/utils/CMakeLists.txt
+++ winpr/libwinpr/utils/CMakeLists.txt
@@ -113,6 +113,10 @@ if(UNIX)
 	winpr_library_add(m)
 endif()
 
+if(BSD)
+	winpr_library_add(execinfo)
+endif()
+
 if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
-- 
2.4.1





From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001
From: ivan-83 <rozhuk.im@gmail.com>
Date: Tue, 10 Mar 2015 04:40:47 +0300
Subject: [PATCH] * FreeBSD timezone detection patch

---
 libfreerdp/locale/timezone.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff libfreerdp/locale/timezone.c libfreerdp/locale/timezone.c
index 92b74e8..0375f9c 100644
--- libfreerdp/locale/timezone.c
+++ libfreerdp/locale/timezone.c
@@ -1521,8 +1523,11 @@ char* freerdp_get_unix_timezone_identifier()
 		return tzid;
 	}
 
+#ifdef __FreeBSD__
+	fp = fopen("/var/db/zoneinfo", "r");
+#else
 	fp = fopen("/etc/timezone", "r");
-
+#endif
 	if (fp != NULL)
 	{
 		fseek(fp, 0, SEEK_END);
@@ -1678,8 +1683,10 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone)
 
 #ifdef HAVE_TM_GMTOFF
 	#if defined(__FreeBSD__)
-		/*not the best solution, but could not get the right tyepcast*/
-		clientTimeZone->bias = 0;
+		if (local_time->tm_gmtoff >= 0)
+			clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
+		else
+			clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
 	#else
 		clientTimeZone->bias = timezone / 60;
 	#endif
-- 
2.4.1





--- libfreerdp/freerdp.pc.in.orig	2016-10-21 07:29:51 UTC
+++ libfreerdp/freerdp.pc.in
@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P
+++ freerdp.pc.in	2015-05-26 02:05:37.874925433 +0900
@@ -9,7 +9,7 @@
 URL: http://www.freerdp.com/
 Version: @FREERDP_VERSION@
 Requires: 
-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ libssl
+Requires.private: @WINPR_PKG_CONFIG_FILENAME@
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lpthread
 Cflags: -I${includedir}




Index: winpr.pc.in
diff -u winpr.pc.in.orig winpr.pc.in
--- winpr.pc.in.orig	2014-09-12 07:46:32.000000000 +0900
+++ winpr.pc.in	2015-05-26 02:05:59.353925013 +0900
@@ -9,7 +9,6 @@
 URL: http://www.freerdp.com/
 Version: @WINPR_VERSION_FULL@
 Requires: 
-Requires.private: zlib libssl
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lrt -lm -lpthread
 Cflags: -I${includedir}




--- winpr/winpr.pc.in.orig	2016-10-21 07:29:51 UTC
+++ winpr/winpr.pc.in
@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run
+++ winpr.pc.in	2015-05-26 02:05:59.353925013 +0900
@@ -9,7 +9,6 @@
 URL: http://www.freerdp.com/
 Version: @WINPR_VERSION@
 Requires:
-Requires.private: libssl
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lrt -lm -lpthread
 Cflags: -I${includedir}




--- CMakeLists.txt.intermediate	2015-06-06 13:17:20 UTC
+++ CMakeLists.txt
@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
 		set(FREEBSD TRUE)
 	endif()
 endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+	set(BSD TRUE)
+	set(FREEBSD TRUE)
+endif()
 
 # Android
 if(ANDROID)




bin/winpr-hash
bin/winpr-makecert
%%X11%%bin/xfreerdp
include/freerdp2/freerdp/addin.h
include/freerdp2/freerdp/altsec.h
include/freerdp2/freerdp/api.h
include/freerdp2/freerdp/assistance.h
include/freerdp2/freerdp/autodetect.h
include/freerdp2/freerdp/build-config.h
include/freerdp2/freerdp/cache/bitmap.h
include/freerdp2/freerdp/cache/brush.h
include/freerdp2/freerdp/cache/cache.h
include/freerdp2/freerdp/cache/glyph.h
include/freerdp2/freerdp/cache/nine_grid.h
include/freerdp2/freerdp/cache/offscreen.h
include/freerdp2/freerdp/cache/palette.h
include/freerdp2/freerdp/cache/pointer.h
include/freerdp2/freerdp/channels/audin.h
include/freerdp2/freerdp/channels/channels.h
include/freerdp2/freerdp/channels/cliprdr.h
include/freerdp2/freerdp/channels/encomsp.h
include/freerdp2/freerdp/channels/log.h
include/freerdp2/freerdp/channels/rail.h
include/freerdp2/freerdp/channels/rdpdr.h
include/freerdp2/freerdp/channels/rdpei.h
include/freerdp2/freerdp/channels/rdpgfx.h
include/freerdp2/freerdp/channels/rdpsnd.h
include/freerdp2/freerdp/channels/remdesk.h
include/freerdp2/freerdp/channels/tsmf.h
include/freerdp2/freerdp/channels/wtsvc.h
include/freerdp2/freerdp/client.h
include/freerdp2/freerdp/client/audin.h
include/freerdp2/freerdp/client/channels.h
include/freerdp2/freerdp/client/cliprdr.h
include/freerdp2/freerdp/client/cmdline.h
include/freerdp2/freerdp/client/disp.h
include/freerdp2/freerdp/client/drdynvc.h
include/freerdp2/freerdp/client/encomsp.h
include/freerdp2/freerdp/client/file.h
include/freerdp2/freerdp/client/rail.h
include/freerdp2/freerdp/client/rdpei.h
include/freerdp2/freerdp/client/rdpgfx.h
include/freerdp2/freerdp/client/rdpsnd.h
include/freerdp2/freerdp/client/remdesk.h
include/freerdp2/freerdp/client/tsmf.h
include/freerdp2/freerdp/codec/audio.h
include/freerdp2/freerdp/codec/bitmap.h
include/freerdp2/freerdp/codec/bulk.h
include/freerdp2/freerdp/codec/clear.h
include/freerdp2/freerdp/codec/color.h
include/freerdp2/freerdp/codec/dsp.h
include/freerdp2/freerdp/codec/h264.h
include/freerdp2/freerdp/codec/interleaved.h
include/freerdp2/freerdp/codec/jpeg.h
include/freerdp2/freerdp/codec/mppc.h
include/freerdp2/freerdp/codec/ncrush.h
include/freerdp2/freerdp/codec/nsc.h
include/freerdp2/freerdp/codec/planar.h
include/freerdp2/freerdp/codec/progressive.h
include/freerdp2/freerdp/codec/region.h
include/freerdp2/freerdp/codec/rfx.h
include/freerdp2/freerdp/codec/xcrush.h
include/freerdp2/freerdp/codec/zgfx.h
include/freerdp2/freerdp/codecs.h
include/freerdp2/freerdp/constants.h
include/freerdp2/freerdp/crypto/ber.h
include/freerdp2/freerdp/crypto/certificate.h
include/freerdp2/freerdp/crypto/crypto.h
include/freerdp2/freerdp/crypto/der.h
include/freerdp2/freerdp/crypto/er.h
include/freerdp2/freerdp/crypto/per.h
include/freerdp2/freerdp/crypto/tls.h
include/freerdp2/freerdp/dvc.h
include/freerdp2/freerdp/error.h
include/freerdp2/freerdp/event.h
include/freerdp2/freerdp/extension.h
include/freerdp2/freerdp/freerdp.h
include/freerdp2/freerdp/gdi/bitmap.h
include/freerdp2/freerdp/gdi/dc.h
include/freerdp2/freerdp/gdi/gdi.h
include/freerdp2/freerdp/gdi/gfx.h
include/freerdp2/freerdp/gdi/pen.h
include/freerdp2/freerdp/gdi/region.h
include/freerdp2/freerdp/gdi/shape.h
include/freerdp2/freerdp/graphics.h
include/freerdp2/freerdp/input.h
include/freerdp2/freerdp/listener.h
include/freerdp2/freerdp/locale/keyboard.h
include/freerdp2/freerdp/locale/locale.h
include/freerdp2/freerdp/log.h
include/freerdp2/freerdp/message.h
include/freerdp2/freerdp/metrics.h
include/freerdp2/freerdp/peer.h
include/freerdp2/freerdp/pointer.h
include/freerdp2/freerdp/primary.h
include/freerdp2/freerdp/primitives.h
include/freerdp2/freerdp/rail.h
include/freerdp2/freerdp/scancode.h
include/freerdp2/freerdp/secondary.h
include/freerdp2/freerdp/server/audin.h
include/freerdp2/freerdp/server/channels.h
include/freerdp2/freerdp/server/cliprdr.h
include/freerdp2/freerdp/server/drdynvc.h
include/freerdp2/freerdp/server/echo.h
include/freerdp2/freerdp/server/encomsp.h
include/freerdp2/freerdp/server/rdpdr.h
include/freerdp2/freerdp/server/rdpei.h
include/freerdp2/freerdp/server/rdpgfx.h
include/freerdp2/freerdp/server/rdpsnd.h
include/freerdp2/freerdp/server/remdesk.h
include/freerdp2/freerdp/server/shadow.h
include/freerdp2/freerdp/session.h
include/freerdp2/freerdp/settings.h
include/freerdp2/freerdp/svc.h
include/freerdp2/freerdp/types.h
include/freerdp2/freerdp/update.h
include/freerdp2/freerdp/utils/msusb.h
include/freerdp2/freerdp/utils/passphrase.h
include/freerdp2/freerdp/utils/pcap.h
include/freerdp2/freerdp/utils/profiler.h
include/freerdp2/freerdp/utils/ringbuffer.h
include/freerdp2/freerdp/utils/signal.h
include/freerdp2/freerdp/utils/stopwatch.h
include/freerdp2/freerdp/version.h
include/freerdp2/freerdp/window.h
include/winpr2/winpr/asn1.h
include/winpr2/winpr/bcrypt.h
include/winpr2/winpr/bitstream.h
include/winpr2/winpr/clipboard.h
include/winpr2/winpr/cmdline.h
include/winpr2/winpr/collections.h
include/winpr2/winpr/comm.h
include/winpr2/winpr/credentials.h
include/winpr2/winpr/credui.h
include/winpr2/winpr/crt.h
include/winpr2/winpr/crypto.h
include/winpr2/winpr/debug.h
include/winpr2/winpr/dsparse.h
include/winpr2/winpr/endian.h
include/winpr2/winpr/environment.h
include/winpr2/winpr/error.h
include/winpr2/winpr/file.h
include/winpr2/winpr/handle.h
include/winpr2/winpr/heap.h
include/winpr2/winpr/image.h
include/winpr2/winpr/ini.h
include/winpr2/winpr/input.h
include/winpr2/winpr/interlocked.h
include/winpr2/winpr/intrin.h
include/winpr2/winpr/io.h
include/winpr2/winpr/library.h
include/winpr2/winpr/locale.h
include/winpr2/winpr/memory.h
include/winpr2/winpr/midl.h
include/winpr2/winpr/ndr.h
include/winpr2/winpr/nt.h
include/winpr2/winpr/ntlm.h
include/winpr2/winpr/pack.h
include/winpr2/winpr/path.h
include/winpr2/winpr/pipe.h
include/winpr2/winpr/platform.h
include/winpr2/winpr/pool.h
include/winpr2/winpr/print.h
include/winpr2/winpr/registry.h
include/winpr2/winpr/rpc.h
include/winpr2/winpr/sam.h
include/winpr2/winpr/schannel.h
include/winpr2/winpr/security.h
include/winpr2/winpr/shell.h
include/winpr2/winpr/smartcard.h
include/winpr2/winpr/spec.h
include/winpr2/winpr/ssl.h
include/winpr2/winpr/sspi.h
include/winpr2/winpr/sspicli.h
include/winpr2/winpr/stream.h
include/winpr2/winpr/string.h
include/winpr2/winpr/synch.h
include/winpr2/winpr/sysinfo.h
include/winpr2/winpr/tchar.h
include/winpr2/winpr/thread.h
include/winpr2/winpr/timezone.h
include/winpr2/winpr/tools/makecert.h
include/winpr2/winpr/user.h
include/winpr2/winpr/version.h
include/winpr2/winpr/windows.h
include/winpr2/winpr/winhttp.h
include/winpr2/winpr/winpr.h
include/winpr2/winpr/winsock.h
include/winpr2/winpr/wlog.h
include/winpr2/winpr/wnd.h
include/winpr2/winpr/wtsapi.h
include/winpr2/winpr/wtypes.h
lib/cmake/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
lib/cmake/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
lib/cmake/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/FreeRDP-Client2/FreeRDP-ClientTargets.cmake
lib/cmake/FreeRDP2/FreeRDPConfig.cmake
lib/cmake/FreeRDP2/FreeRDPConfigVersion.cmake
lib/cmake/FreeRDP2/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/FreeRDP2/FreeRDPTargets.cmake
lib/cmake/WinPR2/WinPRConfig.cmake
lib/cmake/WinPR2/WinPRConfigVersion.cmake
lib/cmake/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/WinPR2/WinPRTargets.cmake
lib/cmake/WinPR/WinPRConfigVersion.cmake
lib/cmake/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/WinPR/WinPRTargets.cmake
%%ALSA%%lib/freerdp/audin-client-alsa.a
%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a
lib/freerdp/audin-client.a
lib/freerdp/cliprdr-client.a
lib/freerdp/disp-client.a
lib/freerdp/drdynvc-client.a
lib/freerdp/drive-client.a
lib/freerdp/echo-client.a
lib/freerdp/encomsp-client.a
lib/freerdp/parallel-client.a
%%CUPS%%lib/freerdp/printer-client.a
lib/freerdp/rail-client.a
lib/freerdp/rdpdr-client.a
lib/freerdp/rdpei-client.a
lib/freerdp/rdpgfx-client.a
%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a
%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a
lib/freerdp/rdpsnd-client.a
lib/freerdp/remdesk-client.a
lib/freerdp/serial-client.a
lib/freerdp/smartcard-client.a
%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a
%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a
%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a
%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a
lib/freerdp/tsmf-client.a
lib/libfreerdp.so          
lib/libfreerdp.so.1.2      
lib/libfreerdp.so.1.2.0    
lib/libfreerdp-client.so
lib/libfreerdp-client.so.2
lib/libfreerdp-client.so.2.0.0
lib/libfreerdp.so
lib/libfreerdp.so.2
lib/libfreerdp.so.2.0.0
lib/libwinpr-tools.so
lib/libwinpr-tools.so.2
lib/libwinpr-tools.so.2.0.0
lib/libwinpr.so
lib/libwinpr.so.2
lib/libwinpr.so.2.0.0
libdata/pkgconfig/freerdp-client2.pc
libdata/pkgconfig/freerdp2.pc
libdata/pkgconfig/winpr-tools2.pc
libdata/pkgconfig/winpr2.pc
man/man1/wlog.1.gz
%%X11%%man/man1/xfreerdp.1.gz




--- configure.orig	2015-11-12 09:00:11 UTC
+++ configure
@@ -4747,7 +4747,7 @@ fi
 
 
 # Whether to enable support for RDP.
-RDP_DEPS="freerdp x11"
+RDP_DEPS="freerdp2 x11"
 # Check whether --enable-rdp was given.
 if test "${enable_rdp+set}" = set; then :
   enableval=$enable_rdp;
@@ -4763,8 +4763,8 @@ if test "x$enable_rdp" != "xno"; then :
   test $ac_status = 0; }; then
   have_rdp=yes
      if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "freerdp >= 1.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp2 >= 1.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "freerdp2 >= 1.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then

Line 0 Link Here

(-)net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c (+11 lines)
	1	--- plugins/rdp/vinagre-rdp-tab.c.orig 2015-10-06 15:40:06 UTC
	2	+++ plugins/rdp/vinagre-rdp-tab.c
	3	@@ -1108,7 +1107,7 @@ open_freerdp (VinagreRdpTab *rdp_tab)
	4	settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
	5	#endif
	6	#include <freerdp/version.h>
	7	-#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1)
	8	+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) \|\| (FREERDP_VERSION_MAJOR == 2)
	9	settings->UseRdpSecurityLayer = FALSE;
	10	#else
	11	settings->DisableEncryption = FALSE;

Return to bug 212004

Lines 1-9 Link Here

(-)net/freerdp/Makefile (-42 / +32 lines)
1	# Created by: Alexander Logvinov <avl@FreeBSD.org>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= freerdp	3	PORTNAME= freerdp
5	PORTVERSION= 1.2.0	4	PORTVERSION= 2.0.0.g2016.11.24
6	PORTREVISION= 7
7	CATEGORIES= net comms ipv6	5	CATEGORIES= net comms ipv6
8		6
9	MAINTAINER= bsdports@kyle-evans.net	7	MAINTAINER= bsdports@kyle-evans.net
Lines 12-82 Link Here
12	LICENSE= APACHE20	10	LICENSE= APACHE20
13	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
14		12
15	USE_LDCONFIG= yes
16	USES= alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib ssl
17	USE_GITHUB= yes	13	USE_GITHUB= yes
18	GH_ACCOUNT= FreeRDP	14	GH_ACCOUNT= FreeRDP
19	GH_PROJECT= ${GH_ACCOUNT}	15	GH_PROJECT= ${GH_ACCOUNT}
20	GH_TAGNAME= f5ff6e1	16	GH_TAGNAME= 2a6dbab
21		17
		18	USES= alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl
		19	USE_LDCONFIG= yes
22	CPE_VENDOR= freerdp_project	20	CPE_VENDOR= freerdp_project
23		21
24	LDFLAGS+= -L${LOCALBASE}/lib	22	CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF -DARM_FP_ABI=hard
25	CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
26		23
27	OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11	24	OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11
28	OPTIONS_DEFAULT= CUPS GSTREAMER X11	25	OPTIONS_DEFAULT= CUPS GSTREAMER X11
29	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
30		27
		28	OPTIONS_DEFINE_armv6= NEON
		29	OPTIONS_DEFINE_aarch64= NEON
		30
31	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	31	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
32	ALSA_CMAKE_ON= -DWITH_ALSA=ON	32	ALSA_CMAKE_BOOL= WITH_ALSA
33	ALSA_CMAKE_OFF= -DWITH_ALSA=OFF
34		33
35	CUPS_LIB_DEPENDS= libcups.so:print/cups	34	CUPS_LIB_DEPENDS= libcups.so:print/cups
36	CUPS_CMAKE_ON= -DWITH_CUPS=ON	35	CUPS_CMAKE_BOOL= WITH_CUPS
37	CUPS_CMAKE_OFF= -DWITH_CUPS=OFF
38		36
39	# outdated and unmaintained upstream
40	DIRECTFB_DESC= Build FreeRDP DirectFB client (outdated)
41	DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb
42	DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON
43	DIRECTFB_CMAKE_OFF= -DWITH_DIRECTFB=OFF
44	# currently DirectFB option fails with clang
45	DIRECTFB_USE= gcc=yes
46
47	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \	37	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
48	libavutil.so:multimedia/ffmpeg	38	libavutil.so:multimedia/ffmpeg
49	FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON	39	FFMPEG_CMAKE_BOOL= WITH_FFMPEG
50	FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF
51		40
52	GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF	41	GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0
53	GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF	42	GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr
54	GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr	43	GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
55		44
		45	NEON_DESC= Enable Media Processing Engine instructions
		46	NEON_CMAKE_BOOL= WITH_NEON
		47	NEON_CFLAGS= -march=armv7-a
		48
56	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	49	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
57	PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON	50	PULSEAUDIO_CMAKE_BOOL= WITH_PULSE
58	PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF
59		51
60	SSE_CMAKE_ON= -DWITH_SSE2=ON	52	SSE_CMAKE_BOOL= WITH_SSE2
61	SSE_CMAKE_OFF= -DWITH_SSE2=OFF
62		53
63	X11_DESC= Build FreeRDP X11 client	54	X11_DESC= Build FreeRDP X11 client
64	X11_BUILD_DEPENDS= xmlto:textproc/xmlto	55	X11_BUILD_DEPENDS= xmlto:textproc/xmlto
65	X11_CMAKE_ON= -DWITH_X11=ON	56	X11_CMAKE_ON= -DWITH_XKBDFILE=OFF
66	X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF	57	X11_CMAKE_BOOL= WITH_X11
67	X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \	58	X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes,xrender
68	xcursor,xrandr,xi,xfixes,xrender
69		59
70	.include <bsd.port.options.mk>	60	post-patch:
71		61	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
72	post-extract:
73	${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_LIBDIR}/pkgconfig\|libdata/pkgconfig\|' \
74	-e '/CMAKE_INSTALL_RPATH /d' \
75	${WRKSRC}/CMakeLists.txt	62	${WRKSRC}/CMakeLists.txt
76	${REINPLACE_CMD} -e 's\|share/man/man1\|man/man1\|' \	63	@${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \
		64	${WRKSRC}/winpr/CMakeLists.txt \
77	${WRKSRC}/client/X11/CMakeLists.txt	65	${WRKSRC}/client/X11/CMakeLists.txt
78	${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \	66	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \
79	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h	67	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
80	${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \	68	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \
81	${WRKSRC}/channels/drive/client/statvfs.c	69	${WRKSRC}/channels/drive/client/statvfs.c
		70	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
		71
82	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)net/freerdp/files/patch-CMakeLists.txt (-6 / +7 lines)
1	--- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC	1	--- CMakeLists.txt.orig 2016-11-24 13:19:47 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")	3	@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
4	set(FREEBSD TRUE)
5	endif()	4	endif()
6	endif()	5	endif()
		6
7	+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")	7	+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
8	+ set(BSD TRUE)	8	+ set(BSD TRUE)
9	+ set(FREEBSD TRUE)	9	+ set(FREEBSD TRUE)
10	+endif()	10	+endif()
11		11	+
12	# Android	12	# Configure MSVC Runtime
13	if(ANDROID)	13	if(MSVC)
		14	include(MSVCRuntime)

Lines 1-16 Link Here

(-)net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake (-16 lines)
1	Don't use custom code to find the include dirs for gstreamer 1.0 (core).
2	Since 1.6.0 there are multiple include paths. So use pkg-config to find
3	which. IMO the rest of this file should use pkg-config....
4
5	--- cmake/FindGStreamer_1_0.cmake.orig 2015-06-26 15:30:00.000000000 +0200
6	+++ cmake/FindGStreamer_1_0.cmake 2015-09-27 10:43:55.754514000 +0200
7	@@ -78,7 +78,8 @@
8	# 1.1. Find headers and libraries
9	set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
10	find_package(Glib REQUIRED)
11	-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
12	+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
13	+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
14	FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
15
16	# 1.2. Check Gstreamer version

Lines 1-45 Link Here

(-)net/freerdp/files/patch-ffmpeg29 (-59 / +20 lines)
1	Description: Replace deprecated FFmpeg API	1	--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-10-21 07:29:51 UTC
2	Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>	2	+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
3	Last-Update: <2015-11-02>	3	@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
4		4	av_picture_copy((AVPicture) frame, (AVPicture) mdecoder->frame,
5	--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-06-11 21:12:27.134896000 +0200	5	mdecoder->codec_context->pix_fmt,
6	+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-06-11 21:14:05.282247000 +0200	6	mdecoder->codec_context->width, mdecoder->codec_context->height);
7	@@ -103,7 +103,7 @@	7	- av_free(frame);
8	mdecoder->codec_context->bit_rate = media_type->BitRate;	8	+ av_frame_free(&frame);
9	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;	9	}
10	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
11	- mdecoder->frame = avcodec_alloc_frame();
12	+ mdecoder->frame = av_frame_alloc();
13	return TRUE;
14	}
15		10
16	@@ -322,14 +322,14 @@
17	mdecoder->codec_context->width, mdecoder->codec_context->height);
18	mdecoder->decoded_data = malloc(mdecoder->decoded_size);
19	ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
20	- frame = avcodec_alloc_frame();
21	+ frame = av_frame_alloc();
22	avpicture_fill((AVPicture *) frame, mdecoder->decoded_data,
23	mdecoder->codec_context->pix_fmt,
24	mdecoder->codec_context->width, mdecoder->codec_context->height);
25	av_picture_copy((AVPicture ) frame, (AVPicture ) mdecoder->frame,
26	mdecoder->codec_context->pix_fmt,
27	mdecoder->codec_context->width, mdecoder->codec_context->height);
28	- av_free(frame);
29	+ av_frame_free(&frame);
30	}
31	return ret;	11	return ret;
32	}	12	@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
33	@@ -385,7 +385,7 @@
34	(int16_t *) dst, &frame_size, src, src_size);
35	#else
36	{
37	- AVFrame *decoded_frame = avcodec_alloc_frame();
38	+ AVFrame *decoded_frame = av_frame_alloc();
39	int got_frame = 0;
40	AVPacket pkt;
41	av_init_packet(&pkt);
42	@@ -398,7 +398,7 @@
43	decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);	13	decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);
44	memcpy(dst, decoded_frame->data[0], frame_size);	14	memcpy(dst, decoded_frame->data[0], frame_size);
45	}	15	}
Lines 47-75 Link Here
47	+ av_frame_free(&decoded_frame);	17	+ av_frame_free(&decoded_frame);
48	}	18	}
49	#endif	19	#endif
50	if(len <= 0 \|\| frame_size <= 0)	20	if (len <= 0 \|\| frame_size <= 0)
51	@@ -464,7 +464,7 @@	21	@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
52	TSMFFFmpegDecoder mdecoder = (TSMFFFmpegDecoder ) decoder;
53	switch(mdecoder->codec_context->pix_fmt)
54	{
55	- case PIX_FMT_YUV420P:
56	+ case AV_PIX_FMT_YUV420P:
57	return RDP_PIXFMT_I420;
58	default:
59	CLOG_ERR("unsupported pixel format %u",
60	@@ -492,7 +492,7 @@
61	{	22	{
62	TSMFFFmpegDecoder mdecoder = (TSMFFFmpegDecoder ) decoder;	23	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
63	if(mdecoder->frame)	24	if (mdecoder->frame)
64	- av_free(mdecoder->frame);	25	- av_free(mdecoder->frame);
65	+ av_frame_free(&mdecoder->frame);	26	+ av_frame_free(&mdecoder->frame);
66	if(mdecoder->decoded_data)	27
67	free(mdecoder->decoded_data);	28	free(mdecoder->decoded_data);
68	if(mdecoder->codec_context)	29
69	@@ -501,7 +501,7 @@	30	@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
70	avcodec_close(mdecoder->codec_context);	31	avcodec_close(mdecoder->codec_context);
71	if(mdecoder->codec_context->extradata)	32
72	free(mdecoder->codec_context->extradata);	33	free(mdecoder->codec_context->extradata);
73	- av_free(mdecoder->codec_context);	34	- av_free(mdecoder->codec_context);
74	+ av_frame_free(&mdecoder->codec_context);	35	+ av_frame_free(&mdecoder->codec_context);
75	}	36	}

Lines 1-13 Link Here

(-)net/freerdp/files/patch-freerdp.pc.in (-13 lines)
1	Index: freerdp.pc.in
2	diff -u freerdp.pc.in.orig freerdp.pc.in
3	--- freerdp.pc.in.orig 2014-09-12 07:46:32.000000000 +0900
4	+++ freerdp.pc.in 2015-05-26 02:05:37.874925433 +0900
5	@@ -9,7 +9,7 @@
6	URL: http://www.freerdp.com/
7	Version: @FREERDP_VERSION_FULL@
8	Requires:
9	-Requires.private: winpr zlib libssl
10	+Requires.private: winpr
11	Libs: -L${libdir} ${libs}
12	Libs.private: -ldl -lpthread
13	Cflags: -I${includedir}

Lines 1-57 Link Here

(-)net/freerdp/files/patch-git_1b663cef (-57 lines)
1	The patch below comes from upstream and has been slightly adjusted to apply
2	on the tarball we build.
3
4	From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
5	From: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
6	Date: Fri, 12 Dec 2014 18:26:45 +0100
7	Subject: [PATCH] build: cmake 3.1 compatibility
8
9	* fix problem with REMOVE_DUPLICATES on undefined lists
10	* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
11	previously - necessary adoptions for regex and matches done. Should
12	work with all cmake versions.
13
14	Tested with 3.1.0-rc3
15	--- channels/CMakeLists.txt
16	+++ channels/CMakeLists.txt
17	@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake")
18	file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
19
20	foreach(FILEPATH ${FILEPATHS})
21	- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
22	- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
23	+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
24	+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
25	set(CHANNEL_OPTION)
26	include(${FILEPATH})
27	if(${CHANNEL_OPTION})
28	--- channels/client/CMakeLists.txt
29	+++ channels/client/CMakeLists.txt
30	@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
31	${CMAKE_CURRENT_SOURCE_DIR}/addin.c
32	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
33
34	+if(CHANNEL_STATIC_CLIENT_ENTRIES)
35	list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
36	+endif()
37
38	foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
39	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
40	--- third-party/CMakeLists.txt
41	+++ third-party/CMakeLists.txt
42	@@ -22,11 +22,11 @@
43	file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
44
45	foreach(dir ${all_valid_subdirs})
46	- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
47	- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
48	+ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
49	+ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
50	message(STATUS "Adding third-party component ${dir_trimmed}")
51	add_subdirectory(${dir_trimmed})
52	endif()
53	endforeach(dir)
54
55	-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
56	\ No newline at end of file
57	+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)

Lines 1-74 Link Here

(-)net/freerdp/files/patch-git_434436b7 (-74 lines)
1	From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001
2	From: ivan-83 <rozhuk.im@gmail.com>
3	Date: Tue, 10 Mar 2015 01:21:28 +0300
4	Subject: [PATCH] * BSD/FreeBSD build fix
5
6	---
7	CMakeLists.txt \| 14 ++++++++++++++
8	winpr/libwinpr/synch/wait.c \| 2 +-
9	winpr/libwinpr/sysinfo/sysinfo.c \| 1 +
10	winpr/libwinpr/utils/CMakeLists.txt \| 4 ++++
11	4 files changed, 20 insertions(+), 1 deletion(-)
12
13	diff CMakeLists.txt CMakeLists.txt
14	index 0a9144a..386ae67 100644
15	--- CMakeLists.txt
16	+++ CMakeLists.txt
17	@@ -358,6 +358,14 @@ if(APPLE)
18	endif()
19	endif(APPLE)
20
21	+# BSD
22	+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
23	+ set(BSD TRUE)
24	+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
25	+ set(FREEBSD TRUE)
26	+ endif()
27	+endif()
28	+
29	# Android
30	if(ANDROID)
31	set(WITH_LIBRARY_VERSIONING "OFF")
32	@@ -618,6 +626,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions")
33	include_directories(${CMAKE_CURRENT_BINARY_DIR})
34	include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
35	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
36	+if(BSD)
37	+ if(IS_DIRECTORY /usr/local/include)
38	+ include_directories(/usr/local/include)
39	+ link_directories(/usr/local/lib)
40	+ endif()
41	+endif()
42
43	# Configure files
44	add_definitions("-DHAVE_CONFIG_H")
45	diff winpr/libwinpr/sysinfo/sysinfo.c winpr/libwinpr/sysinfo/sysinfo.c
46	index 1529d54..457ab9d 100644
47	--- winpr/libwinpr/sysinfo/sysinfo.c
48	+++ winpr/libwinpr/sysinfo/sysinfo.c
49	@@ -54,6 +54,7 @@
50	#ifndef _WIN32
51
52	#include <time.h>
53	+#include <sys/time.h>
54
55	#ifdef HAVE_UNISTD_H
56	#include <unistd.h>
57	diff winpr/libwinpr/utils/CMakeLists.txt winpr/libwinpr/utils/CMakeLists.txt
58	index e524bf9..501f605 100644
59	--- winpr/libwinpr/utils/CMakeLists.txt
60	+++ winpr/libwinpr/utils/CMakeLists.txt
61	@@ -113,6 +113,10 @@ if(UNIX)
62	winpr_library_add(m)
63	endif()
64
65	+if(BSD)
66	+ winpr_library_add(execinfo)
67	+endif()
68	+
69	if(BUILD_TESTING)
70	add_subdirectory(test)
71	endif()
72	--
73	2.4.1
74

Lines 1-42 Link Here

(-)net/freerdp/files/patch-libfreerdp-locale-timezone.c (-42 lines)
1	From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001
2	From: ivan-83 <rozhuk.im@gmail.com>
3	Date: Tue, 10 Mar 2015 04:40:47 +0300
4	Subject: [PATCH] * FreeBSD timezone detection patch
5
6	---
7	libfreerdp/locale/timezone.c \| 15 +++++++++++----
8	1 file changed, 11 insertions(+), 4 deletions(-)
9
10	diff libfreerdp/locale/timezone.c libfreerdp/locale/timezone.c
11	index 92b74e8..0375f9c 100644
12	--- libfreerdp/locale/timezone.c
13	+++ libfreerdp/locale/timezone.c
14	@@ -1521,8 +1523,11 @@ char* freerdp_get_unix_timezone_identifier()
15	return tzid;
16	}
17
18	+#ifdef __FreeBSD__
19	+ fp = fopen("/var/db/zoneinfo", "r");
20	+#else
21	fp = fopen("/etc/timezone", "r");
22	-
23	+#endif
24	if (fp != NULL)
25	{
26	fseek(fp, 0, SEEK_END);
27	@@ -1678,8 +1683,10 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone)
28
29	#ifdef HAVE_TM_GMTOFF
30	#if defined(__FreeBSD__)
31	- /not the best solution, but could not get the right tyepcast/
32	- clientTimeZone->bias = 0;
33	+ if (local_time->tm_gmtoff >= 0)
34	+ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
35	+ else
36	+ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
37	#else
38	clientTimeZone->bias = timezone / 60;
39	#endif
40	--
41	2.4.1
42

Lines 1-13 Link Here

(-)net/freerdp/files/patch-libfreerdp_freerdp.pc.in (-8 / +6 lines)
1	Index: freerdp.pc.in	1	--- libfreerdp/freerdp.pc.in.orig 2016-10-21 07:29:51 UTC
2	diff -u freerdp.pc.in.orig freerdp.pc.in	2	+++ libfreerdp/freerdp.pc.in
3	--- freerdp.pc.in.orig 2014-09-12 07:46:32.000000000 +0900	3	@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P
4	+++ freerdp.pc.in 2015-05-26 02:05:37.874925433 +0900
5	@@ -9,7 +9,7 @@
6	URL: http://www.freerdp.com/	4	URL: http://www.freerdp.com/
7	Version: @FREERDP_VERSION_FULL@	5	Version: @FREERDP_VERSION@
8	Requires:	6	Requires:
9	-Requires.private: winpr zlib libssl	7	-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ libssl
10	+Requires.private: winpr	8	+Requires.private: @WINPR_PKG_CONFIG_FILENAME@
11	Libs: -L${libdir} ${libs}	9	Libs: -L${libdir} ${libs}
12	Libs.private: -ldl -lpthread	10	Libs.private: -ldl -lpthread
13	Cflags: -I${includedir}	11	Cflags: -I${includedir}

Lines 1-12 Link Here

(-)net/freerdp/files/patch-winpr.pc.in (-12 lines)
1	Index: winpr.pc.in
2	diff -u winpr.pc.in.orig winpr.pc.in
3	--- winpr.pc.in.orig 2014-09-12 07:46:32.000000000 +0900
4	+++ winpr.pc.in 2015-05-26 02:05:59.353925013 +0900
5	@@ -9,7 +9,6 @@
6	URL: http://www.freerdp.com/
7	Version: @WINPR_VERSION_FULL@
8	Requires:
9	-Requires.private: zlib libssl
10	Libs: -L${libdir} ${libs}
11	Libs.private: -ldl -lrt -lm -lpthread
12	Cflags: -I${includedir}

Lines 1-248 Link Here

(-)net/freerdp/pkg-plist (-245 / +219 lines)
1	%%DIRECTFB%%bin/dfreerdp	1	bin/winpr-hash
		2	bin/winpr-makecert
2	%%X11%%bin/xfreerdp	3	%%X11%%bin/xfreerdp
3	include/freerdp/addin.h	4	include/freerdp2/freerdp/addin.h
4	include/freerdp/altsec.h	5	include/freerdp2/freerdp/altsec.h
5	include/freerdp/api.h	6	include/freerdp2/freerdp/api.h
6	include/freerdp/assistance.h	7	include/freerdp2/freerdp/assistance.h
7	include/freerdp/cache/bitmap.h	8	include/freerdp2/freerdp/autodetect.h
8	include/freerdp/cache/brush.h	9	include/freerdp2/freerdp/build-config.h
9	include/freerdp/cache/cache.h	10	include/freerdp2/freerdp/cache/bitmap.h
10	include/freerdp/cache/glyph.h	11	include/freerdp2/freerdp/cache/brush.h
11	include/freerdp/cache/nine_grid.h	12	include/freerdp2/freerdp/cache/cache.h
12	include/freerdp/cache/offscreen.h	13	include/freerdp2/freerdp/cache/glyph.h
13	include/freerdp/cache/palette.h	14	include/freerdp2/freerdp/cache/nine_grid.h
14	include/freerdp/cache/pointer.h	15	include/freerdp2/freerdp/cache/offscreen.h
15	include/freerdp/channels/audin.h	16	include/freerdp2/freerdp/cache/palette.h
16	include/freerdp/channels/channels.h	17	include/freerdp2/freerdp/cache/pointer.h
17	include/freerdp/channels/cliprdr.h	18	include/freerdp2/freerdp/channels/audin.h
18	include/freerdp/channels/encomsp.h	19	include/freerdp2/freerdp/channels/channels.h
19	include/freerdp/channels/log.h	20	include/freerdp2/freerdp/channels/cliprdr.h
20	include/freerdp/channels/rail.h	21	include/freerdp2/freerdp/channels/encomsp.h
21	include/freerdp/channels/rdpdr.h	22	include/freerdp2/freerdp/channels/log.h
22	include/freerdp/channels/rdpgfx.h	23	include/freerdp2/freerdp/channels/rail.h
23	include/freerdp/channels/rdpsnd.h	24	include/freerdp2/freerdp/channels/rdpdr.h
24	include/freerdp/channels/remdesk.h	25	include/freerdp2/freerdp/channels/rdpei.h
25	include/freerdp/channels/tsmf.h	26	include/freerdp2/freerdp/channels/rdpgfx.h
26	include/freerdp/channels/wtsvc.h	27	include/freerdp2/freerdp/channels/rdpsnd.h
27	include/freerdp/client.h	28	include/freerdp2/freerdp/channels/remdesk.h
28	include/freerdp/client/audin.h	29	include/freerdp2/freerdp/channels/tsmf.h
29	include/freerdp/client/channels.h	30	include/freerdp2/freerdp/channels/wtsvc.h
30	include/freerdp/client/cliprdr.h	31	include/freerdp2/freerdp/client.h
31	include/freerdp/client/cmdline.h	32	include/freerdp2/freerdp/client/audin.h
32	include/freerdp/client/disp.h	33	include/freerdp2/freerdp/client/channels.h
33	include/freerdp/client/drdynvc.h	34	include/freerdp2/freerdp/client/cliprdr.h
34	include/freerdp/client/encomsp.h	35	include/freerdp2/freerdp/client/cmdline.h
35	include/freerdp/client/file.h	36	include/freerdp2/freerdp/client/disp.h
36	include/freerdp/client/rail.h	37	include/freerdp2/freerdp/client/drdynvc.h
37	include/freerdp/client/rdpei.h	38	include/freerdp2/freerdp/client/encomsp.h

Lines 1-12 Link Here

(-)net/freerdp/files/patch-winpr_winpr.pc.in (-8 / +6 lines)
1	Index: winpr.pc.in	1	--- winpr/winpr.pc.in.orig 2016-10-21 07:29:51 UTC
2	diff -u winpr.pc.in.orig winpr.pc.in	2	+++ winpr/winpr.pc.in
3	--- winpr.pc.in.orig 2014-09-12 07:46:32.000000000 +0900	3	@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run
4	+++ winpr.pc.in 2015-05-26 02:05:59.353925013 +0900
5	@@ -9,7 +9,6 @@
6	URL: http://www.freerdp.com/	4	URL: http://www.freerdp.com/
7	Version: @WINPR_VERSION_FULL@	5	Version: @WINPR_VERSION@
8	Requires:	6	Requires:
9	-Requires.private: zlib libssl	7	-Requires.private: libssl
10	Libs: -L${libdir} ${libs}	8	Libs: -L${libdir} ${libs}
11	Libs.private: -ldl -lrt -lm -lpthread	9	Libs.private: -ldl -lrt -lm -lpthread
12	Cflags: -I${includedir}	10	Cflags: -I${includedir}

Lines 1-13 Link Here

(-)net/freerdp/files/patch-z001-CMakeLists.txt (-13 lines)
1	--- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC
2	+++ CMakeLists.txt
3	@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
4	set(FREEBSD TRUE)
5	endif()
6	endif()
7	+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
8	+ set(BSD TRUE)
9	+ set(FREEBSD TRUE)
10	+endif()
11
12	# Android
13	if(ANDROID)

Line 0 Link Here

(-)net/vinagre/files/patch-configure (+22 lines)
	1	--- configure.orig 2015-11-12 09:00:11 UTC
	2	+++ configure
	3	@@ -4747,7 +4747,7 @@ fi
	4
	5
	6	# Whether to enable support for RDP.
	7	-RDP_DEPS="freerdp x11"
	8	+RDP_DEPS="freerdp2 x11"
	9	# Check whether --enable-rdp was given.
	10	if test "${enable_rdp+set}" = set; then :
	11	enableval=$enable_rdp;
	12	@@ -4763,8 +4763,8 @@ if test "x$enable_rdp" != "xno"; then :
	13	test $ac_status = 0; }; then
	14	have_rdp=yes
	15	if test -n "$PKG_CONFIG" && \
	16	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.1\""; } >&5
	17	- ($PKG_CONFIG --exists --print-errors "freerdp >= 1.1") 2>&5
	18	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp2 >= 1.1\""; } >&5
	19	+ ($PKG_CONFIG --exists --print-errors "freerdp2 >= 1.1") 2>&5
	20	ac_status=$?
	21	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	22	test $ac_status = 0; }; then