Index: net/freerdp/Makefile =================================================================== --- net/freerdp/Makefile (revision 427053) +++ net/freerdp/Makefile (working copy) @@ -1,9 +1,7 @@ -# Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= freerdp -PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTVERSION= 2.0.0.g2016.11.24 CATEGORIES= net comms ipv6 MAINTAINER= bsdports@kyle-evans.net @@ -12,71 +10,63 @@ 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= f5ff6e1 +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 -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include +CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF -DARM_FP_ABI=hard -OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11 +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_ON= -DWITH_ALSA=ON -ALSA_CMAKE_OFF= -DWITH_ALSA=OFF +ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CMAKE_ON= -DWITH_CUPS=ON -CUPS_CMAKE_OFF= -DWITH_CUPS=OFF +CUPS_CMAKE_BOOL= WITH_CUPS -# 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_ON= -DWITH_FFMPEG=ON -FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF +FFMPEG_CMAKE_BOOL= WITH_FFMPEG -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 +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_ON= -DWITH_PULSE=ON -PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF +PULSEAUDIO_CMAKE_BOOL= WITH_PULSE -SSE_CMAKE_ON= -DWITH_SSE2=ON -SSE_CMAKE_OFF= -DWITH_SSE2=OFF +SSE_CMAKE_BOOL= WITH_SSE2 X11_DESC= Build FreeRDP X11 client X11_BUILD_DEPENDS= xmlto: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,xrender +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 -.include - -post-extract: - ${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ - -e '/CMAKE_INSTALL_RPATH /d' \ +post-patch: + @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ ${WRKSRC}/CMakeLists.txt - ${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ + @${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \ + ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/client/X11/CMakeLists.txt - ${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ + @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h - ${REINPLACE_CMD} -e 's|||' \ + @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/channels/drive/client/statvfs.c + @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake + .include Index: net/freerdp/distinfo =================================================================== --- net/freerdp/distinfo (revision 427053) +++ net/freerdp/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470755086 -SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32 -SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856 +TIMESTAMP = 1480005507 +SHA256 (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 2a8550c3b067f49353614c4dc13fff4b2c0cf7653dd765c8e44eccaf8c79f20b +SIZE (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 6417326 Index: net/freerdp/files/patch-CMakeLists.txt =================================================================== --- net/freerdp/files/patch-CMakeLists.txt (revision 427053) +++ net/freerdp/files/patch-CMakeLists.txt (working copy) @@ -1,13 +1,14 @@ ---- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC +--- CMakeLists.txt.orig 2016-11-24 13:19:47 UTC +++ CMakeLists.txt -@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") - set(FREEBSD TRUE) +@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") endif() endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") + set(BSD TRUE) + set(FREEBSD TRUE) +endif() - - # Android - if(ANDROID) ++ + # Configure MSVC Runtime + if(MSVC) + include(MSVCRuntime) Index: net/freerdp/files/patch-cmake-FindOpenSSL.cmake =================================================================== --- net/freerdp/files/patch-cmake-FindOpenSSL.cmake (revision 427053) +++ net/freerdp/files/patch-cmake-FindOpenSSL.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/FindOpenSSL.cmake.orig 2013-07-10 04:00:21.000000000 -0400 -+++ cmake/FindOpenSSL.cmake 2015-03-25 19:26:35.154024000 -0400 -@@ -270,7 +270,7 @@ - set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") - file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str -- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") -+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") - - # The version number is encoded as 0xMNNFFPPS: major minor fix patch status - # The status gives if this is a developer or prerelease and is ignored here. Property changes on: net/freerdp/files/patch-cmake-FindOpenSSL.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-cmake_ConfigOptions.cmake =================================================================== --- net/freerdp/files/patch-cmake_ConfigOptions.cmake (revision 427053) +++ net/freerdp/files/patch-cmake_ConfigOptions.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/ConfigOptions.cmake.orig 2015-11-29 19:53:58 UTC -+++ cmake/ConfigOptions.cmake -@@ -6,7 +6,7 @@ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES " - elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE)) - # Mac is weird like that. - set(TARGET_ARCH "x64") --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") - set(TARGET_ARCH "ARM") - endif() - Property changes on: net/freerdp/files/patch-cmake_ConfigOptions.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake =================================================================== --- net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake (revision 427053) +++ net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake (nonexistent) @@ -1,16 +0,0 @@ -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 Property changes on: net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake =================================================================== --- net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (revision 427053) +++ net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (working copy) @@ -2,15 +2,15 @@ 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 @@ +--- 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 gst/gst.h gstreamer-1.0) +-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 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) + FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0) # 1.2. Check Gstreamer version Index: net/freerdp/files/patch-ffmpeg29 =================================================================== --- net/freerdp/files/patch-ffmpeg29 (revision 427053) +++ net/freerdp/files/patch-ffmpeg29 (working copy) @@ -1,45 +1,15 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -Last-Update: <2015-11-02> - ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-06-11 21:12:27.134896000 +0200 -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-06-11 21:14:05.282247000 +0200 -@@ -103,7 +103,7 @@ - mdecoder->codec_context->bit_rate = media_type->BitRate; - mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; -- mdecoder->frame = avcodec_alloc_frame(); -+ mdecoder->frame = av_frame_alloc(); - return TRUE; - } +--- 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); + } -@@ -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; - } -@@ -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 @@ +@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1); memcpy(dst, decoded_frame->data[0], frame_size); } @@ -47,29 +17,20 @@ + av_frame_free(&decoded_frame); } #endif - if(len <= 0 || frame_size <= 0) -@@ -464,7 +464,7 @@ - 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 @@ + if (len <= 0 || frame_size <= 0) +@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode { - TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; - if(mdecoder->frame) + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + if (mdecoder->frame) - av_free(mdecoder->frame); + av_frame_free(&mdecoder->frame); - if(mdecoder->decoded_data) - free(mdecoder->decoded_data); - if(mdecoder->codec_context) -@@ -501,7 +501,7 @@ + + free(mdecoder->decoded_data); + +@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode avcodec_close(mdecoder->codec_context); - if(mdecoder->codec_context->extradata) - free(mdecoder->codec_context->extradata); + + free(mdecoder->codec_context->extradata); - av_free(mdecoder->codec_context); + av_frame_free(&mdecoder->codec_context); } Index: net/freerdp/files/patch-freerdp.pc.in =================================================================== --- net/freerdp/files/patch-freerdp.pc.in (revision 427053) +++ net/freerdp/files/patch-freerdp.pc.in (nonexistent) @@ -1,13 +0,0 @@ -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} Property changes on: net/freerdp/files/patch-freerdp.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-git_1b663cef =================================================================== --- net/freerdp/files/patch-git_1b663cef (revision 427053) +++ net/freerdp/files/patch-git_1b663cef (nonexistent) @@ -1,57 +0,0 @@ -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 -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) Property changes on: net/freerdp/files/patch-git_1b663cef ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-git_434436b7 =================================================================== --- net/freerdp/files/patch-git_434436b7 (revision 427053) +++ net/freerdp/files/patch-git_434436b7 (nonexistent) @@ -1,74 +0,0 @@ -From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001 -From: ivan-83 -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 -+#include - - #ifdef HAVE_UNISTD_H - #include -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 - Property changes on: net/freerdp/files/patch-git_434436b7 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-libfreerdp-locale-timezone.c =================================================================== --- net/freerdp/files/patch-libfreerdp-locale-timezone.c (revision 427053) +++ net/freerdp/files/patch-libfreerdp-locale-timezone.c (nonexistent) @@ -1,42 +0,0 @@ -From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001 -From: ivan-83 -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 - Property changes on: net/freerdp/files/patch-libfreerdp-locale-timezone.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-libfreerdp_freerdp.pc.in =================================================================== --- net/freerdp/files/patch-libfreerdp_freerdp.pc.in (revision 427053) +++ net/freerdp/files/patch-libfreerdp_freerdp.pc.in (working copy) @@ -1,13 +1,11 @@ -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 @@ +--- 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 URL: http://www.freerdp.com/ - Version: @FREERDP_VERSION_FULL@ + Version: @FREERDP_VERSION@ Requires: --Requires.private: winpr zlib libssl -+Requires.private: winpr +-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: net/freerdp/files/patch-winpr.pc.in =================================================================== --- net/freerdp/files/patch-winpr.pc.in (revision 427053) +++ net/freerdp/files/patch-winpr.pc.in (nonexistent) @@ -1,12 +0,0 @@ -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} Property changes on: net/freerdp/files/patch-winpr.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/files/patch-winpr_winpr.pc.in =================================================================== --- net/freerdp/files/patch-winpr_winpr.pc.in (revision 427053) +++ net/freerdp/files/patch-winpr_winpr.pc.in (working copy) @@ -1,12 +1,10 @@ -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 @@ +--- 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 URL: http://www.freerdp.com/ - Version: @WINPR_VERSION_FULL@ - Requires: --Requires.private: zlib libssl + Version: @WINPR_VERSION@ + Requires: +-Requires.private: libssl Libs: -L${libdir} ${libs} Libs.private: -ldl -lrt -lm -lpthread Cflags: -I${includedir} Index: net/freerdp/files/patch-z001-CMakeLists.txt =================================================================== --- net/freerdp/files/patch-z001-CMakeLists.txt (revision 427053) +++ net/freerdp/files/patch-z001-CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- 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) Property changes on: net/freerdp/files/patch-z001-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/freerdp/pkg-plist =================================================================== --- net/freerdp/pkg-plist (revision 427053) +++ net/freerdp/pkg-plist (working copy) @@ -1,248 +1,222 @@ -%%DIRECTFB%%bin/dfreerdp +bin/winpr-hash +bin/winpr-makecert %%X11%%bin/xfreerdp -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 -include/freerdp/cache/glyph.h -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.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 -include/freerdp/crypto/crypto.h -include/freerdp/crypto/der.h -include/freerdp/crypto/er.h -include/freerdp/crypto/per.h -include/freerdp/crypto/tls.h -include/freerdp/dvc.h -include/freerdp/error.h -include/freerdp/event.h -include/freerdp/extension.h -include/freerdp/freerdp.h -include/freerdp/gdi/16bpp.h -include/freerdp/gdi/32bpp.h -include/freerdp/gdi/8bpp.h -include/freerdp/gdi/bitmap.h -include/freerdp/gdi/brush.h -include/freerdp/gdi/clipping.h -include/freerdp/gdi/dc.h -include/freerdp/gdi/drawing.h -include/freerdp/gdi/gdi.h -include/freerdp/gdi/line.h -include/freerdp/gdi/palette.h -include/freerdp/gdi/pen.h -include/freerdp/gdi/region.h -include/freerdp/gdi/shape.h -include/freerdp/graphics.h -include/freerdp/input.h -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 -include/freerdp/primitives.h -include/freerdp/rail.h -include/freerdp/rail/icon.h -include/freerdp/rail/rail.h -include/freerdp/rail/window.h -include/freerdp/rail/window_list.h -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/debug.h -include/freerdp/utils/event.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/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 -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 -include/winpr/platform.h -include/winpr/pool.h -include/winpr/print.h -include/winpr/registry.h -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 -include/winpr/string.h -include/winpr/synch.h -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/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 +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/libfreerdp-client.so -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 -%%X11%%lib/libxfreerdp-client.so -%%X11%%lib/libxfreerdp-client.so.1.2 -%%X11%%lib/libxfreerdp-client.so.1.2.0 -libdata/pkgconfig/freerdp.pc -libdata/pkgconfig/winpr.pc +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 Index: net/vinagre/files/patch-configure =================================================================== --- net/vinagre/files/patch-configure (nonexistent) +++ net/vinagre/files/patch-configure (working copy) @@ -0,0 +1,22 @@ +--- 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 Property changes on: net/vinagre/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c =================================================================== --- net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c (nonexistent) +++ net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c (working copy) @@ -0,0 +1,11 @@ +--- plugins/rdp/vinagre-rdp-tab.c.orig 2015-10-06 15:40:06 UTC ++++ plugins/rdp/vinagre-rdp-tab.c +@@ -1108,7 +1107,7 @@ open_freerdp (VinagreRdpTab *rdp_tab) + settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; + #endif + #include +-#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) ++#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) + settings->UseRdpSecurityLayer = FALSE; + #else + settings->DisableEncryption = FALSE; Property changes on: net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property