diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-support/freerdp')
3 files changed, 9 insertions, 38 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch b/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch deleted file mode 100644 index a567cba9..00000000 --- a/external/meta-openembedded/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 <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 - diff --git a/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch index 0d7dcc28..0f6f575d 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch +++ b/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch @@ -12,13 +12,13 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> 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/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb b/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb index 88aec9c4..7cafbb79 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb @@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pkgconfig cmake gitpkgv +PE = "1" PV = "2.0.0+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -SRCREV = "1648deb435ad52206f7aa2afe4b4dff71d9329bc" +# 2.0.0 release +SRCREV = "5ab2bed8749747b8e4b2ed431fd102bc726be684" 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" @@ -39,7 +40,7 @@ PACKAGECONFIG ??= " \ X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" -PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native" PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" |