Skip to contentSkip to conversation

A bunch of bumps (branch yem/bumps)

PATCH New Yann E. MORIN 2 participants 11 messages Jun 2, 2014

lore
Share & tools
lore
#0 lore raw

v3 cover A bunch of bumps (branch yem/bumps)

From: "Yann E. MORIN" <[email protected]>

Hello All!

This series has been sitting here waiting for the last release to be out. It is now, so here are the bumps.

Changes v2 -> v3:
- fix the procps-ng file names (Peter)
- add procps to legacy (Peter)
- drop applied patches

Changes v1 -> v2:
- apply a fixup to procps that I forgot in the previous round...

Regards,
Yann E. MORIN.

The following changes since commit 8e10125d25455a734528b0a18c9bca6e5c1ba4ea:

ti-gfx: select fbset as it is a runtime dependency (2014-06-02 22:05:23 +0200)

are available in the git repository at:

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

for you to fetch changes up to 79d083ee71a1e3c81a26f9f8a1b47cbb8c0b6d83:

[WIP] package/weston: add support for the RDP compositor (2014-06-02 22:08:55 +0200)

----------------------------------------------------------------
Yann E. MORIN (7):
package/procps: bump version and rename to procps-ng package/libinput: new package
package/weston: add support for libinput package/freerdp: not forcibly depend on X.Org pacakge/freerdp: disable building the manpages package/freerdp: add options to enable/disable server and/or client [WIP] package/weston: add support for the RDP compositor

 Config.in.legacy                                   | 10 +++++++
 package/Config.in                                  |  5 ++--
 package/freerdp/Config.in                          | 31 +++++++++++++++++----
 package/freerdp/freerdp.mk                         | 32 +++++++++++++++++++---
 package/libinput/Config.in                         | 17 ++++++++++++
 package/libinput/libinput.mk                       | 19 +++++++++++++
 package/{procps => procps-ng}/Config.in            |  6 ++--
 .../procps-ng/procps-ng-0000-remove-index.patch    | 16 +++++++++++
 package/procps-ng/procps-ng.mk                     | 15 ++++++++++
 package/procps/procps-make-3.82.patch              | 23 ----------------
 package/procps/procps-remove-flags.patch           | 26 ------------------
 package/procps/procps-remove-index.patch           | 21 --------------
 package/procps/procps-wchar.patch                  | 29 --------------------
 package/procps/procps.mk                           | 25 -----------------
 package/weston/Config.in                           |  5 ++++
 package/weston/weston.mk                           | 14 ++++++++++
 16 files changed, 156 insertions(+), 138 deletions(-)
 create mode 100644 package/libinput/Config.in
 create mode 100644 package/libinput/libinput.mk
 rename package/{procps => procps-ng}/Config.in (63%)
 create mode 100644 package/procps-ng/procps-ng-0000-remove-index.patch
 create mode 100644 package/procps-ng/procps-ng.mk
 delete mode 100644 package/procps/procps-make-3.82.patch
 delete mode 100644 package/procps/procps-remove-flags.patch
 delete mode 100644 package/procps/procps-remove-index.patch
 delete mode 100644 package/procps/procps-wchar.patch
 delete mode 100644 package/procps/procps.mk
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH v3 1/7 package/procps: bump version and rename to procps-ng

From: "Yann E. MORIN" <[email protected]>

procps is getting replaced by procps-ng, and there are new versions available!

procps-ng is now an autotools package, so get rid of our custom build/install rules.

Remove most patches, except for one that still half-applies, so update and rename it.

procps is dead, long live procps-ng!

---
 Config.in.legacy                                   | 10 ++++++++
 package/Config.in                                  |  2 +-
 package/{procps => procps-ng}/Config.in            |  6 ++---
 .../procps-ng/procps-ng-0000-remove-index.patch    | 16 ++++++++++++
 package/procps-ng/procps-ng.mk                     | 15 +++++++++++
 package/procps/procps-make-3.82.patch              | 23 -----------------
 package/procps/procps-remove-flags.patch           | 26 -------------------
 package/procps/procps-remove-index.patch           | 21 ----------------
 package/procps/procps-wchar.patch                  | 29 ----------------------
 package/procps/procps.mk                           | 25 -------------------
 10 files changed, 45 insertions(+), 128 deletions(-)
 rename package/{procps => procps-ng}/Config.in (63%)
 create mode 100644 package/procps-ng/procps-ng-0000-remove-index.patch
 create mode 100644 package/procps-ng/procps-ng.mk
 delete mode 100644 package/procps/procps-make-3.82.patch
 delete mode 100644 package/procps/procps-remove-flags.patch
 delete mode 100644 package/procps/procps-remove-index.patch
 delete mode 100644 package/procps/procps-wchar.patch
 delete mode 100644 package/procps/procps.mk
Config.in.legacy +10 -0
index 00661db..9e8be3d 100644
@@ -99,6 +99,16 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2014.08"
+
+config BR2_PACKAGE_PROCPS
+	bool "procps has been replaced by procps-ng"
+	select BR2_PACKAGE_PROCPS_NG
+	select BR2_LEGACY
+	help
+	  The procps package has been replaced by the equivalent procps-ng.
+
+###############################################################################
 comment "Legacy options removed in 2014.05"
 
 config BR2_PACKAGE_EVTEST_CAPTURE
package/Config.in +1 -1
index 1282066..9c0a769 100644
@@ -1106,7 +1106,7 @@ source "package/numactl/Config.in"
 source "package/nut/Config.in"
 source "package/polkit/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/procps/Config.in"
+source "package/procps-ng/Config.in"
 source "package/psmisc/Config.in"
 endif
 source "package/quota/Config.in"
package/procps-ng/Config.in renamed from package/procps/Config.in +3 -3
similarity index 63%
rename from package/procps/Config.in
rename to package/procps-ng/Config.in
index 48baf7b..0dea84a 100644
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_PROCPS
-	bool "procps"
+config BR2_PACKAGE_PROCPS_NG
+	bool "procps-ng"
 	select BR2_PACKAGE_NCURSES
 	help
 	  Standard informational utilities and process-handling tools.
 	  Provides things like kill, ps, uptime, free, top, etc...
 
-	  http://procps.sourceforge.net/
+	  http://sourceforge.net/projects/procps-ng/
package/procps-ng/procps-ng-0000-remove-index.patch new file +16 -0
new file mode 100644
index 0000000..1d85b31
@@ -0,0 +1,16 @@
+sysctl: remove use of legacy index()
+
+[yann.morin.1998 at free.fr: adapt to procps-ng]
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+diff -durN procps-v3.3.9.orig/sysctl.c procps-v3.3.9/sysctl.c
+--- procps-v3.3.9.orig/sysctl.c	2013-12-03 12:16:18.000000000 +0100
++++ procps-v3.3.9/sysctl.c	2014-05-31 00:45:00.869748741 +0200
+@@ -794,7 +794,7 @@
+ 		      program_invocation_short_name);
+ 
+ 	for ( ; *argv; argv++) {
+-		if (WriteMode || index(*argv, '='))
++		if (WriteMode || strchr(*argv, '='))
+ 			ReturnCode += WriteSetting(*argv);
+ 		else
+ 			ReturnCode += ReadSetting(*argv);
package/procps-ng/procps-ng.mk new file +15 -0
new file mode 100644
index 0000000..3245e92
@@ -0,0 +1,15 @@
+################################################################################
+#
+# procps
+#
+################################################################################
+
+PROCPS_NG_VERSION = 3.3.9
+PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
+PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
+PROCPS_NG_LICENSE = GPLv2+, libproc and libps LGPLv2+
+PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
+
+PROCPS_NG_DEPENDENCIES = ncurses
+
+$(eval $(autotools-package))
package/procps/procps-make-3.82.patch deleted +0 -23
deleted file mode 100644
index 2a56356..0000000
@@ -1,23 +0,0 @@
-[PATCH] procps: fix build with make 3.82
-
-Equivalent to upstream fix:
-http://procps.cvs.sourceforge.net/viewvc/procps/procps/Makefile?r1=1.70&r2=1.71
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: procps-3.2.8/Makefile
-===================================================================
---- procps-3.2.8.orig/Makefile
-+++ procps-3.2.8/Makefile
-@@ -174,7 +174,7 @@
- # want this rule first, use := on ALL, and ALL not filled in yet
- all: do_all
- 
---include */module.mk
-+-include proc/module.mk ps/module.mk
- 
- do_all:    $(ALL)
- 
package/procps/procps-remove-flags.patch deleted +0 -26
deleted file mode 100644
index cb4dc56..0000000
@@ -1,26 +0,0 @@
-diff -u procps-3.2.5/Makefile procps-3.2.5-patched/Makefile
---- procps-3.2.5/Makefile	2005-01-25 22:55:26.000000000 -0600
-+++ procps-3.2.5-patched/Makefile	2007-07-05 23:09:24.251423681 -0500
-@@ -70,9 +70,7 @@
- CURSES := -lncurses
- 
- # Preprocessor flags.
--PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
--CPPFLAGS     := -I/usr/include/ncurses
--ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
-+ALL_CPPFLAGS := -D_GNU_SOURCE -I proc
- 
- # Left out -Wconversion due to noise in glibc headers.
- # Left out -Wunreachable-code and -Wdisabled-optimization
-@@ -91,11 +89,9 @@
-   -Wstrict-prototypes -Wmissing-prototypes
- # Note that some stuff below is conditional on CFLAGS containing
- # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
--CFLAGS       := -O2 -s
- ALL_CFLAGS   := $(PKG_CFLAGS) $(CFLAGS)
- 
- PKG_LDFLAGS  := -Wl,-warn-common
--LDFLAGS      :=
- ALL_LDFLAGS  := $(PKG_LDFLAGS) $(LDFLAGS)
- 
- ############ Add some extra flags if gcc allows
package/procps/procps-remove-index.patch deleted +0 -21
deleted file mode 100644
index 4f4cfb7..0000000
@@ -1,21 +0,0 @@
-diff -ur procps-3.2.5/sysctl.c procps-3.2.5-patched/sysctl.c
---- procps-3.2.5/sysctl.c	2005-01-05 15:00:47.000000000 -0600
-+++ procps-3.2.5-patched/sysctl.c	2006-12-04 19:51:36.272843000 -0600
-@@ -272,7 +272,7 @@
-       return 0;
-    } /* end if */
- 
--   equals = index(setting, '=');
-+   equals = strchr(setting, '=');
-  
-    if (!equals) {
-       fprintf(stderr, ERR_NO_EQUALS, setting);
-@@ -498,7 +498,7 @@
-          if (NameOnly && Quiet)   // nonsense
-             return Usage(me);
-          SwitchesAllowed = false;
--         if (WriteMode || index(*argv, '='))
-+         if (WriteMode || strchr(*argv, '='))
-             ReturnCode = WriteSetting(*argv);
-          else
-             ReturnCode = ReadSetting(*argv);
package/procps/procps-wchar.patch deleted +0 -29
deleted file mode 100644
index 7915229..0000000
@@ -1,29 +0,0 @@
---- procps-3.2.7/proc/escape.c	2005-01-06 07:50:26.000000000 +1100
-+++ procps-3.2.7.fixed/proc/escape.c	2008-09-09 11:55:57.000000000 +1000
-@@ -15,7 +15,7 @@
- #include "escape.h"
- #include "readproc.h"
- 
--#if (__GNU_LIBRARY__ >= 6)
-+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__))
- # include <wchar.h>
- # include <wctype.h>
- # include <stdlib.h>  /* MB_CUR_MAX */
-@@ -23,7 +23,7 @@
- # include <langinfo.h>
- #endif
- 
--#if (__GNU_LIBRARY__ >= 6)
-+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__))
- static int escape_str_utf8(char *restrict dst, const char *restrict src, int bufsize, int *maxcells){
-   int my_cells = 0;
-   int my_bytes = 0;
-@@ -123,7 +123,7 @@
-   "********************************"
-   "********************************";
-   
--#if (__GNU_LIBRARY__ >= 6)
-+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__))
-   static int utf_init=0;
-   
-   if(utf_init==0){
package/procps/procps.mk deleted +0 -25
deleted file mode 100644
index dc2b841..0000000
@@ -1,25 +0,0 @@
-################################################################################
-#
-# procps
-#
-################################################################################
-
-PROCPS_VERSION = 3.2.8
-PROCPS_SITE = http://procps.sourceforge.net/
-PROCPS_LICENSE = GPLv2+, libproc and libps LGPLv2+
-PROCPS_LICENSE_FILES = COPYING COPYING.LIB
-
-PROCPS_DEPENDENCIES = ncurses
-
-define PROCPS_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-
-define PROCPS_INSTALL_TARGET_CMDS
-	mkdir -p $(addprefix $(TARGET_DIR)/,usr/bin bin sbin) \
-		 $(addprefix $(TARGET_DIR)/usr/share/man/,man1 man5 man8)
-	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) lib64=lib install=install \
-		ldconfig=true install
-endef
-
-$(eval $(generic-package))
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 1/7 package/procps: bump version and rename to procps-ng

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

From: "Yann E. MORIN" <[email protected]> procps is getting replaced by procps-ng, and there are new versions available!

procps-ng is now an autotools package, so get rid of our custom build/install rules.

Quoted 6 lines

Remove most patches, except for one that still half-applies, so update and rename it.

procps is dead, long live procps-ng!

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v3 2/7 package/libinput: new package

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

---
 package/Config.in            |  1 +
 package/libinput/Config.in   | 17 +++++++++++++++++
 package/libinput/libinput.mk | 19 +++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/libinput/Config.in
 create mode 100644 package/libinput/libinput.mk
package/Config.in +1 -0
index 9c0a769..1706197 100644
@@ -625,6 +625,7 @@ source "package/libcec/Config.in"
 source "package/libfreefare/Config.in"
 source "package/libftdi/Config.in"
 source "package/libhid/Config.in"
+source "package/libinput/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libllcp/Config.in"
 source "package/libmbim/Config.in"
package/libinput/Config.in new file +17 -0
new file mode 100644
index 0000000..14e4e70
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LIBINPUT
+	bool "libinput"
+	depends on BR2_PACKAGE_HAS_UDEV
+	select BR2_PACKAGE_LIBEVDEV
+	select BR2_PACKAGE_MTDEV
+	help
+	  libinput is a library to handle input devices in Wayland
+	  compositors and to provide a generic X.Org input driver.
+	  It provides device detection, device handling, input device
+	  event processing and abstraction so minimize the amount of
+	  custom input code compositors need to provide the common
+	  set of functionality that users expect.
+
+	  http://freedesktop.org/wiki/Software/libinput/
+
+comment "libinput needs udev /dev management"
+	depends on !BR2_PACKAGE_HAS_UDEV
package/libinput/libinput.mk new file +19 -0
new file mode 100644
index 0000000..7c3e5e8
@@ -0,0 +1,19 @@
+################################################################################
+#
+# libinput
+#
+################################################################################
+
+LIBINPUT_VERSION = 0.2.0
+LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
+LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
+LIBINPUT_LICENSE = MIT
+LIBINPUT_LICENSE_FILES = COPYING
+
+LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
+LIBINPUT_INSTALL_STAGING = YES
+
+# Tests need fork, so just disable them everywhere.
+LIBINPUT_CONF_OPT = --disable-tests
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.3.2
#5 lore raw

PATCH v3 3/7 package/weston: add support for libinput

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

---
 package/weston/weston.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/weston/weston.mk +7 -0
index ea63203..325cfc7 100644
@@ -32,6 +32,13 @@ else
 WESTON_CONF_OPT += --disable-xkbcommon
 endif
 
+ifeq ($(BR2_PACKAGE_LIBINPUT),y)
+WESTON_DEPENDENCIES += libinput
+WESTON_CONF_OPT += --enable-libinput-backend
+else
+WESTON_CONF_OPT += --disable-libinput-backend
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
 WESTON_DEPENDENCIES += libunwind
 else
Signature · 1 line
1.8.3.2
#7 lore raw

PATCH v3 4/7 package/freerdp: not forcibly depend on X.Org

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

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.

---
 package/Config.in          |  2 +-
 package/freerdp/Config.in  | 17 ++++++++++++-----
 package/freerdp/freerdp.mk | 18 ++++++++++++++----
 3 files changed, 27 insertions(+), 10 deletions(-)
package/Config.in +1 -1
index 1706197..4b97cde 100644
@@ -190,6 +190,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"
@@ -228,7 +229,6 @@ source "package/apitrace/Config.in"
 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"
package/freerdp/Config.in +12 -5
index c5ff769..81a67ea 100644
@@ -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
package/freerdp/freerdp.mk +14 -4
index e92067c..95430bb 100644
@@ -4,13 +4,23 @@
 #
 ################################################################################
 
-FREERDP_VERSION = 1.0.1
-FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP
-FREERDP_DEPENDENCIES = openssl zlib \
-	xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
+# Changeset on the stable-1.1 branch
+FREERDP_VERSION = 01865f0e284ce34bb5f38842b34dc80f08b58749
+FREERDP_SITE = https://github.com/FreeRDP/FreeRDP
+FREERDP_SITE_METHOD = git
+FREERDP_DEPENDENCIES = openssl zlib
 FREERDP_LICENSE = Apache-2.0
 FREEDRP_LICENSE_FILES = LICENSE
 
+FREERDP_INSTALL_STAGING = YES
+
+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
Signature · 1 line
1.8.3.2
#8 lore raw

PATCH v3 5/7 pacakge/freerdp: disable building the manpages

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

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

---
 package/freerdp/freerdp.mk | 2 ++
 1 file changed, 2 insertions(+)
package/freerdp/freerdp.mk +2 -0
index 95430bb..aef9350 100644
@@ -14,6 +14,8 @@ FREEDRP_LICENSE_FILES = LICENSE
 
 FREERDP_INSTALL_STAGING = YES
 
+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
Signature · 1 line
1.8.3.2
#9 lore raw

PATCH v3 6/7 package/freerdp: add options to enable/disable server and/or client

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

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.

---
 package/freerdp/Config.in  | 18 ++++++++++++++++--
 package/freerdp/freerdp.mk | 12 ++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
package/freerdp/Config.in +16 -2
index 81a67ea..0c2edc5 100644
@@ -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
package/freerdp/freerdp.mk +12 -0
index aef9350..80e4945 100644
@@ -23,6 +23,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
Signature · 1 line
1.8.3.2
#10 lore raw

PATCH v3 7/7 package/weston: add support for the RDP compositor

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

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.

---
Note: this is mostly in an WIP state. The backend builds and does not crash. But the best I was able to get when connecting to this RDP server, is an empty, completely black client window, in which I could do nothing, not even run a weston-terminal or whatever, even by explicitly asking to run it via the RDP 'shell' command... But it works, as it does not crash. Oh, wait...

Although WIP, sending it to show off what weston is (supposed to be) capable of.

---
 package/weston/Config.in | 5 +++++
 package/weston/weston.mk | 7 +++++++
 2 files changed, 12 insertions(+)
package/weston/Config.in +5 -0
index 96ebdf1..267571a 100644
@@ -45,6 +45,11 @@ 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
+
 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
package/weston/weston.mk +7 -0
index 325cfc7..6189601 100644
@@ -39,6 +39,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
Signature · 1 line
1.8.3.2