diff options
| author | Mikhail Paulyshka <me@mixaill.tk> | 2017-05-11 03:08:24 +0300 |
|---|---|---|
| committer | Mikhail Paulyshka <me@mixaill.tk> | 2017-05-11 03:08:24 +0300 |
| commit | 91b993104fcb41c0ddc9cd40d94949b303c8f702 (patch) | |
| tree | 86939f5561f78a231489ea71acbe0ee9a4d11629 | |
| parent | 161b9e44a954bdbb08126de34d549cb15afc6a66 (diff) | |
| download | vcpkg-91b993104fcb41c0ddc9cd40d94949b303c8f702.tar.gz vcpkg-91b993104fcb41c0ddc9cd40d94949b303c8f702.zip | |
[freerdp] fix FreeRDP version in generated header file
| -rw-r--r-- | ports/freerdp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freerdp/FixGitRevisionDetection.patch | 29 | ||||
| -rw-r--r-- | ports/freerdp/portfile.cmake | 17 |
3 files changed, 41 insertions, 7 deletions
diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL index ecb446c72..cdbca23e7 100644 --- a/ports/freerdp/CONTROL +++ b/ports/freerdp/CONTROL @@ -1,4 +1,4 @@ Source: freerdp -Version: 2.0.0-beta1+android11 +Version: 2.0.0-beta1+android11~vcpkg1 Description: A free implementation of the Remote Desktop Protocol (RDP) Build-Depends: openssl
\ No newline at end of file diff --git a/ports/freerdp/FixGitRevisionDetection.patch b/ports/freerdp/FixGitRevisionDetection.patch new file mode 100644 index 000000000..dd0b33cb5 --- /dev/null +++ b/ports/freerdp/FixGitRevisionDetection.patch @@ -0,0 +1,29 @@ +From 7d0c833dc33135d435c018930949d10cfacead04 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka <me@mixaill.tk> +Date: Thu, 11 May 2017 02:56:48 +0300 +Subject: [PATCH] Disable automatic git revision detection + +--- + CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf93d9a05..b62c31cae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,12 +113,6 @@ if(CCACHE AND WITH_CCACHE) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE}) + endif(CCACHE AND WITH_CCACHE) + +-include(GetGitRevisionDescription) +-git_get_exact_tag(GIT_REVISION --tags --always) +- +-if (${GIT_REVISION} STREQUAL "n/a") +- git_rev_parse (GIT_REVISION --short) +-endif() + if(CMAKE_CROSSCOMPILING) + SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) + endif(CMAKE_CROSSCOMPILING) +-- +2.11.0.windows.1 + diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 409f6fce8..144616e5d 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,21 +1,25 @@ include(vcpkg_common_functions) set(FREERDP_VERSION 2.0.0-beta1+android11) -set(FREERDP_HASH c6682f0e555cac51c1d5ddaa910e507043e067af2bb19db626389ae648cbbfe1ab156e14caf3803f98fc1d574a0491629a76282080b3d9c9d382f2f662d2e06c) +set(FREERDP_REVISION 86fcb35f4273bf11410f962572e65644c6fe9ae3) +set(FREERDP_HASH 6ad9f6dfab827f7bb50c31c6694d7254d890fff5178581b6ffd4f4e970a31e866b4a3d3e637d25d13dbb8f7d7e0cc219a056ce4f5642951576d9531cb0859ebe) string(REGEX REPLACE "\\+" "-" FREERDP_VERSION_ESCAPED ${FREERDP_VERSION}) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeRDP-${FREERDP_VERSION_ESCAPED}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/FreeRDP/FreeRDP/archive/${FREERDP_VERSION}.tar.gz" - FILENAME "freerdp-${FREERDP_VERSION}.tar.gz" + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FreeRDP/FreeRDP + REF ${FREERDP_REVISION} SHA512 ${FREERDP_HASH} + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/DontInstallSystemRuntimeLibs.patch + ${CMAKE_CURRENT_LIST_DIR}/FixGitRevisionDetection.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) @@ -25,7 +29,8 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -WITH_DEBUG_SYMBOLS=ON ${FREERDP_CRT_LINKAGE}) + OPTIONS -DGIT_REVISION=${FREERDP_VERSION} + ${FREERDP_CRT_LINKAGE}) vcpkg_build_cmake() vcpkg_install_cmake() |