net/freerdp: 1.1.0 -> 1.2.0

- The version is known as 1.2.0-beta1+android9
- USES=execinfo is required on FreeBSD 9 and 8
- Fixes build issues

PR:		198618
Requested by:	rozhuk.im@gmail.com
Submitted by:	Ting-Wei Lan <lantw44@gmail.com>

8 files changed, 221 insertions, 215 deletions

diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 932d5f075df8..cc7e7d9554d2 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freerdp
-PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTVERSION=	1.2.0
 CATEGORIES=	net comms ipv6
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,16 +13,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USES=		alias cmake:outsource cpe pkgconfig compiler:c++11-lib
+USES=		alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	${GH_ACCOUNT}
-GH_TAGNAME=	780d451
+GH_TAGNAME=	f5ff6e1
 
 CPE_VENDOR=	freerdp_project
 
 LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include
+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
@@ -50,9 +49,9 @@ FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 FFMPEG_CMAKE_ON=	-DWITH_FFMPEG=ON
 FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF
 
-GSTREAMER_CMAKE_ON=	-DWITH_GSTREAMER=ON
-GSTREAMER_CMAKE_OFF=	-DWITH_GSTREAMER=OFF
-GSTREAMER_USE=		gstreamer=yes xorg=x11,xextproto,xext,xrandr
+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
@@ -65,7 +64,7 @@ X11_DESC=		Build FreeRDP X11 client
 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
+X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi,xfixes
 
 .include <bsd.port.options.mk>
 
@@ -75,11 +74,8 @@ post-extract:
 		${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>
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index 25c287b79b14..7ce12b3cab1a 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FreeRDP-FreeRDP-1.1.0-780d451_GH0.tar.gz) = 5b74a7d79db896d1b2f8df350f892e7f9aee8ea25a6974185b9cc739dbc0935a
-SIZE (FreeRDP-FreeRDP-1.1.0-780d451_GH0.tar.gz) = 6677660
+SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32
+SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856
diff --git a/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c b/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c
deleted file mode 100644
index db579217e576..000000000000
--- a/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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
diff --git a/net/freerdp/files/patch-client_common_compatibility.c b/net/freerdp/files/patch-client_common_compatibility.c
deleted file mode 100644
index 6d58729af101..000000000000
--- a/net/freerdp/files/patch-client_common_compatibility.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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");
diff --git a/net/freerdp/files/patch-git_1b663cef b/net/freerdp/files/patch-git_1b663cef
index 3161fe32f24f..5d697c226490 100644
--- a/net/freerdp/files/patch-git_1b663cef
+++ b/net/freerdp/files/patch-git_1b663cef
@@ -55,16 +55,3 @@ Tested with 3.1.0-rc3
 -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)
diff --git a/net/freerdp/files/patch-git_434436b7 b/net/freerdp/files/patch-git_434436b7
new file mode 100644
index 000000000000..6db84088dede
--- /dev/null
+++ b/net/freerdp/files/patch-git_434436b7
@@ -0,0 +1,74 @@
+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
+
diff --git a/net/freerdp/files/patch-libfreerdp-locale-timezone.c b/net/freerdp/files/patch-libfreerdp-locale-timezone.c
index 51ce0e5cbbfd..ee8d2e4bb070 100644
--- a/net/freerdp/files/patch-libfreerdp-locale-timezone.c
+++ b/net/freerdp/files/patch-libfreerdp-locale-timezone.c
@@ -1,14 +1,42 @@
---- libfreerdp/locale/timezone.c.orig	2013-07-10 19:00:21.000000000 +1100
-+++ libfreerdp/locale/timezone.c	2014-01-08 03:32:36.919691015 +1100
-@@ -1663,7 +1663,10 @@
- 	local_time = localtime(&t);
+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
--    clientTimeZone->bias = timezone / 60;
-+  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));
- 	DEBUG_TIMEZONE("tzname[std]: %s, tzname[dst]: %s, timezone: %ld, Daylight: %d", tzname[0], tzname[1], timezone, daylight);
- #elif defined(sun)
- 	if (local_time->tm_isdst > 0)
+ 	#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
+
diff --git a/net/freerdp/pkg-plist b/net/freerdp/pkg-plist
index 07384d77395d..de35b4e558b3 100644
--- a/net/freerdp/pkg-plist
+++ b/net/freerdp/pkg-plist
@@ -3,6 +3,7 @@
 include/freerdp/addin.h
 include/freerdp/altsec.h
 include/freerdp/api.h
+include/freerdp/assistance.h
 include/freerdp/cache/bitmap.h
 include/freerdp/cache/brush.h
 include/freerdp/cache/cache.h
@@ -11,27 +12,52 @@ include/freerdp/cache/nine_grid.h
 include/freerdp/cache/offscreen.h
 include/freerdp/cache/palette.h
 include/freerdp/cache/pointer.h
+include/freerdp/channels/audin.h
 include/freerdp/channels/channels.h
+include/freerdp/channels/cliprdr.h
+include/freerdp/channels/encomsp.h
+include/freerdp/channels/log.h
+include/freerdp/channels/rail.h
 include/freerdp/channels/rdpdr.h
+include/freerdp/channels/rdpgfx.h
 include/freerdp/channels/rdpsnd.h
+include/freerdp/channels/remdesk.h
+include/freerdp/channels/tsmf.h
 include/freerdp/channels/wtsvc.h
 include/freerdp/client.h
+include/freerdp/client/audin.h
 include/freerdp/client/channels.h
 include/freerdp/client/cliprdr.h
 include/freerdp/client/cmdline.h
+include/freerdp/client/disp.h
 include/freerdp/client/drdynvc.h
+include/freerdp/client/encomsp.h
 include/freerdp/client/file.h
+include/freerdp/client/rail.h
 include/freerdp/client/rdpei.h
+include/freerdp/client/rdpgfx.h
+include/freerdp/client/rdpsnd.h
+include/freerdp/client/remdesk.h
 include/freerdp/client/tsmf.h
 include/freerdp/codec/audio.h
 include/freerdp/codec/bitmap.h
+include/freerdp/codec/bulk.h
+include/freerdp/codec/clear.h
 include/freerdp/codec/color.h
 include/freerdp/codec/dsp.h
+include/freerdp/codec/h264.h
+include/freerdp/codec/interleaved.h
 include/freerdp/codec/jpeg.h
-include/freerdp/codec/mppc_dec.h
-include/freerdp/codec/mppc_enc.h
+include/freerdp/codec/mppc.h
+include/freerdp/codec/ncrush.h
 include/freerdp/codec/nsc.h
+include/freerdp/codec/planar.h
+include/freerdp/codec/progressive.h
+include/freerdp/codec/region.h
 include/freerdp/codec/rfx.h
+include/freerdp/codec/xcrush.h
+include/freerdp/codec/zgfx.h
+include/freerdp/codecs.h
 include/freerdp/constants.h
 include/freerdp/crypto/ber.h
 include/freerdp/crypto/certificate.h
@@ -65,7 +91,9 @@ include/freerdp/listener.h
 include/freerdp/locale/keyboard.h
 include/freerdp/locale/locale.h
 include/freerdp/locale/timezone.h
+include/freerdp/log.h
 include/freerdp/message.h
+include/freerdp/metrics.h
 include/freerdp/peer.h
 include/freerdp/pointer.h
 include/freerdp/primary.h
@@ -79,36 +107,45 @@ include/freerdp/scancode.h
 include/freerdp/secondary.h
 include/freerdp/server/audin.h
 include/freerdp/server/channels.h
+include/freerdp/server/cliprdr.h
+include/freerdp/server/drdynvc.h
+include/freerdp/server/echo.h
+include/freerdp/server/encomsp.h
+include/freerdp/server/rdpdr.h
 include/freerdp/server/rdpsnd.h
+include/freerdp/server/remdesk.h
+include/freerdp/server/shadow.h
 include/freerdp/settings.h
 include/freerdp/svc.h
 include/freerdp/types.h
 include/freerdp/update.h
-include/freerdp/utils/bitmap.h
 include/freerdp/utils/debug.h
 include/freerdp/utils/event.h
-include/freerdp/utils/list.h
 include/freerdp/utils/msusb.h
 include/freerdp/utils/passphrase.h
 include/freerdp/utils/pcap.h
 include/freerdp/utils/profiler.h
 include/freerdp/utils/rail.h
+include/freerdp/utils/ringbuffer.h
 include/freerdp/utils/signal.h
 include/freerdp/utils/stopwatch.h
 include/freerdp/utils/svc_plugin.h
 include/freerdp/utils/tcp.h
 include/freerdp/utils/time.h
 include/freerdp/utils/uds.h
+include/freerdp/version.h
 include/freerdp/window.h
 include/winpr/asn1.h
 include/winpr/bcrypt.h
+include/winpr/bitstream.h
 include/winpr/cmdline.h
 include/winpr/collections.h
-include/winpr/config.h
+include/winpr/comm.h
 include/winpr/credentials.h
 include/winpr/credui.h
 include/winpr/crt.h
 include/winpr/crypto.h
+include/winpr/debug.h
 include/winpr/dsparse.h
 include/winpr/endian.h
 include/winpr/environment.h
@@ -116,13 +153,17 @@ include/winpr/error.h
 include/winpr/file.h
 include/winpr/handle.h
 include/winpr/heap.h
+include/winpr/image.h
+include/winpr/ini.h
 include/winpr/input.h
 include/winpr/interlocked.h
 include/winpr/io.h
 include/winpr/library.h
+include/winpr/locale.h
 include/winpr/memory.h
 include/winpr/midl.h
 include/winpr/ndr.h
+include/winpr/nt.h
 include/winpr/ntlm.h
 include/winpr/path.h
 include/winpr/pipe.h
@@ -134,7 +175,9 @@ include/winpr/rpc.h
 include/winpr/sam.h
 include/winpr/schannel.h
 include/winpr/security.h
+include/winpr/smartcard.h
 include/winpr/spec.h
+include/winpr/ssl.h
 include/winpr/sspi.h
 include/winpr/sspicli.h
 include/winpr/stream.h
@@ -144,137 +187,62 @@ include/winpr/sysinfo.h
 include/winpr/tchar.h
 include/winpr/thread.h
 include/winpr/timezone.h
+include/winpr/tools/makecert.h
 include/winpr/windows.h
 include/winpr/winhttp.h
 include/winpr/winpr.h
 include/winpr/winsock.h
+include/winpr/wlog.h
+include/winpr/wnd.h
+include/winpr/wtsapi.h
 include/winpr/wtypes.h
-lib/libfreerdp-cache.so
-lib/libfreerdp-cache.so.1.1
-lib/libfreerdp-cache.so.1.1.0
+lib/cmake/FreeRDP/FreeRDPConfig.cmake
+lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake
+lib/cmake/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/FreeRDP/FreeRDPTargets.cmake
+lib/cmake/WinPR/WinPRConfig.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.1.1
-lib/libfreerdp-client.so.1.1.0
-lib/libfreerdp-codec.so
-lib/libfreerdp-codec.so.1.1
-lib/libfreerdp-codec.so.1.1.0
-lib/libfreerdp-common.so
-lib/libfreerdp-common.so.1.1.0
-lib/libfreerdp-common.so.1.1.0-beta1
-lib/libfreerdp-core.so
-lib/libfreerdp-core.so.1.1
-lib/libfreerdp-core.so.1.1.0
-lib/libfreerdp-crypto.so
-lib/libfreerdp-crypto.so.1.1
-lib/libfreerdp-crypto.so.1.1.0
-lib/libfreerdp-gdi.so
-lib/libfreerdp-gdi.so.1.1
-lib/libfreerdp-gdi.so.1.1.0
-lib/libfreerdp-locale.so
-lib/libfreerdp-locale.so.1.1
-lib/libfreerdp-locale.so.1.1.0
-lib/libfreerdp-primitives.so
-lib/libfreerdp-primitives.so.1.1
-lib/libfreerdp-primitives.so.1.1.0
-lib/libfreerdp-rail.so
-lib/libfreerdp-rail.so.1.1
-lib/libfreerdp-rail.so.1.1.0
-lib/libfreerdp-utils.so
-lib/libfreerdp-utils.so.1.1
-lib/libfreerdp-utils.so.1.1.0
-lib/libwinpr-asn1.so
-lib/libwinpr-asn1.so.0.1
-lib/libwinpr-asn1.so.0.1.0
-lib/libwinpr-bcrypt.so
-lib/libwinpr-bcrypt.so.0.1
-lib/libwinpr-bcrypt.so.0.1.0
-lib/libwinpr-credentials.so
-lib/libwinpr-credentials.so.0.1
-lib/libwinpr-credentials.so.0.1.0
-lib/libwinpr-credui.so
-lib/libwinpr-credui.so.0.1
-lib/libwinpr-credui.so.0.1.0
-lib/libwinpr-crt.so
-lib/libwinpr-crt.so.0.1
-lib/libwinpr-crt.so.0.1.0
-lib/libwinpr-crypto.so
-lib/libwinpr-crypto.so.0.1
-lib/libwinpr-crypto.so.0.1.0
-lib/libwinpr-dsparse.so
-lib/libwinpr-dsparse.so.0.1
-lib/libwinpr-dsparse.so.0.1.0
-lib/libwinpr-environment.so
-lib/libwinpr-environment.so.0.1
-lib/libwinpr-environment.so.0.1.0
-lib/libwinpr-error.so
-lib/libwinpr-error.so.0.1
-lib/libwinpr-error.so.0.1.0
-lib/libwinpr-file.so
-lib/libwinpr-file.so.0.1
-lib/libwinpr-file.so.0.1.0
-lib/libwinpr-handle.so
-lib/libwinpr-handle.so.0.1
-lib/libwinpr-handle.so.0.1.0
-lib/libwinpr-heap.so
-lib/libwinpr-heap.so.0.1
-lib/libwinpr-heap.so.0.1.0
-lib/libwinpr-input.so
-lib/libwinpr-input.so.0.1
-lib/libwinpr-input.so.0.1.0
-lib/libwinpr-interlocked.so
-lib/libwinpr-interlocked.so.0.1
-lib/libwinpr-interlocked.so.0.1.0
-lib/libwinpr-io.so
-lib/libwinpr-io.so.0.1
-lib/libwinpr-io.so.0.1.0
-lib/libwinpr-library.so
-lib/libwinpr-library.so.0.1
-lib/libwinpr-library.so.0.1.0
+lib/libfreerdp-client.so.1.2
+lib/libfreerdp-client.so.1.2.0
+lib/libwinpr.so          
+lib/libwinpr.so.1.1      
+lib/libwinpr.so.1.1.0    
 lib/libwinpr-makecert-tool.a
-lib/libwinpr-path.so
-lib/libwinpr-path.so.0.1
-lib/libwinpr-path.so.0.1.0
-lib/libwinpr-pipe.so
-lib/libwinpr-pipe.so.0.1
-lib/libwinpr-pipe.so.0.1.0
-lib/libwinpr-pool.so
-lib/libwinpr-pool.so.0.1
-lib/libwinpr-pool.so.0.1.0
-lib/libwinpr-registry.so
-lib/libwinpr-registry.so.0.1
-lib/libwinpr-registry.so.0.1.0
-lib/libwinpr-rpc.so
-lib/libwinpr-rpc.so.0.1
-lib/libwinpr-rpc.so.0.1.0
-lib/libwinpr-sspi.so
-lib/libwinpr-sspi.so.0.1
-lib/libwinpr-sspi.so.0.1.0
-lib/libwinpr-sspicli.so
-lib/libwinpr-sspicli.so.0.1
-lib/libwinpr-sspicli.so.0.1.0
-lib/libwinpr-synch.so
-lib/libwinpr-synch.so.0.1
-lib/libwinpr-synch.so.0.1.0
-lib/libwinpr-sysinfo.so
-lib/libwinpr-sysinfo.so.0.1
-lib/libwinpr-sysinfo.so.0.1.0
-lib/libwinpr-thread.so
-lib/libwinpr-thread.so.0.1
-lib/libwinpr-thread.so.0.1.0
-lib/libwinpr-timezone.so
-lib/libwinpr-timezone.so.0.1
-lib/libwinpr-timezone.so.0.1.0
-lib/libwinpr-utils.so
-lib/libwinpr-utils.so.0.1
-lib/libwinpr-utils.so.0.1.0
-lib/libwinpr-winhttp.so
-lib/libwinpr-winhttp.so.0.1
-lib/libwinpr-winhttp.so.0.1.0
-lib/libwinpr-winsock.so
-lib/libwinpr-winsock.so.0.1
-lib/libwinpr-winsock.so.0.1.0
 %%X11%%lib/libxfreerdp-client.so
-%%X11%%lib/libxfreerdp-client.so.1.1
-%%X11%%lib/libxfreerdp-client.so.1.1.0
+%%X11%%lib/libxfreerdp-client.so.1.2
+%%X11%%lib/libxfreerdp-client.so.1.2.0
 libdata/pkgconfig/freerdp.pc
+libdata/pkgconfig/winpr.pc
 %%X11%%man/man1/xfreerdp.1.gz