diff options
author | Ben Woods <woodsb02@FreeBSD.org> | 2016-12-11 04:36:57 +0000 |
---|---|---|
committer | Ben Woods <woodsb02@FreeBSD.org> | 2016-12-11 04:36:57 +0000 |
commit | d0ea56deb08f32659f5aef555ad218c6773f985e (patch) | |
tree | 3b8430d61957c595f3da0c8c31c214506f0917ca /net/freerdp1/files/patch-git_1b663cef | |
parent | - Update to 0.7.10 (diff) |
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 <z7dr6ut7gs@snkmail.com>
Reviewed by: Mikael Urankar <mikael.urankar@gmail.com>
Reviewed by: Ting-Wei Lan <lantw44@gmail.com>
Reviewed by: Antenore Gatta <antenore@simbiosi.org>
Reviewed by: amdmi3
Approved by: adamw (mentor)
Differential Revision: https://reviews.freebsd.org/D8712
Notes
Notes:
svn path=/head/; revision=428330
Diffstat (limited to 'net/freerdp1/files/patch-git_1b663cef')
-rw-r--r-- | net/freerdp1/files/patch-git_1b663cef | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/net/freerdp1/files/patch-git_1b663cef b/net/freerdp1/files/patch-git_1b663cef new file mode 100644 index 000000000000..5d697c226490 --- /dev/null +++ b/net/freerdp1/files/patch-git_1b663cef @@ -0,0 +1,57 @@ +The patch below comes from upstream and has been slightly adjusted to apply +on the tarball we build. + +From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 +From: Bernhard Miklautz <bernhard.miklautz@shacknet.at> +Date: Fri, 12 Dec 2014 18:26:45 +0100 +Subject: [PATCH] build: cmake 3.1 compatibility + +* fix problem with REMOVE_DUPLICATES on undefined lists +* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as + previously - necessary adoptions for regex and matches done. Should + work with all cmake versions. + +Tested with 3.1.0-rc3 +--- channels/CMakeLists.txt ++++ channels/CMakeLists.txt +@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake") + file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + + foreach(FILEPATH ${FILEPATHS}) +- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") +- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH}) ++ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") ++ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH}) + set(CHANNEL_OPTION) + include(${FILEPATH}) + if(${CHANNEL_OPTION}) +--- channels/client/CMakeLists.txt ++++ channels/client/CMakeLists.txt +@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/addin.c + ${CMAKE_CURRENT_SOURCE_DIR}/addin.h) + ++if(CHANNEL_STATIC_CLIENT_ENTRIES) + list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES) ++endif() + + foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) + foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) +--- third-party/CMakeLists.txt ++++ third-party/CMakeLists.txt +@@ -22,11 +22,11 @@ + file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") + + foreach(dir ${all_valid_subdirs}) +- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") +- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) ++ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt") ++ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir}) + message(STATUS "Adding third-party component ${dir_trimmed}") + add_subdirectory(${dir_trimmed}) + endif() + endforeach(dir) + +-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) +\ No newline at end of file ++set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) |