[Buildroot] [PATCH 01/10] package/libinput: bump version

[Buildroot] [PATCH 01/10] package/libinput: bump version

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 ...put-01-rename-log_msg-to-libinput_log_msg.patch | 54 +++++++++++++---------
 package/libinput/libinput.mk                       |  2 +-
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
index c10d8af..2ada150 100644
--- a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
+++ b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
@@ -9,6 +9,8 @@ of the log_msg() symbol.
 http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
 
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+[yann.morin.1998 at free.fr: rebase on-top of 0.6.0]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 ---
  src/libinput-private.h | 14 +++++++-------
  src/libinput.c         |  2 +-
@@ -18,42 +20,48 @@ diff --git a/src/libinput-private.h b/src/libinput-private.h
 index f9d2f87..ac1e1c4 100644
 --- a/src/libinput-private.h
 +++ b/src/libinput-private.h
-@@ -81,15 +81,15 @@ typedef void (*libinput_source_dispatch_t)(void *data);
+@@ -116,15 +116,15 @@ typedef void (*libinput_source_dispatch_t)(void *data);
+ typedef void (*libinput_source_dispatch_t)(void *data);
  
- struct libinput_source;
  
--#define log_debug(...) log_msg(LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
--#define log_info(...) log_msg(LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
--#define log_error(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
--#define log_bug_kernel(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
--#define log_bug_libinput(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__);
--#define log_bug_client(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__);
-+#define log_debug(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
-+#define log_info(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
-+#define log_error(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
-+#define log_bug_kernel(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
-+#define log_bug_libinput(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__);
-+#define log_bug_client(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__);
+-#define log_debug(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
+-#define log_info(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
+-#define log_error(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
+-#define log_bug_kernel(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
+-#define log_bug_libinput(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__);
+-#define log_bug_client(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__);
++#define log_debug(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
++#define log_info(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
++#define log_error(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
++#define log_bug_kernel(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
++#define log_bug_libinput(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__);
++#define log_bug_client(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__);
  
  void
--log_msg(enum libinput_log_priority priority, const char *format, ...);
-+libinput_log_msg(enum libinput_log_priority priority, const char *format, ...);
+-log_msg(struct libinput *libinput,
++libinput_log_msg(struct libinput *libinput,
+ 	enum libinput_log_priority priority,
+ 	const char *format, ...);
+ 
+ void
+-log_msg(struct libinput *libinput,
++libinput_log_msg(struct libinput *libinput,
+ 	enum libinput_log_priority priority,
+ 	const char *format, ...);
  
- int
- libinput_init(struct libinput *libinput,
 diff --git a/src/libinput.c b/src/libinput.c
 index eec9efb..4e3f6fa 100644
 --- a/src/libinput.c
 +++ b/src/libinput.c
 @@ -110,7 +110,7 @@ static struct log_data log_data = {
- };
+ }
  
  void
--log_msg(enum libinput_log_priority priority, const char *format, ...)
-+libinput_log_msg(enum libinput_log_priority priority, const char *format, ...)
+-log_msg(struct libinput *libinput,
++libinput_log_msg(struct libinput *libinput,
+ 	enum libinput_log_priority priority,
+ 	const char *format, ...)
  {
- 	va_list args;
- 
 -- 
 1.9.3
 
diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk
index b52101a..345b3c3 100644
--- a/package/libinput/libinput.mk
+++ b/package/libinput/libinput.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBINPUT_VERSION = 0.3.0
+LIBINPUT_VERSION = 0.6.0
 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
 LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
 LIBINPUT_LICENSE = MIT
-- 
1.9.1

[Buildroot] [PATCH 02/10] package/freerdp: bump version

[Yann E. MORIN]

There has been no new release recently, and the 1.0 branch is out-dated.

The 1.1 branch has not been release-tagged since the last beta tag,
but it still continues to receive bug fixes, and is relatively stable.

The next major release should be 1.2.0, but it is still in beta, looks
like it is focused on Android, and was only recently tagged.

So, we use the latest cset from the 1.1 branch until there is a new
release (either 1.2.0 or 1.1.0), at which point we can revisit which
version we'll use.

Drop our patch, since the problem has been fixed upstream (with a more
complete solution.)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/freerdp/freerdp-0001-ffmpeg.patch | 78 -------------------------------
 package/freerdp/freerdp.mk                |  3 +-
 2 files changed, 2 insertions(+), 79 deletions(-)
 delete mode 100644 package/freerdp/freerdp-0001-ffmpeg.patch

diff --git a/package/freerdp/freerdp-0001-ffmpeg.patch b/package/freerdp/freerdp-0001-ffmpeg.patch
deleted file mode 100644
index 4f9820a..0000000
--- a/package/freerdp/freerdp-0001-ffmpeg.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Fix freerdp compile with newer ffmpeg versions.
-
-Downloaded from https://github.com/pld-linux/freerdp/blob/master/freerdp-ffmpeg.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
---- freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c.orig	2013-01-02 22:46:59.000000000 +0100
-+++ freerdp-1.0.2/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-09-26 18:29:52.693695785 +0200
-@@ -39,7 +39,7 @@
- 	ITSMFDecoder iface;
- 
- 	int media_type;
--	enum CodecID codec_id;
-+	enum AVCodecID codec_id;
- 	AVCodecContext* codec_context;
- 	AVCodec* codec;
- 	AVFrame* frame;
-@@ -54,7 +54,7 @@
- {
- 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- 
--	mdecoder->codec_context = avcodec_alloc_context();
-+	mdecoder->codec_context = avcodec_alloc_context3(NULL);
- 	if (!mdecoder->codec_context)
- 	{
- 		DEBUG_WARN("avcodec_alloc_context failed.");
-@@ -88,16 +88,6 @@
- 	mdecoder->codec_context->channels = media_type->Channels;
- 	mdecoder->codec_context->block_align = media_type->BlockAlign;
- 
--#ifdef AV_CPU_FLAG_SSE2
--	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
--#else
--#if LIBAVCODEC_VERSION_MAJOR < 53
--	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
--#else
--	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
--#endif
--#endif
--
- 	return true;
- }
- 
-@@ -174,7 +164,7 @@
- {
- 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- 
--	if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
-+	if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
- 	{
- 		DEBUG_WARN("avcodec_open failed.");
- 		return false;
-@@ -337,7 +327,7 @@
- #endif
- 
- 	if (mdecoder->decoded_size_max == 0)
--		mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
-+		mdecoder->decoded_size_max = 192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */ + 16;
- 	mdecoder->decoded_data = xzalloc(mdecoder->decoded_size_max);
- 	/* align the memory for SSE2 needs */
- 	dst = (uint8*) (((uintptr_t)mdecoder->decoded_data + 15) & ~ 0x0F);
-@@ -348,7 +338,7 @@
- 	while (src_size > 0)
- 	{
- 		/* Ensure enough space for decoding */
--		if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
-+		if (mdecoder->decoded_size_max - mdecoder->decoded_size < 192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */)
- 		{
- 			mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
- 			mdecoder->decoded_data = xrealloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
-@@ -499,7 +489,6 @@
- 
- 	if (!initialized)
- 	{
--		avcodec_init();
- 		avcodec_register_all();
- 		initialized = true;
- 	}
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 26688aa..f1ec0c3 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-FREERDP_VERSION = 1.0.2
+# Changeset on the stable-1.1 branch
+FREERDP_VERSION = 440916eae2e07463912d5fe507677e67096eb083
 FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION))
 FREERDP_DEPENDENCIES = openssl zlib \
 	xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
-- 
1.9.1

[Buildroot] [PATCH 03/10] package/freerdp: do not forcibly depend on X.Org

[Yann E. MORIN]

It is possible to build the libfreerdp standalone, without X.Org.
Having a libfreerdp will be usefull for the weston RDP compositor.

Re-order the menuconfig, as freerdp is no longer an X-only application.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/Config.in          |  2 +-
 package/freerdp/Config.in  | 17 ++++++++++++-----
 package/freerdp/freerdp.mk | 10 ++++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 73ba86a..17f2c67 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -198,6 +198,7 @@ endif
 	source "package/fb-test-app/Config.in"
 	source "package/fbterm/Config.in"
 	source "package/fbv/Config.in"
+	source "package/freerdp/Config.in"
 	source "package/imagemagick/Config.in"
 	source "package/linux-fusion/Config.in"
 	source "package/lite/Config.in"
@@ -236,7 +237,6 @@ comment "X applications"
 	source "package/dillo/Config.in"
 	source "package/docker/Config.in"
 	source "package/feh/Config.in"
-	source "package/freerdp/Config.in"
 	source "package/gmpc/Config.in"
 	source "package/gob2/Config.in"
 	source "package/gqview/Config.in"
diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in
index c5ff769..81a67ea 100644
--- a/package/freerdp/Config.in
+++ b/package/freerdp/Config.in
@@ -1,14 +1,21 @@
 config BR2_PACKAGE_FREERDP
 	bool "freerdp"
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXT
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XLIB_LIBXCURSOR
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_PACKAGE_XORG7
 	help
 	  FreeRDP is a free implementation of the Remote Desktop
 	  Protocol (RDP), released under the Apache license
 
 	  http://www.freerdp.com/
+
+if BR2_PACKAGE_FREERDP
+
+config BR2_PACKAGE_FREERDP_NEEDS_XLIBS
+	def_bool y
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
+
+endif
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index f1ec0c3..3ae68bf 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -7,11 +7,17 @@
 # Changeset on the stable-1.1 branch
 FREERDP_VERSION = 440916eae2e07463912d5fe507677e67096eb083
 FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION))
-FREERDP_DEPENDENCIES = openssl zlib \
-	xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
+FREERDP_DEPENDENCIES = openssl zlib
 FREERDP_LICENSE = Apache-2.0
 FREERDP_LICENSE_FILES = LICENSE
 
+ifeq ($(BR2_PACKAGE_FREERDP_NEEDS_XLIBS),y)
+FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
+FREERDP_CONF_OPT += -DWITH_X11=ON
+else
+FREERDP_CONF_OPT += -DWITH_X11=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_CUPS),y)
 FREERDP_CONF_OPT += -DWITH_CUPS=ON
 FREERDP_DEPENDENCIES += cups
-- 
1.9.1

[Buildroot] [PATCH 04/10] pacakge/freerdp: disable building the manpages

[Yann E. MORIN]

Building the manpages requires xsltproc, which might not be available.
Also, who needs the manpages on the target anyway? ;-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/freerdp/freerdp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 3ae68bf..6df567f 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -11,6 +11,8 @@ FREERDP_DEPENDENCIES = openssl zlib
 FREERDP_LICENSE = Apache-2.0
 FREERDP_LICENSE_FILES = LICENSE
 
+FREERDP_CONF_OPT = -DWITH_MANPAGES=OFF
+
 ifeq ($(BR2_PACKAGE_FREERDP_NEEDS_XLIBS),y)
 FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
 FREERDP_CONF_OPT += -DWITH_X11=ON
-- 
1.9.1

[Buildroot] [PATCH 05/10] package/freerdp: add options to enable/disable server and/or client

[Yann E. MORIN]

Building the client or the server requires an X.Org stack.

Since freerdp can also be used for weston (wayland-based, hence no X.Org
stack), we may want to disable the client and server.

Conversely, with on an X.Org stack, we may want to enable either or
none if we're just interested in the library.

Add two options, one to enable the server, the other the client.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/freerdp/Config.in  | 18 ++++++++++++++++--
 package/freerdp/freerdp.mk | 12 ++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in
index 81a67ea..0c2edc5 100644
--- a/package/freerdp/Config.in
+++ b/package/freerdp/Config.in
@@ -6,16 +6,30 @@ config BR2_PACKAGE_FREERDP
 	  FreeRDP is a free implementation of the Remote Desktop
 	  Protocol (RDP), released under the Apache license
 
+	  This only installs the freerdp library.
+
 	  http://www.freerdp.com/
 
 if BR2_PACKAGE_FREERDP
 
 config BR2_PACKAGE_FREERDP_NEEDS_XLIBS
-	def_bool y
-	depends on BR2_PACKAGE_XORG7
+	bool
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXCURSOR
 
+config BR2_PACKAGE_FREERDP_SERVER
+	bool "build server"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_FREERDP_X_LIBS
+
+config BR2_PACKAGE_FREERDP_CLIENT
+	bool "build client"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_FREERDP_X_LIBS
+
+comment "freerdp server and client needs X.Org"
+	depends on !BR2_PACKAGE_XORG7
+
 endif
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 6df567f..486a611 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -20,6 +20,18 @@ else
 FREERDP_CONF_OPT += -DWITH_X11=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y)
+FREERDP_CONF_OPT += -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON
+else
+FREERDP_CONF_OPT += -DWITH_SERVER=OFF -DWITH_SERVER_INTERFACE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_FREERDP_CLIENT),y)
+FREERDP_CONF_OPT += -DWITH_CLIENT=ON -DWITH_CLIENT_INTERFACE=ON
+else
+FREERDP_CONF_OPT += -DWITH_CLIENT=OFF -DWITH_CLIENT_INTERFACE=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_CUPS),y)
 FREERDP_CONF_OPT += -DWITH_CUPS=ON
 FREERDP_DEPENDENCIES += cups
-- 
1.9.1

[Buildroot] [PATCH 0/10] wayland: bump and new backend (branch yem/bumps)

[Yann E. MORIN]

Hello All!

This series bumps wayland and weston, and adds the rdp backend to
weston. As a side effect, it bumps libinput, and bumps, cleans up
and enhances freerdp.

Regards,
Yann E. MORIN.


The following changes since commit b7fcf3bc5643a75898c76d5610360b6560a695f2:

  sudo: bump to version 1.8.10p3 (2014-09-19 23:21:48 +0200)

are available in the git repository at:

  git://gitorious.org/buildroot/buildroot.git yem/bumps

for you to fetch changes up to a469e9d1e552f6b3f08eaf5ab4f426365b96ca8c:

  package/weston: add support for the RDP compositor (2014-09-20 19:04:51 +0200)

----------------------------------------------------------------
Yann E. MORIN (10):
      package/libinput: bump version
      package/freerdp: bump version
      package/freerdp: do not forcibly depend on X.Org
      pacakge/freerdp: disable building the manpages
      package/freerdp: add options to enable/disable server and/or client
      package/freerdp: also install to staging
      package/freerdp: install server key and certificate
      package/wayland: bump to 1.6.0
      package/weston: bump to 1.6.0
      package/weston: add support for the RDP compositor

 package/Config.in                                  |  2 +-
 package/freerdp/Config.in                          | 31 +++++++--
 package/freerdp/freerdp-0001-ffmpeg.patch          | 78 ----------------------
 package/freerdp/freerdp.mk                         | 39 ++++++++++-
 ...put-01-rename-log_msg-to-libinput_log_msg.patch | 54 ++++++++-------
 package/libinput/libinput.mk                       |  2 +-
 package/wayland/wayland.mk                         |  2 +-
 package/weston/Config.in                           | 17 +++++
 package/weston/weston-0000-safe-foreach.patch      | 36 ----------
 package/weston/weston.mk                           |  9 ++-
 10 files changed, 121 insertions(+), 149 deletions(-)
 delete mode 100644 package/freerdp/freerdp-0001-ffmpeg.patch
 delete mode 100644 package/weston/weston-0000-safe-foreach.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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 06/10] package/freerdp: also install to staging

[Yann E. MORIN]

freerdp installs a library that other packages may use, so
we must also install it to staging.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/freerdp/freerdp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 486a611..3dc257b 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -11,6 +11,8 @@ FREERDP_DEPENDENCIES = openssl zlib
 FREERDP_LICENSE = Apache-2.0
 FREERDP_LICENSE_FILES = LICENSE
 
+FREERDP_INSTALL_STAGING = YES
+
 FREERDP_CONF_OPT = -DWITH_MANPAGES=OFF
 
 ifeq ($(BR2_PACKAGE_FREERDP_NEEDS_XLIBS),y)
-- 
1.9.1

[Buildroot] [PATCH 07/10] package/freerdp: install server key and certificate

[Yann E. MORIN]

This is mandatory for an RDP server to have a key and a certificate,
otherwise clients will refuse to connect to that server.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/freerdp/freerdp.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 3dc257b..9c974b7 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -83,4 +83,14 @@ else
 FREERDP_CONF_OPT += -DWITH_XV=OFF
 endif
 
+# Install the server key and certificate, so that a client can connect.
+# A user can override them with its opwn in a post-build script, if needed.
+define FREERDP_INSTALL_KEYS
+	$(INSTALL) -D $(@D)/server/X11/server.key \
+		      $(TARGET_DIR)/etc/freerdp/keys/server.key
+	$(INSTALL) -D $(@D)/server/X11/server.crt \
+		      $(TARGET_DIR)/etc/freerdp/keys/server.crt
+endef
+FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_INSTALL_KEYS
+
 $(eval $(cmake-package))
-- 
1.9.1

[Buildroot] [PATCH 08/10] package/wayland: bump to 1.6.0

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/wayland/wayland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index 2ab38d9..77c7141 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.5.0
+WAYLAND_VERSION = 1.6.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
-- 
1.9.1

[Buildroot] [PATCH 09/10] package/weston: bump to 1.6.0

[Yann E. MORIN]

Remove patch applied upstream.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/weston/weston-0000-safe-foreach.patch | 36 ---------------------------
 package/weston/weston.mk                      |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 package/weston/weston-0000-safe-foreach.patch

diff --git a/package/weston/weston-0000-safe-foreach.patch b/package/weston/weston-0000-safe-foreach.patch
deleted file mode 100644
index 7ea7197..0000000
--- a/package/weston/weston-0000-safe-foreach.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit a35d028d66cdd83a4a08663231dd2504f1b228f9
-Author: U. Artie Eoff <ullysses.a.eoff@intel.com>
-Date:   Wed May 21 09:20:02 2014 -0700
-
-    comp-wayland: use safe foreach when destroying outputs
-    
-    wl_list_for_each dereference's output to increment the
-    next iteration of the loop.  However, output is free'd
-    inside the loop resulting in a dereference to free'd
-    memory.
-    
-    Use wl_list_for_each_safe instead, which is designed to
-    handle this kind of pattern.
-    
-    Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
-    Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
-    Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
-index a08b71a..76e5396 100644
---- a/src/compositor-wayland.c
-+++ b/src/compositor-wayland.c
-@@ -1997,9 +1997,9 @@ err_free:
- static void
- wayland_compositor_destroy(struct wayland_compositor *c)
- {
--	struct weston_output *output;
-+	struct weston_output *output, *next;
- 
--	wl_list_for_each(output, &c->base.output_list, link)
-+	wl_list_for_each_safe(output, next, &c->base.output_list, link)
- 		wayland_output_destroy(output);
- 
- 	c->base.renderer->destroy(&c->base);
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 7bb35b9..f4702ca 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WESTON_VERSION = 1.5.0
+WESTON_VERSION = 1.6.0
 WESTON_SITE = http://wayland.freedesktop.org/releases
 WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
-- 
1.9.1

[Buildroot] [PATCH 10/10] package/weston: add support for the RDP compositor

[Yann E. MORIN]

Using the RDP compositor, one can run a headless machine to serve remote
clients, using the RDP protocol.

Add an option to enable the rdp-backend.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/weston/Config.in | 17 +++++++++++++++++
 package/weston/weston.mk |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index dc7e235..f0aa8a8 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -38,6 +38,23 @@ config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
 
+config BR2_PACKAGE_WESTON_RDP
+	bool "RDP compositor"
+	select BR2_PACKAGE_FREERDP
+	select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+	help
+	  This enables the RDP backend, which allows accessing weston
+	  through the network with any RDP-compliant client.
+
+	  Please note that one must pass those options to weston for RDP
+	  to be functional:
+	    --rdp-tls-cert=/path/to/server.crt
+	    --rdp-tls-key=/path/to/server.key
+
+	  By default, Buildroot installs such files in /etc/freerdp/server/
+	  so you may want to change them in a post-build script or a rootfs
+	  overlay.
+
 comment "RPi compositor needs a toolchain w/ C++, largefile, threads"
 	depends on BR2_arm
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index f4702ca..01ae54c 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -32,6 +32,13 @@ else
 WESTON_CONF_OPT += --disable-libinput-backend
 endif
 
+ifeq ($(BR2_PACKAGE_WESTON_RDP),y)
+WESTON_DEPENDENCIES += freerdp
+WESTON_CONF_OPT += --enable-rdp-compositor
+else
+WESTON_CONF_OPT += --disable-rdp-compositor
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
 WESTON_DEPENDENCIES += libunwind
 else
-- 
1.9.1

[Buildroot] [PATCH 01/10] package/libinput: bump version

[Romain Naour]

Hello Yann,

Le 20/09/2014 19:09, Yann E. MORIN a ?crit :
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  ...put-01-rename-log_msg-to-libinput_log_msg.patch | 54 +++++++++++++---------
>  package/libinput/libinput.mk                       |  2 +-
>  2 files changed, 32 insertions(+), 24 deletions(-)
> 
> diff --git a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> index c10d8af..2ada150 100644
> --- a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> +++ b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> @@ -9,6 +9,8 @@ of the log_msg() symbol.
>  http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
>  
>  Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> +[yann.morin.1998 at free.fr: rebase on-top of 0.6.0]
> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>  ---

I think this patch can be dropped with this new release.
The issue is normally fixed by the commit "Use -no-install instead of -static
for local noinst linking"

See: https://bugs.freedesktop.org/show_bug.cgi?id=82292
(the bug was reported by Vicente)

Best regards,
Romain Naour

[Buildroot] [PATCH 01/10] package/libinput: bump version

[Yann E. MORIN]

Romain, All,

On 2014-09-20 19:25 +0200, Romain Naour spake thusly:
> Hello Yann,
> 
> Le 20/09/2014 19:09, Yann E. MORIN a ?crit :
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> >  ...put-01-rename-log_msg-to-libinput_log_msg.patch | 54 +++++++++++++---------
> >  package/libinput/libinput.mk                       |  2 +-
> >  2 files changed, 32 insertions(+), 24 deletions(-)
> > 
> > diff --git a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> > index c10d8af..2ada150 100644
> > --- a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> > +++ b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> > @@ -9,6 +9,8 @@ of the log_msg() symbol.
> >  http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
> >  
> >  Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> > +[yann.morin.1998 at free.fr: rebase on-top of 0.6.0]
> > +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >  ---
> 
> I think this patch can be dropped with this new release.
> The issue is normally fixed by the commit "Use -no-install instead of -static
> for local noinst linking"
> 
> See: https://bugs.freedesktop.org/show_bug.cgi?id=82292
> (the bug was reported by Vicente)

Yep, I saw that bug. And I pondered removing the patch.

However, I was not able to test a static-only build, so I can't say
whether that patch is still valid or not.

Also, that patch merely renames a function.

When/if I have some time around the WE, I'll test whether it is still
needed.

So, I decided it would be better to just refresh it for now. If you or
Vicente have some time to test the new libinput without that patch, feel
free to report! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 01/10] package/libinput: bump version

[Romain Naour]

Yann,

Le 20/09/2014 19:55, Yann E. MORIN a ?crit :
> Romain, All,
> 
> On 2014-09-20 19:25 +0200, Romain Naour spake thusly:
>> Hello Yann,
>>
>> Le 20/09/2014 19:09, Yann E. MORIN a ?crit :
>>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>> ---
>>>  ...put-01-rename-log_msg-to-libinput_log_msg.patch | 54 +++++++++++++---------
>>>  package/libinput/libinput.mk                       |  2 +-
>>>  2 files changed, 32 insertions(+), 24 deletions(-)
>>>
>>> diff --git a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>> index c10d8af..2ada150 100644
>>> --- a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>> +++ b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>> @@ -9,6 +9,8 @@ of the log_msg() symbol.
>>>  http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
>>>  
>>>  Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>> +[yann.morin.1998 at free.fr: rebase on-top of 0.6.0]
>>> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>>  ---
>>
>> I think this patch can be dropped with this new release.
>> The issue is normally fixed by the commit "Use -no-install instead of -static
>> for local noinst linking"
>>
>> See: https://bugs.freedesktop.org/show_bug.cgi?id=82292
>> (the bug was reported by Vicente)
> 
> Yep, I saw that bug. And I pondered removing the patch.
> 
> However, I was not able to test a static-only build, so I can't say
> whether that patch is still valid or not.
> 
> Also, that patch merely renames a function.
> 
> When/if I have some time around the WE, I'll test whether it is still
> needed.
> 
> So, I decided it would be better to just refresh it for now. If you or
> Vicente have some time to test the new libinput without that patch, feel
> free to report! ;-)
> 
No problem, I'll try to check that tonight or tomorrow afternoon.

Best regards,
Romain

[Buildroot] [PATCH 01/10] package/libinput: bump version

[Romain Naour]

Hi Yann, all

Le 20/09/2014 22:14, Romain Naour a ?crit :
> Yann,
> 
> Le 20/09/2014 19:55, Yann E. MORIN a ?crit :
>> Romain, All,
>>
>> On 2014-09-20 19:25 +0200, Romain Naour spake thusly:
>>> Hello Yann,
>>>
>>> Le 20/09/2014 19:09, Yann E. MORIN a ?crit :
>>>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>>> ---
>>>>  ...put-01-rename-log_msg-to-libinput_log_msg.patch | 54 +++++++++++++---------
>>>>  package/libinput/libinput.mk                       |  2 +-
>>>>  2 files changed, 32 insertions(+), 24 deletions(-)
>>>>
>>>> diff --git a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>>> index c10d8af..2ada150 100644
>>>> --- a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>>> +++ b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>>> @@ -9,6 +9,8 @@ of the log_msg() symbol.
>>>>  http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
>>>>  
>>>>  Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>>> +[yann.morin.1998 at free.fr: rebase on-top of 0.6.0]
>>>> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>>>  ---
>>>
>>> I think this patch can be dropped with this new release.
>>> The issue is normally fixed by the commit "Use -no-install instead of -static
>>> for local noinst linking"
>>>
>>> See: https://bugs.freedesktop.org/show_bug.cgi?id=82292
>>> (the bug was reported by Vicente)
>>
>> Yep, I saw that bug. And I pondered removing the patch.
>>
>> However, I was not able to test a static-only build, so I can't say
>> whether that patch is still valid or not.
>>
>> Also, that patch merely renames a function.
>>
>> When/if I have some time around the WE, I'll test whether it is still
>> needed.
>>
>> So, I decided it would be better to just refresh it for now. If you or
>> Vicente have some time to test the new libinput without that patch, feel
>> free to report! ;-)
>>
> No problem, I'll try to check that tonight or tomorrow afternoon.
> 

libinput can't be selected on static-only case since it depends on a udev
provider (eudev or systemd) which require dynamic libraries support.

Also, libinput 0.6.0 no longer build by default the static libraries libinput.a.

So, this issue is fixed when systemd is used as udev provider:
http://autobuild.buildroot.net/results/8b6/8b60fdf4fdec834dc79f8dfc4fd050f763c83457/

Best regards,
Romain Naour

[Buildroot] [PATCH 0/10] wayland: bump and new backend (branch yem/bumps)

[Thomas Petazzoni]

Hello,

On Sat, 20 Sep 2014 19:09:52 +0200, Yann E. MORIN wrote:

> Yann E. MORIN (10):
>       package/libinput: bump version
>       package/freerdp: bump version

Those two patches applied.

>       package/freerdp: do not forcibly depend on X.Org
>       pacakge/freerdp: disable building the manpages
>       package/freerdp: add options to enable/disable server and/or client
>       package/freerdp: also install to staging
>       package/freerdp: install server key and certificate

I'll wait a bit more on those ones, need a bit more time to review/test.

>       package/wayland: bump to 1.6.0
>       package/weston: bump to 1.6.0

Both applied.

>       package/weston: add support for the RDP compositor

Needs the previous non-applied patches, so not applied for now.

Romain, you had some comments on the first patch (regarding libinput).
Once you've done some more testing, do not hesitate to submit
additional patches if needed.

Thanks!

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