package/freerdp: fix fallout after version bump

Hello All!

Add a few patches to fix FreeRDP dependencies and build:

- pkg-config is now used for more than gstreamer-0.x, so make it a

    mandatory dependency;

- FreeRDP can now log to systemd's journald, so add proper dependency

    and options;

- backport an upstream patch to fix detection of gstreamer-1.x;

- fix build of the wayland client, by adding a missing dependency and pointing to the correct wayland-scanner tool.

Changes v1 -> v2:
- reorder patches, pkg-confif first
- fix typo in variable name (Arnout)
- add patches 3 and 4

Regards,
Yann E. MORIN.

The following changes since commit a7e1971cc60b43160e5d8ce418f7811d4d32b0ba

Update for 2017.11-rc1 (2017-11-06 22:03:32 +0100)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to acb107d38bfc324e8108f58f192a9dc05c5098bd

package/freerdp: fix build of wayland client (2017-11-06 22:07:38 +0100)

----------------------------------------------------------------
Yann E. MORIN (4):
package/freerdp: drop dependency on host-pkgconf package/freerdp: optional systemd's journald support package/freerdp: fix gstreamer-1.x detection package/freerdp: fix build of wayland client

 .../freerdp/0001-Fix-gstreamer-1.0-detection.patch | 28 ++++++++++++++++++++++
 package/freerdp/Config.in                          |  1 +
 package/freerdp/freerdp.mk                         | 16 ++++++++++---
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 package/freerdp/0001-Fix-gstreamer-1.0-detection.patch

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Currently, we only depend on host-pkgconf for gstreamer-0.x

However, we also need it at least for gstreamer-1.x and waylabnd, too.

But since FreeRDP is a cmake package, host-pkgconf is always pulled in as a dependency by the cmake-package infrastructure.

So, drop the gstreamer-conditional host-pkgconf dependency.

---
Changes v1 -> v2:
- drop host-pkgconf, as it is inherited via the infra (Samuel)

---
 package/freerdp/freerdp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 382cd39647..6d1664b86e 100644
@@ -16,7 +16,7 @@ FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev
 
 ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y)
 FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON
-FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 host-pkgconf
+FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2
 else
 FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF
 endif

2.11.0

FreeRDP now has support for writing to the journal, so we must ensure proper dependency and correct options.

Partially fixes:

    http://autobuild.buildroot.org/results/81aa66ddd88919295ccb5f34b527b737627263a7/

---
Changes v1 -> v2:
- fix typo in BR2_PACAKGE_SYSTEMD (Arnout)

---
 package/freerdp/freerdp.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

index 6d1664b86e..458bd5eea7 100644
@@ -56,6 +56,14 @@ else
 FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF
 endif
 
+# For the systemd journal
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+FREERDP_CONF_OPTS += -DWITH_LIBSYSTEMD=ON
+FREERDP_DEPENDENCIES += systemd
+else
+FREERDP_CONF_OPTS += -DWITH_LIBSYSTEMD=OFF
+endif
+
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 FREERDP_CONF_OPTS += -DWITH_NEON=ON
 else

2.11.0

Backport a patch from upstream.

Partially fixes:

    http://autobuild.buildroot.org/results/81aa66ddd88919295ccb5f34b527b737627263a7/

---
 .../freerdp/0001-Fix-gstreamer-1.0-detection.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/freerdp/0001-Fix-gstreamer-1.0-detection.patch

new file mode 100644
index 0000000000..fadfe117a4
@@ -0,0 +1,28 @@
+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 1/1] Fix gstreamer-1.0 detection
+
+[yann.morin.1998 at free.fr: backport from upstream]
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+---
+ 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 3aa8fc6dc..6fbc0ecc5 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.11.0
+

2.11.0

Currently, FreeRDP uses pkg-config to find whether wayland is available. When it is, it gets the CFLAGS and LDFLAGS and so on from pkg-config, which is OK.

But I also gets the path to the wayland scanner from pkg-config. And this points to the target one, when we really need the host one.

So we force-feed the correct path as a configure option.

Furthermore, wayland support needs libxkbcommon, so add this missing dependency as well.

Fixes:

    http://autobuild.buildroot.org/results/bdfe233ade36a56d0f65ef3c3d1698fca548beed/

---
 package/freerdp/Config.in  | 1 +
 package/freerdp/freerdp.mk | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

index 9dd2505a44..59bc18b672 100644
@@ -81,6 +81,7 @@ config BR2_PACKAGE_FREERDP_CLIENT_WL
 	bool "wayland client"
 	default y
 	depends on BR2_PACKAGE_WAYLAND
+	select BR2_PACKAGE_LIBXKBCOMMON
 
 endif
 

index 458bd5eea7..69a89a190c 100644
@@ -199,8 +199,10 @@ FREERDP_CONF_OPTS += -DWITH_XV=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
-FREERDP_DEPENDENCIES += wayland
-FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON
+FREERDP_DEPENDENCIES += wayland libxkbcommon
+FREERDP_CONF_OPTS += \
+	-DWITH_WAYLAND=ON \
+	-DWAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner
 else
 FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF
 endif

2.11.0

Hello,

For the entire series:

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com