mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

freerdp: Update to 2.0.0-rc4

Browse Source 
Drop backports which are now upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-12-03 11:40:11 -08:00
parent 7327e8aeea
commit 5acd169e41
3 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch
-27
View File
@@ -1,27 +0,0 @@
From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Fri, 28 Jul 2017 16:31:41 -0400
Subject: [PATCH] Fix gstreamer-1.0 detection
Upstream State: Backport
---
cmake/FindGStreamer_1_0.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
index 3aa8fc6..6fbc0ec 100644
--- a/cmake/FindGStreamer_1_0.cmake
+++ b/cmake/FindGStreamer_1_0.cmake
@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
if ("${CMAKE_MATCH_2}" STREQUAL "")
- pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
+ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}")
else ()
pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
endif ()
--
2.7.4
meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch
+5 -8
View File
@@ -12,13 +12,13 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
winpr/tools/makecert-cli/CMakeLists.txt | 3 +++ winpr/tools/makecert-cli/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt Index: git/winpr/tools/makecert-cli/CMakeLists.txt
index 74afa09..8d00ef1 100644 ===================================================================
--- a/winpr/tools/makecert-cli/CMakeLists.txt --- git.orig/winpr/tools/makecert-cli/CMakeLists.txt
+++ b/winpr/tools/makecert-cli/CMakeLists.txt +++ git/winpr/tools/makecert-cli/CMakeLists.txt
@@ -44,6 +44,9 @@ set(${MODULE_PREFIX}_LIBS winpr-tools) @@ -44,6 +44,9 @@ set(${MODULE_PREFIX}_LIBS winpr-tools)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
+set_target_properties(${MODULE_NAME} PROPERTIES +set_target_properties(${MODULE_NAME} PROPERTIES
+ BUILD_WITH_INSTALL_RPATH 1) + BUILD_WITH_INSTALL_RPATH 1)
@@ -26,6 +26,3 @@ index 74afa09..8d00ef1 100644
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets)
--
2.7.4
meta-oe/recipes-support/freerdp/freerdp_git.bb
+2 -2
View File
@@ -13,10 +13,10 @@ inherit pkgconfig cmake gitpkgv
PV = "2.0.0+gitr${SRCPV}" PV = "2.0.0+gitr${SRCPV}"
PKGV = "${GITPKGVTAG}" PKGV = "${GITPKGVTAG}"
SRCREV = "1648deb435ad52206f7aa2afe4b4dff71d9329bc" # 2.0.0-rc4
SRCREV = "e21b72c95f857817b4b32b5ef5406355c005a9e8"
SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \
file://winpr-makecert-Build-with-install-RPATH.patch \ file://winpr-makecert-Build-with-install-RPATH.patch \
file://0001-Fix-gstreamer-1.0-detection.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"