From patchwork Mon Dec 3 20:12:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 152731 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7242925ljp; Mon, 3 Dec 2018 12:13:11 -0800 (PST) X-Google-Smtp-Source: AFSGD/U8AhV8hUWJJY3+gzzYHBDbN173d/4mWXwJL+0KwXt2tCvxiJxleCEoddsaNSmnLoMQjdSW X-Received: by 2002:a63:6ecf:: with SMTP id j198mr14679830pgc.3.1543867990927; Mon, 03 Dec 2018 12:13:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543867990; cv=none; d=google.com; s=arc-20160816; b=TyvZNFeZRgK52/CZAXjSxeWB4X4IsGPXt1jqmH0gJQeRuYEYAix/4+6m1y3TMcvKMf BmtGD8TPkE4MXgUc+F6kAoSknx7NFMgYLqF0iyZhsFo+ym2cTJlPxHaQ09p/5ZbIE62r ulOSkcyF66fAw2LWTaV0MaLeButsdYsbsghjqCELaLC6rtdZoodoVahiTcWol2z+TLVy oNR4byt796biYRkF2Mn6vABMSkqAQJexJAJireiMxTKy1fHY/pMuLI8pJSFYM1/PqZf9 AuS3GdBdXef127ZObs4dLVat25wdODGDp9cyH4C2wEo/U/eZgNS2QBLN7V/aIqEpaq/f 8taw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=9aCu18tRKrsNrxMyPVoQx5VbyPpbldoQgTOI0nEQlYY=; b=b/2kCfNe1RNyyYCYpvSrRKL9SOe+IhEikBqEJ7kp0mNdoEDXrkn4NZyMeOElhV1PMp WjwNrD5fYKt6QmOpqJKhdvRLpUmU8qa5e3WrAPOr1STNv/j6007Ha4umeQSCzH0/FzC6 6ZINdUUouFuLGTMB55VXChz+uWeQul9euQbGzG2Bn/35PiapJ4jQCCBwsFaXrgqUkTkr 9vEcBFUXBDtkw6hbJEJBrG0ReQuUDHTW35jfjgfchcHmfYXqhADkyGDMyki5u/wI5t1z wzYWc4elnHUMRcN7Ej5UwPsBD0yLILcUS/YR+Cfn4RTwsEKB5Y0Qna0SbSGUKsrntxJK k7hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WRVGzB3t; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x23si13074328pgj.247.2018.12.03.12.13.10; Mon, 03 Dec 2018 12:13:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WRVGzB3t; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B5C2F6C572; Mon, 3 Dec 2018 20:13:03 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mail.openembedded.org (Postfix) with ESMTP id 36C536B5AA for ; Mon, 3 Dec 2018 20:13:02 +0000 (UTC) Received: by mail-pl1-f182.google.com with SMTP id e5so7022917plb.5 for ; Mon, 03 Dec 2018 12:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YwmpYYnCZLWl0zIvbR8a6zp5JwtDKijT5XYfP+FE6bs=; b=WRVGzB3tJOKWvf46nOp7jtlvRfZnFkAygI2xQ5JBkR2jT8fiFLs7+IONNisZ/4x6jZ nIhbvpbVMKkiSGTMICT5jZMVQ/kq32hWrawxctS4Cp2xKJXtGIz08DaOcD4q2jAbWaJV pvSds68LS9p8Haq03UufB86djEq24Vn96FBqM45Qwv4Jc3v6aNQWZqDYW1Aq+AJkSDve seMxXzfwJMhid5UmKwDClSpW8fhY+jr5owRnX6+laf+y1UcwCOFi8Sj7jEpG9wc+xSTb 92HGmIcn99x43sZbuiRr+dyOqVmkjhOX1bw4DcQwKSF+fvAgQukok7ha/NkOO8qbl1m/ oYIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YwmpYYnCZLWl0zIvbR8a6zp5JwtDKijT5XYfP+FE6bs=; b=AgrqrnbHVCz6y/bmQVA8gAzFR/DhzgWu2WrcxZ6SjRAgOhJqahTALAigLMoL9SAhG3 JGZI/0MZhDdIx4pzsVhh0VV1hJyTjLjh68ZQryHAIl9mlK/bgEROH3cgL7g/FVCN+9xa YITTzGwNwekZpFNTHiFxXTK4ItVoYKVW/2KmJ9n4KWzd/6joapTNrRwcV0Zl3AfMDdAA yliZ3OKjo6KiDUFvBv8UoyEITkLSnpM5tb1jaH1dQTiMMHQmJcS3vFn2kByUSiWlOGHF o8OBHbWiLf9bUnZISrCXPCRUIPUDkYQXi4DSYGGbcK9snbrTA8O/k3TlY9oRlDeWxmx0 3LUg== X-Gm-Message-State: AA+aEWZvXOxgLVBGOPwWjH9cJM3HSGQask3Kw3sPVEzp4+Vqlc5gN0ZD 6S/ynxBcGS7uoT3cISGi+g3htih4PLc= X-Received: by 2002:a17:902:ba8b:: with SMTP id k11mr17180422pls.177.1543867982544; Mon, 03 Dec 2018 12:13:02 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::5f84]) by smtp.gmail.com with ESMTPSA id z191sm16769677pgd.74.2018.12.03.12.13.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 12:13:01 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 3 Dec 2018 12:12:49 -0800 Message-Id: <20181203201250.23144-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/2] freerdp: Update to 2.0.0-rc4 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop backports which are now upstream Signed-off-by: Khem Raj --- .../0001-Fix-gstreamer-1.0-detection.patch | 27 ------------------- ...pr-makecert-Build-with-install-RPATH.patch | 13 ++++----- .../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 -- 2.19.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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"