Attachment #156971 for bug #198618




# $FreeBSD$

PORTNAME=	freerdp
PORTVERSION=	1.2.0
PORTREVISION=	2
CATEGORIES=	net comms ipv6

MAINTAINER=	ports@FreeBSD.org


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

CPE_VENDOR=	freerdp_project

LDFLAGS+=	-L${LOCALBASE}/lib
CFLAGS+=	-I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include

OPTIONS_DEFINE=		ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
OPTIONS_DEFAULT=	CUPS GSTREAMER X11

FFMPEG_CMAKE_ON=	-DWITH_FFMPEG=ON
FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF

GSTREAMER_CMAKE_ON=	-DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
GSTREAMER_CMAKE_OFF=	-DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
GSTREAMER_USE=		gstreamer1=yes xorg=x11,xextproto,xext,xrandr

PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE=ON

X11_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
X11_CMAKE_ON=		-DWITH_X11=ON
X11_CMAKE_OFF=		-DWITH_X11=OFF -DWITH_XKBFILE=OFF
X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes

.include <bsd.port.options.mk>


		${WRKSRC}/CMakeLists.txt
	${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
		${WRKSRC}/client/X11/CMakeLists.txt
	${REINPLACE_CMD} -e 's|HW_AVAILCPU|HW_NCPU|' \
		${WRKSRC}/winpr/libwinpr/sysinfo/sysinfo.c
	${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
		${WRKSRC}/winpr/libwinpr/crt/alignment.c \
		${WRKSRC}/channels/drive/client/statvfs.c
.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (FreeRDP-FreeRDP-1.1.0-780d451_GH0.tar.gz) = 5b74a7d79db896d1b2f8df350f892e7f9aee8ea25a6974185b9cc739dbc0935a	1	SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32
2	SIZE (FreeRDP-FreeRDP-1.1.0-780d451_GH0.tar.gz) = 6677660	2	SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856




--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2013-07-10 01:00:21.000000000 -0700
+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2013-08-12 22:26:28.000000000 -0700
@@ -43,12 +43,20 @@
 #define AVMEDIA_TYPE_AUDIO 1
 #endif
 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
 typedef struct _TSMFFFmpegDecoder
 {
 	ITSMFDecoder iface;
 
 	int media_type;
+#if LIBAVCODEC_VERSION_MAJOR > 54
+	enum AVCodecID codec_id;
+#else
 	enum CodecID codec_id;
+#endif
 	AVCodecContext* codec_context;
 	AVCodec* codec;
 	AVFrame* frame;
@@ -99,8 +107,12 @@
 	mdecoder->codec_context->block_align = media_type->BlockAlign;
 
 #ifdef AV_CPU_FLAG_SSE2
+#if LIBAVCODEC_VERSION_MAJOR < 55
 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
 #else
+	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2); 
+#endif
+#else
 #if LIBAVCODEC_VERSION_MAJOR < 53
 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
 #else





$FreeBSD$

--- client/common/compatibility.c.orig
+++ client/common/compatibility.c
@@ -515,7 +515,7 @@
 				settings->PerformanceFlags = type;
 			}
 
-			fprintf(stderr, "-x %s -> /network ", arg->Value);
+			fprintf(stderr, "-x %s -> /network:", arg->Value);
 
 			if (type == CONNECTION_TYPE_MODEM)
 				fprintf(stderr, "modem");




-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
\ No newline at end of file
+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
--- winpr/libwinpr/CMakeLists.txt
+++ winpr/libwinpr/CMakeLists.txt
@@ -32,8 +32,8 @@
 file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
 
 foreach(FILEPATH ${FILEPATHS})
-	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
-		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH})
+	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
+		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH})
 		set(${MODULE_PREFIX}_SUBMODULES ${${MODULE_PREFIX}_SUBMODULES} ${${MODULE_PREFIX}_SUBMODULE})
 	endif()
 endforeach(FILEPATH)




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


Lines 3-8 Link Here

(-)pkg-plist (-129 / +97 lines)
3	include/freerdp/addin.h	3	include/freerdp/addin.h
4	include/freerdp/altsec.h	4	include/freerdp/altsec.h
5	include/freerdp/api.h	5	include/freerdp/api.h
		6	include/freerdp/assistance.h
6	include/freerdp/cache/bitmap.h	7	include/freerdp/cache/bitmap.h
7	include/freerdp/cache/brush.h	8	include/freerdp/cache/brush.h
8	include/freerdp/cache/cache.h	9	include/freerdp/cache/cache.h
Lines 11-37 Link Here
11	include/freerdp/cache/offscreen.h	12	include/freerdp/cache/offscreen.h
12	include/freerdp/cache/palette.h	13	include/freerdp/cache/palette.h
13	include/freerdp/cache/pointer.h	14	include/freerdp/cache/pointer.h
		15	include/freerdp/channels/audin.h
14	include/freerdp/channels/channels.h	16	include/freerdp/channels/channels.h
		17	include/freerdp/channels/cliprdr.h
		18	include/freerdp/channels/encomsp.h
		19	include/freerdp/channels/log.h
		20	include/freerdp/channels/rail.h
15	include/freerdp/channels/rdpdr.h	21	include/freerdp/channels/rdpdr.h
		22	include/freerdp/channels/rdpgfx.h
16	include/freerdp/channels/rdpsnd.h	23	include/freerdp/channels/rdpsnd.h
		24	include/freerdp/channels/remdesk.h
		25	include/freerdp/channels/tsmf.h
17	include/freerdp/channels/wtsvc.h	26	include/freerdp/channels/wtsvc.h
18	include/freerdp/client.h	27	include/freerdp/client.h
		28	include/freerdp/client/audin.h
19	include/freerdp/client/channels.h	29	include/freerdp/client/channels.h
20	include/freerdp/client/cliprdr.h	30	include/freerdp/client/cliprdr.h
21	include/freerdp/client/cmdline.h	31	include/freerdp/client/cmdline.h
		32	include/freerdp/client/disp.h
22	include/freerdp/client/drdynvc.h	33	include/freerdp/client/drdynvc.h
		34	include/freerdp/client/encomsp.h
23	include/freerdp/client/file.h	35	include/freerdp/client/file.h
		36	include/freerdp/client/rail.h
24	include/freerdp/client/rdpei.h	37	include/freerdp/client/rdpei.h
		38	include/freerdp/client/rdpgfx.h
		39	include/freerdp/client/rdpsnd.h
		40	include/freerdp/client/remdesk.h
25	include/freerdp/client/tsmf.h	41	include/freerdp/client/tsmf.h
26	include/freerdp/codec/audio.h	42	include/freerdp/codec/audio.h
27	include/freerdp/codec/bitmap.h	43	include/freerdp/codec/bitmap.h
		44	include/freerdp/codec/bulk.h
		45	include/freerdp/codec/clear.h
28	include/freerdp/codec/color.h	46	include/freerdp/codec/color.h
29	include/freerdp/codec/dsp.h	47	include/freerdp/codec/dsp.h
		48	include/freerdp/codec/h264.h
		49	include/freerdp/codec/interleaved.h
30	include/freerdp/codec/jpeg.h	50	include/freerdp/codec/jpeg.h
31	include/freerdp/codec/mppc_dec.h	51	include/freerdp/codec/mppc.h
32	include/freerdp/codec/mppc_enc.h	52	include/freerdp/codec/ncrush.h
33	include/freerdp/codec/nsc.h	53	include/freerdp/codec/nsc.h
		54	include/freerdp/codec/planar.h
		55	include/freerdp/codec/progressive.h
		56	include/freerdp/codec/region.h
34	include/freerdp/codec/rfx.h	57	include/freerdp/codec/rfx.h
		58	include/freerdp/codec/xcrush.h
		59	include/freerdp/codec/zgfx.h
		60	include/freerdp/codecs.h
35	include/freerdp/constants.h	61	include/freerdp/constants.h
36	include/freerdp/crypto/ber.h	62	include/freerdp/crypto/ber.h
37	include/freerdp/crypto/certificate.h	63	include/freerdp/crypto/certificate.h
Lines 65-71 Link Here
65	include/freerdp/locale/keyboard.h	91	include/freerdp/locale/keyboard.h
66	include/freerdp/locale/locale.h	92	include/freerdp/locale/locale.h
67	include/freerdp/locale/timezone.h	93	include/freerdp/locale/timezone.h
		94	include/freerdp/log.h
68	include/freerdp/message.h	95	include/freerdp/message.h
		96	include/freerdp/metrics.h
69	include/freerdp/peer.h	97	include/freerdp/peer.h
70	include/freerdp/pointer.h	98	include/freerdp/pointer.h
71	include/freerdp/primary.h	99	include/freerdp/primary.h
Lines 79-98 Link Here
79	include/freerdp/secondary.h	107	include/freerdp/secondary.h
80	include/freerdp/server/audin.h	108	include/freerdp/server/audin.h
81	include/freerdp/server/channels.h	109	include/freerdp/server/channels.h
		110	include/freerdp/server/cliprdr.h
		111	include/freerdp/server/drdynvc.h
		112	include/freerdp/server/echo.h
		113	include/freerdp/server/encomsp.h
		114	include/freerdp/server/rdpdr.h
82	include/freerdp/server/rdpsnd.h	115	include/freerdp/server/rdpsnd.h
		116	include/freerdp/server/remdesk.h
		117	include/freerdp/server/shadow.h
83	include/freerdp/settings.h	118	include/freerdp/settings.h
84	include/freerdp/svc.h	119	include/freerdp/svc.h
85	include/freerdp/types.h	120	include/freerdp/types.h
86	include/freerdp/update.h	121	include/freerdp/update.h
87	include/freerdp/utils/bitmap.h
88	include/freerdp/utils/debug.h	122	include/freerdp/utils/debug.h
89	include/freerdp/utils/event.h	123	include/freerdp/utils/event.h
90	include/freerdp/utils/list.h
91	include/freerdp/utils/msusb.h	124	include/freerdp/utils/msusb.h
92	include/freerdp/utils/passphrase.h	125	include/freerdp/utils/passphrase.h
93	include/freerdp/utils/pcap.h	126	include/freerdp/utils/pcap.h
94	include/freerdp/utils/profiler.h	127	include/freerdp/utils/profiler.h
95	include/freerdp/utils/rail.h	128	include/freerdp/utils/rail.h
		129	include/freerdp/utils/ringbuffer.h
96	include/freerdp/utils/signal.h	130	include/freerdp/utils/signal.h
97	include/freerdp/utils/stopwatch.h	131	include/freerdp/utils/stopwatch.h
98	include/freerdp/utils/svc_plugin.h	132	include/freerdp/utils/svc_plugin.h
Lines 99-114 Link Here
99	include/freerdp/utils/tcp.h	133	include/freerdp/utils/tcp.h
100	include/freerdp/utils/time.h	134	include/freerdp/utils/time.h
101	include/freerdp/utils/uds.h	135	include/freerdp/utils/uds.h
		136	include/freerdp/version.h
102	include/freerdp/window.h	137	include/freerdp/window.h
103	include/winpr/asn1.h	138	include/winpr/asn1.h
104	include/winpr/bcrypt.h	139	include/winpr/bcrypt.h
		140	include/winpr/bitstream.h
105	include/winpr/cmdline.h	141	include/winpr/cmdline.h
106	include/winpr/collections.h	142	include/winpr/collections.h
107	include/winpr/config.h	143	include/winpr/comm.h
108	include/winpr/credentials.h	144	include/winpr/credentials.h
109	include/winpr/credui.h	145	include/winpr/credui.h
110	include/winpr/crt.h	146	include/winpr/crt.h
111	include/winpr/crypto.h	147	include/winpr/crypto.h
		148	include/winpr/debug.h
112	include/winpr/dsparse.h	149	include/winpr/dsparse.h
113	include/winpr/endian.h	150	include/winpr/endian.h
114	include/winpr/environment.h	151	include/winpr/environment.h
Lines 116-128 Link Here
116	include/winpr/file.h	153	include/winpr/file.h
117	include/winpr/handle.h	154	include/winpr/handle.h
118	include/winpr/heap.h	155	include/winpr/heap.h
		156	include/winpr/image.h
		157	include/winpr/ini.h
119	include/winpr/input.h	158	include/winpr/input.h
120	include/winpr/interlocked.h	159	include/winpr/interlocked.h
121	include/winpr/io.h	160	include/winpr/io.h
122	include/winpr/library.h	161	include/winpr/library.h
		162	include/winpr/locale.h
123	include/winpr/memory.h	163	include/winpr/memory.h
124	include/winpr/midl.h	164	include/winpr/midl.h
125	include/winpr/ndr.h	165	include/winpr/ndr.h
		166	include/winpr/nt.h
126	include/winpr/ntlm.h	167	include/winpr/ntlm.h
127	include/winpr/path.h	168	include/winpr/path.h
128	include/winpr/pipe.h	169	include/winpr/pipe.h
Lines 134-140 Link Here
134	include/winpr/sam.h	175	include/winpr/sam.h
135	include/winpr/schannel.h	176	include/winpr/schannel.h
136	include/winpr/security.h	177	include/winpr/security.h
		178	include/winpr/smartcard.h
137	include/winpr/spec.h	179	include/winpr/spec.h
		180	include/winpr/ssl.h
138	include/winpr/sspi.h	181	include/winpr/sspi.h
139	include/winpr/sspicli.h	182	include/winpr/sspicli.h
140	include/winpr/stream.h	183	include/winpr/stream.h
Lines 144-280 Link Here
144	include/winpr/tchar.h	187	include/winpr/tchar.h
145	include/winpr/thread.h	188	include/winpr/thread.h
146	include/winpr/timezone.h	189	include/winpr/timezone.h
		190	include/winpr/tools/makecert.h
147	include/winpr/windows.h	191	include/winpr/windows.h
148	include/winpr/winhttp.h	192	include/winpr/winhttp.h
149	include/winpr/winpr.h	193	include/winpr/winpr.h
150	include/winpr/winsock.h	194	include/winpr/winsock.h
		195	include/winpr/wlog.h
		196	include/winpr/wnd.h
		197	include/winpr/wtsapi.h
151	include/winpr/wtypes.h	198	include/winpr/wtypes.h
152	lib/libfreerdp-cache.so	199	lib/cmake/FreeRDP/FreeRDPConfig.cmake
153	lib/libfreerdp-cache.so.1.1	200	lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake
154	lib/libfreerdp-cache.so.1.1.0	201	lib/cmake/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake
		202	lib/cmake/FreeRDP/FreeRDPTargets.cmake
		203	lib/cmake/WinPR/WinPRConfig.cmake
		204	lib/cmake/WinPR/WinPRConfigVersion.cmake
		205	lib/cmake/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake
		206	lib/cmake/WinPR/WinPRTargets.cmake
		207	%%ALSA%%lib/freerdp/audin-client-alsa.a
		208	%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a
		209	lib/freerdp/audin-client.a
		210	lib/freerdp/cliprdr-client.a
		211	lib/freerdp/disp-client.a
		212	lib/freerdp/drdynvc-client.a
		213	lib/freerdp/drive-client.a
		214	lib/freerdp/echo-client.a
		215	lib/freerdp/encomsp-client.a
		216	lib/freerdp/parallel-client.a
		217	%%CUPS%%lib/freerdp/printer-client.a
		218	lib/freerdp/rail-client.a
		219	lib/freerdp/rdpdr-client.a
		220	lib/freerdp/rdpei-client.a
		221	lib/freerdp/rdpgfx-client.a
		222	%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a
		223	%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a
		224	lib/freerdp/rdpsnd-client.a
		225	lib/freerdp/remdesk-client.a
		226	lib/freerdp/serial-client.a
		227	lib/freerdp/smartcard-client.a
		228	%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a
		229	%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a
		230	%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a
		231	%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a
		232	lib/freerdp/tsmf-client.a
		233	lib/libfreerdp.so
		234	lib/libfreerdp.so.1.2
		235	lib/libfreerdp.so.1.2.0
155	lib/libfreerdp-client.so	236	lib/libfreerdp-client.so
156	lib/libfreerdp-client.so.1.1	237	lib/libfreerdp-client.so.1.2
157	lib/libfreerdp-client.so.1.1.0	238	lib/libfreerdp-client.so.1.2.0
158	lib/libfreerdp-codec.so	239	lib/libwinpr.so
159	lib/libfreerdp-codec.so.1.1	240	lib/libwinpr.so.1.1
160	lib/libfreerdp-codec.so.1.1.0	241	lib/libwinpr.so.1.1.0
161	lib/libfreerdp-common.so
162	lib/libfreerdp-common.so.1.1.0
163	lib/libfreerdp-common.so.1.1.0-beta1
164	lib/libfreerdp-core.so
165	lib/libfreerdp-core.so.1.1
166	lib/libfreerdp-core.so.1.1.0
167	lib/libfreerdp-crypto.so
168	lib/libfreerdp-crypto.so.1.1
169	lib/libfreerdp-crypto.so.1.1.0
170	lib/libfreerdp-gdi.so
171	lib/libfreerdp-gdi.so.1.1
172	lib/libfreerdp-gdi.so.1.1.0
173	lib/libfreerdp-locale.so
174	lib/libfreerdp-locale.so.1.1
175	lib/libfreerdp-locale.so.1.1.0
176	lib/libfreerdp-primitives.so
177	lib/libfreerdp-primitives.so.1.1
178	lib/libfreerdp-primitives.so.1.1.0
179	lib/libfreerdp-rail.so
180	lib/libfreerdp-rail.so.1.1
181	lib/libfreerdp-rail.so.1.1.0
182	lib/libfreerdp-utils.so
183	lib/libfreerdp-utils.so.1.1
184	lib/libfreerdp-utils.so.1.1.0
185	lib/libwinpr-asn1.so
186	lib/libwinpr-asn1.so.0.1
187	lib/libwinpr-asn1.so.0.1.0
188	lib/libwinpr-bcrypt.so
189	lib/libwinpr-bcrypt.so.0.1
190	lib/libwinpr-bcrypt.so.0.1.0
191	lib/libwinpr-credentials.so
192	lib/libwinpr-credentials.so.0.1
193	lib/libwinpr-credentials.so.0.1.0
194	lib/libwinpr-credui.so
195	lib/libwinpr-credui.so.0.1
196	lib/libwinpr-credui.so.0.1.0
197	lib/libwinpr-crt.so
198	lib/libwinpr-crt.so.0.1
199	lib/libwinpr-crt.so.0.1.0
200	lib/libwinpr-crypto.so
201	lib/libwinpr-crypto.so.0.1
202	lib/libwinpr-crypto.so.0.1.0
203	lib/libwinpr-dsparse.so
204	lib/libwinpr-dsparse.so.0.1
205	lib/libwinpr-dsparse.so.0.1.0
206	lib/libwinpr-environment.so
207	lib/libwinpr-environment.so.0.1
208	lib/libwinpr-environment.so.0.1.0
209	lib/libwinpr-error.so
210	lib/libwinpr-error.so.0.1
211	lib/libwinpr-error.so.0.1.0
212	lib/libwinpr-file.so
213	lib/libwinpr-file.so.0.1
214	lib/libwinpr-file.so.0.1.0
215	lib/libwinpr-handle.so
216	lib/libwinpr-handle.so.0.1
217	lib/libwinpr-handle.so.0.1.0
218	lib/libwinpr-heap.so
219	lib/libwinpr-heap.so.0.1
220	lib/libwinpr-heap.so.0.1.0
221	lib/libwinpr-input.so
222	lib/libwinpr-input.so.0.1
223	lib/libwinpr-input.so.0.1.0
224	lib/libwinpr-interlocked.so
225	lib/libwinpr-interlocked.so.0.1
226	lib/libwinpr-interlocked.so.0.1.0
227	lib/libwinpr-io.so
228	lib/libwinpr-io.so.0.1
229	lib/libwinpr-io.so.0.1.0
230	lib/libwinpr-library.so
231	lib/libwinpr-library.so.0.1
232	lib/libwinpr-library.so.0.1.0
233	lib/libwinpr-makecert-tool.a	242	lib/libwinpr-makecert-tool.a
234	lib/libwinpr-path.so
235	lib/libwinpr-path.so.0.1
236	lib/libwinpr-path.so.0.1.0
237	lib/libwinpr-pipe.so
238	lib/libwinpr-pipe.so.0.1
239	lib/libwinpr-pipe.so.0.1.0
240	lib/libwinpr-pool.so
241	lib/libwinpr-pool.so.0.1
242	lib/libwinpr-pool.so.0.1.0
243	lib/libwinpr-registry.so
244	lib/libwinpr-registry.so.0.1
245	lib/libwinpr-registry.so.0.1.0
246	lib/libwinpr-rpc.so
247	lib/libwinpr-rpc.so.0.1
248	lib/libwinpr-rpc.so.0.1.0
249	lib/libwinpr-sspi.so
250	lib/libwinpr-sspi.so.0.1
251	lib/libwinpr-sspi.so.0.1.0
252	lib/libwinpr-sspicli.so
253	lib/libwinpr-sspicli.so.0.1
254	lib/libwinpr-sspicli.so.0.1.0
255	lib/libwinpr-synch.so
256	lib/libwinpr-synch.so.0.1
257	lib/libwinpr-synch.so.0.1.0
258	lib/libwinpr-sysinfo.so
259	lib/libwinpr-sysinfo.so.0.1
260	lib/libwinpr-sysinfo.so.0.1.0
261	lib/libwinpr-thread.so
262	lib/libwinpr-thread.so.0.1
263	lib/libwinpr-thread.so.0.1.0
264	lib/libwinpr-timezone.so
265	lib/libwinpr-timezone.so.0.1
266	lib/libwinpr-timezone.so.0.1.0
267	lib/libwinpr-utils.so
268	lib/libwinpr-utils.so.0.1
269	lib/libwinpr-utils.so.0.1.0
270	lib/libwinpr-winhttp.so
271	lib/libwinpr-winhttp.so.0.1
272	lib/libwinpr-winhttp.so.0.1.0
273	lib/libwinpr-winsock.so
274	lib/libwinpr-winsock.so.0.1
275	lib/libwinpr-winsock.so.0.1.0
276	%%X11%%lib/libxfreerdp-client.so	243	%%X11%%lib/libxfreerdp-client.so
277	%%X11%%lib/libxfreerdp-client.so.1.1	244	%%X11%%lib/libxfreerdp-client.so.1.2
278	%%X11%%lib/libxfreerdp-client.so.1.1.0	245	%%X11%%lib/libxfreerdp-client.so.1.2.0
279	libdata/pkgconfig/freerdp.pc	246	libdata/pkgconfig/freerdp.pc
		247	libdata/pkgconfig/winpr.pc
280	%%X11%%man/man1/xfreerdp.1.gz	248	%%X11%%man/man1/xfreerdp.1.gz

Return to bug 198618

Lines 2-9 Link Here

(-)Makefile (-12 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= freerdp	4	PORTNAME= freerdp
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.2.0
6	PORTREVISION= 2
7	CATEGORIES= net comms ipv6	6	CATEGORIES= net comms ipv6
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 14-29 Link Here
14		13
15	USE_OPENSSL= yes	14	USE_OPENSSL= yes
16	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
17	USES= alias cmake:outsource cpe pkgconfig compiler:c++11-lib	16	USES= alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib
18	USE_GITHUB= yes	17	USE_GITHUB= yes
19	GH_ACCOUNT= FreeRDP	18	GH_ACCOUNT= FreeRDP
20	GH_PROJECT= ${GH_ACCOUNT}	19	GH_PROJECT= ${GH_ACCOUNT}
21	GH_TAGNAME= 780d451	20	GH_TAGNAME= f5ff6e1
22		21
23	CPE_VENDOR= freerdp_project	22	CPE_VENDOR= freerdp_project
24		23
25	LDFLAGS+= -L${LOCALBASE}/lib	24	LDFLAGS+= -L${LOCALBASE}/lib
26	CFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include	25	CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
27		26
28	OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11	27	OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
29	OPTIONS_DEFAULT= CUPS GSTREAMER X11	28	OPTIONS_DEFAULT= CUPS GSTREAMER X11
Lines 50-58 Link Here
50	FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON	49	FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON
51	FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF	50	FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF
52		51
53	GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER=ON	52	GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
54	GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER=OFF	53	GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
55	GSTREAMER_USE= gstreamer=yes xorg=x11,xextproto,xext,xrandr	54	GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr
56		55
57	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio	56	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
58	PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON	57	PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON
Lines 65-71 Link Here
65	X11_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto	64	X11_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto
66	X11_CMAKE_ON= -DWITH_X11=ON	65	X11_CMAKE_ON= -DWITH_X11=ON
67	X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF	66	X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF
68	X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi	67	X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes
69		68
70	.include <bsd.port.options.mk>	69	.include <bsd.port.options.mk>
71		70
Lines 75-85 Link Here
75	${WRKSRC}/CMakeLists.txt	74	${WRKSRC}/CMakeLists.txt
76	${REINPLACE_CMD} -e 's\|share/man/man1\|man/man1\|' \	75	${REINPLACE_CMD} -e 's\|share/man/man1\|man/man1\|' \
77	${WRKSRC}/client/X11/CMakeLists.txt	76	${WRKSRC}/client/X11/CMakeLists.txt
78	${REINPLACE_CMD} -e 's\|HW_AVAILCPU\|HW_NCPU\|' \
79	${WRKSRC}/winpr/libwinpr/sysinfo/sysinfo.c
80	${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \	77	${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) \|\| defined(__FreeBSD__)/' \
81	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h	78	${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
82	${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \	79	${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \
83	${WRKSRC}/winpr/libwinpr/crt/alignment.c \
84	${WRKSRC}/channels/drive/client/statvfs.c	80	${WRKSRC}/channels/drive/client/statvfs.c
85	.include <bsd.port.mk>	81	.include <bsd.port.mk>

Lines 1-36 Link Here

(-)files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c (-36 lines)
1	--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2013-07-10 01:00:21.000000000 -0700
2	+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2013-08-12 22:26:28.000000000 -0700
3	@@ -43,12 +43,20 @@
4	#define AVMEDIA_TYPE_AUDIO 1
5	#endif
6
7	+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
8	+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
9	+#endif
10	+
11	typedef struct _TSMFFFmpegDecoder
12	{
13	ITSMFDecoder iface;
14
15	int media_type;
16	+#if LIBAVCODEC_VERSION_MAJOR > 54
17	+ enum AVCodecID codec_id;
18	+#else
19	enum CodecID codec_id;
20	+#endif
21	AVCodecContext* codec_context;
22	AVCodec* codec;
23	AVFrame* frame;
24	@@ -99,8 +107,12 @@
25	mdecoder->codec_context->block_align = media_type->BlockAlign;
26
27	#ifdef AV_CPU_FLAG_SSE2
28	+#if LIBAVCODEC_VERSION_MAJOR < 55
29	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 \| AV_CPU_FLAG_MMX2;
30	#else
31	+ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 \| AV_CPU_FLAG_MMX2);
32	+#endif
33	+#else
34	#if LIBAVCODEC_VERSION_MAJOR < 53
35	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 \| FF_MM_MMXEXT;
36	#else

Lines 1-14 Link Here

(-)files/patch-client_common_compatibility.c (-14 lines)
1
2	$FreeBSD$
3
4	--- client/common/compatibility.c.orig
5	+++ client/common/compatibility.c
6	@@ -515,7 +515,7 @@
7	settings->PerformanceFlags = type;
8	}
9
10	- fprintf(stderr, "-x %s -> /network ", arg->Value);
11	+ fprintf(stderr, "-x %s -> /network:", arg->Value);
12
13	if (type == CONNECTION_TYPE_MODEM)
14	fprintf(stderr, "modem");

Lines 55-70 Link Here

(-)files/patch-git_1b663cef (-13 lines)
55	-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)	55	-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
56	\ No newline at end of file	56	\ No newline at end of file
57	+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)	57	+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
58	--- winpr/libwinpr/CMakeLists.txt
59	+++ winpr/libwinpr/CMakeLists.txt
60	@@ -32,8 +32,8 @@
61	file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
62
63	foreach(FILEPATH ${FILEPATHS})
64	- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
65	- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH})
66	+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
67	+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH})
68	set(${MODULE_PREFIX}_SUBMODULES ${${MODULE_PREFIX}_SUBMODULES} ${${MODULE_PREFIX}_SUBMODULE})
69	endif()
70	endforeach(FILEPATH)

Line 0 Link Here

(-)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-14 Link Here

(-)files/patch-libfreerdp-locale-timezone.c (-12 / +40 lines)
1	--- libfreerdp/locale/timezone.c.orig 2013-07-10 19:00:21.000000000 +1100	1	From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001
2	+++ libfreerdp/locale/timezone.c 2014-01-08 03:32:36.919691015 +1100	2	From: ivan-83 <rozhuk.im@gmail.com>
3	@@ -1663,7 +1663,10 @@	3	Date: Tue, 10 Mar 2015 04:40:47 +0300
4	local_time = localtime(&t);	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	}
5		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
6	#ifdef HAVE_TM_GMTOFF	29	#ifdef HAVE_TM_GMTOFF
7	- clientTimeZone->bias = timezone / 60;	30	#if defined(__FreeBSD__)
8	+ if (local_time->tm_gmtoff >= 0)	31	- /not the best solution, but could not get the right tyepcast/
9	+ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);	32	- clientTimeZone->bias = 0;
10	+ else	33	+ if (local_time->tm_gmtoff >= 0)
11	+ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));	34	+ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
12	DEBUG_TIMEZONE("tzname[std]: %s, tzname[dst]: %s, timezone: %ld, Daylight: %d", tzname[0], tzname[1], timezone, daylight);	35	+ else
13	#elif defined(sun)	36	+ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
14	if (local_time->tm_isdst > 0)	37	#else
		38	clientTimeZone->bias = timezone / 60;
		39	#endif
		40	--
		41	2.4.1
		42