freerdp: Update to 2.0.0-rc4

PATCH In review Khem Raj 2 participants 4 messages Dec 3, 2018

lore

Share & tools

lore

Khem Raj

author

2018-12-03 20:13 UTC #0 lore raw

PATCH 1/2 freerdp: Update to 2.0.0-rc4

Drop backports which are now upstream

Signed-off-by Khem Raj <[email protected]>

---
 .../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

meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch deleted +0 ~~-27~~

deleted file mode 100644
index a567cba925..0000000000
@@ -1,27 +0,0 @@
-From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <[email protected]>
-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

index 0d7dcc28d7..0f6f575d02 100644
@@ -12,13 +12,13 @@ Signed-off-by: Zheng Ruoqin <[email protected]>
  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
-

meta-oe/recipes-support/freerdp/freerdp_git.bb +2 -2

index 88aec9c415..373c4979fd 100644
@@ -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"

Signature · 1 line

2.19.2

Khem Raj

author

2018-12-03 20:13 UTC #1 lore raw

PATCH 2/2 a2jmidid: Define own do_configure

waf script here does not support -o switch so define own which can be run in B

Secondly, ensure to use python2

Signed-off-by Khem Raj <[email protected]>

---
 meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 5 +++++
 1 file changed, 5 insertions(+)

meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +5 -0

index 59b73f8e8b..7dcaaf6828 100644
@@ -23,4 +23,9 @@ LDFLAGS_append_libc-musl = " -lexecinfo"
 
 export LINKFLAGS="${LDFLAGS}"
 
+do_configure() {
+    sed -i 's|/usr/bin/.*python$|/usr/bin/env python2|' ${S}/a2j_control ${S}/waf ${S}/wscript
+    (cd ${B} && ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF})
+}
+
 FILES_${PN} += "${datadir}/dbus-1/services"

Signature · 1 line

2.19.2

Andreas Müller

2018-12-03 21:27 UTC #2 lore raw

Re: [meta-oe][PATCH 2/2] a2jmidid: Define own do_configure

Quoted 5 lines · Khem Raj

waf script here does not support -o switch so define own which can be run in B
Secondly, ensure to use python2

1. Why?
2. There is no python2 in sysroot Maybe it was doing it before but now I think it makes recipe use host's python2.

Andreas

Quoted 28 lines

Signed-off-by Khem Raj <[email protected]>
---
 meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +5 -1
index 59b73f8e8b..7dcaaf6828 100644
@@ -23,4 +23,9 @@ LDFLAGS_append_libc-musl = " -lexecinfo"
 
 export LINKFLAGS="${LDFLAGS}"
 
+do_configure() {
+    sed -i 's|/usr/bin/.*python$|/usr/bin/env python2|' ${S}/a2j_control ${S}/waf ${S}/wscript
+    (cd ${B} && ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF})
+}
+
 FILES_${PN} += "${datadir}/dbus-1/services"
--
2.19.2
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Khem Raj

author

2018-12-03 21:52 UTC #3 lore raw

Re: [meta-oe][PATCH 2/2] a2jmidid: Define own do_configure

Quoted 9 lines · Andreas Müller

Quoted 5 lines · Khem Raj
waf script here does not support -o switch so define own which can be run in B
Secondly, ensure to use python2
1. Why?
2. There is no python2 in sysroot Maybe it was doing it before but now I think it makes recipe use host's python2.

This is during build not runtime
This is to ensure build works on hosts who have switched to python 3

Quoted 35 lines

Andreas
Review
Quoted 7 lines
Signed-off-by Khem Raj <[email protected]>
---
 meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 5 +++++
 1 file changed, 5 insertions(+)
(quoted diff) +0 -0
b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb LDFLAGS_append_libc-musl = " -lexecinfo" · line 27
Quoted 9 lines
index 59b73f8e8b..7dcaaf6828 100644
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +2 -0
@@ -23,4 +23,9 @@ LDFLAGS_append_libc-musl = " -lexecinfo"
 
 export LINKFLAGS="${LDFLAGS}"
 
+do_configure() {
+    sed -i 's|/usr/bin/.*python$|/usr/bin/env python2|'
${S}/a2j_control ${S}/waf ${S}/wscript
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb LDFLAGS_append_libc-musl = " -lexecinfo" · line 28
Quoted 1 line
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +1 -0
+    (cd ${B} && ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF}
${EXTRA_OECONF})
Quoted 11 lines
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +2 -1
+}
+
 FILES_${PN} += "${datadir}/dbus-1/services"
--
2.19.2
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel