From 5acd169e4133aa9b0569bc3cbcb3666190ee4783 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 3 Dec 2018 11:40:11 -0800 Subject: freerdp: Update to 2.0.0-rc4 Drop backports which are now upstream Signed-off-by: Khem Raj --- .../freerdp/0001-Fix-gstreamer-1.0-detection.patch | 27 ---------------------- .../winpr-makecert-Build-with-install-RPATH.patch | 13 ++++------- meta-oe/recipes-support/freerdp/freerdp_git.bb | 4 ++-- 3 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch deleted file mode 100644 index a567cba925..0000000000 --- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -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 - diff --git a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch index 0d7dcc28d7..0f6f575d02 100644 --- a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch +++ b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch @@ -12,13 +12,13 @@ Signed-off-by: Zheng Ruoqin winpr/tools/makecert-cli/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt -index 74afa09..8d00ef1 100644 ---- a/winpr/tools/makecert-cli/CMakeLists.txt -+++ b/winpr/tools/makecert-cli/CMakeLists.txt +Index: git/winpr/tools/makecert-cli/CMakeLists.txt +=================================================================== +--- git.orig/winpr/tools/makecert-cli/CMakeLists.txt ++++ git/winpr/tools/makecert-cli/CMakeLists.txt @@ -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 + BUILD_WITH_INSTALL_RPATH 1) @@ -26,6 +26,3 @@ index 74afa09..8d00ef1 100644 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) --- -2.7.4 - diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb index 88aec9c415..373c4979fd 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb @@ -13,10 +13,10 @@ inherit pkgconfig cmake gitpkgv PV = "2.0.0+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -SRCREV = "1648deb435ad52206f7aa2afe4b4dff71d9329bc" +# 2.0.0-rc4 +SRCREV = "e21b72c95f857817b4b32b5ef5406355c005a9e8" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \ file://winpr-makecert-Build-with-install-RPATH.patch \ - file://0001-Fix-gstreamer-1.0-detection.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg