From d0ea56deb08f32659f5aef555ad218c6773f985e Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Sun, 11 Dec 2016 04:36:57 +0000 Subject: net/freerdp: Update to 2.0.0 pre-release (GitHub as of 2016.11.24) - This update brings in the latest 2 years of FreeRDP project work, which has had a long time between tagging releases. - Remove DIRECTFB option, as it no longer compiles, and gets little upstream maintenance - Use NEON on aarch64, and optionally on armv6 - Mark as broken on armv6 on FreeBSD 11.0-RELEASE and early versions of 12.0-CURRENT - Fix issue with X11_USE=xorg= being truncated due to whitespace as it wrapped over multiple lines - Move installed *.cmake files to correct location for modules net/freerdp1: - create new port based on previous net/freerdp 1.2.0, as it is required by net/guacamole-server net/vinagre: - patch to work with the new version of net/freerdp 2.0.0 net/guacamole-server: - patch to work with net/freerdp1 PR: 212004 PR: 214956 Submitted by: Kyle Evans (maintainer) Reported by: John Hein Reviewed by: Mikael Urankar Reviewed by: Ting-Wei Lan Reviewed by: Antenore Gatta Reviewed by: amdmi3 Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D8712 --- net/freerdp1/files/patch-git_434436b7 | 74 +++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 net/freerdp1/files/patch-git_434436b7 (limited to 'net/freerdp1/files/patch-git_434436b7') diff --git a/net/freerdp1/files/patch-git_434436b7 b/net/freerdp1/files/patch-git_434436b7 new file mode 100644 index 000000000000..6db84088dede --- /dev/null +++ b/net/freerdp1/files/patch-git_434436b7 @@ -0,0 +1,74 @@ +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 + -- cgit v1.2.3