wayland+weston: bump to 1.4.0
v3 cover wayland+weston: bump to 1.4.0
From: "Yann E. MORIN" <[email protected]>
Hello All!
Here is a small series that bumps wayland and weston to the latest and ?17:52 -!- - this server!
greatest 1.4.0.
Note that the weston's rpi-backend is currently broken, so it is marked accordingly.
Changes v2 -> v3:
- clean-up host-wayland (dependencies, comments) (Arnout)
Changes v1 -> v2:
- remove wayland's DTD from target/ (Thomas)
Regards,
Yann E. MORIN.
----------------------------------------------------------------
Yann E. MORIN (3):
package/wayland: bump to 1.4.0
package/wayland: build a host variant
package/weston: bump to 1.4.0
package/wayland/wayland.mk | 31 +++++---- package/weston/Config.in | 1 + ...eston-0000-dont-leak-fd-on-launcher-error.patch | 77 ---------------------- .../weston-0001-enable-build-without-libdrm.patch | 45 ------------- ...on-0002-fbdev-fix-compilation-without-EGL.patch | 29 -------- package/weston/weston-0003-dont-build-tests.patch | 15 ++--- ...weston-0004-fbdev-open-launcher-only-once.patch | 46 ------------- package/weston/weston.mk | 3 +- 8 files changed, 28 insertions(+), 219 deletions(-) delete mode 100644 package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch delete mode 100644 package/weston/weston-0001-enable-build-without-libdrm.patch delete mode 100644 package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch delete mode 100644 package/weston/weston-0004-fbdev-open-launcher-only-once.patch
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. | '------------------------------^-------^------------------^--------------------'
PATCH v3 1/3 package/wayland: bump to 1.4.0
From: "Yann E. MORIN" <[email protected]>
--- package/wayland/wayland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/wayland/wayland.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.3.0 +WAYLAND_VERSION = 1.4.0 WAYLAND_SITE = http://wayland.freedesktop.org/releases/ WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT
Signature · 1 line
1.8.1.2
PATCH v3 2/3 package/wayland: build a host variant
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Starting with 1.4.0, weston requires wayland-scanner to build its DT So far, we got away with just hand-building wayland-scanner, and made that available in HOST_DIR/usr/bin
But now, weston also requires wayland's DTD, which we did not care of in our dirty little hack.
So, the best solution is to just build a host-variant of wayland, so we get both wayland-scanner, and the DTD.
But then, we do not build the target wayland-scanner (he, wayland tries to run it at build time...). So it is a matter of just tweaking a little bit the host .pc file (which weston uses to find wayland-scanner, sigh...) and fake it as a target .pc file.
---
Chnages v2->v3:
- remove host depednencies (inherited from target's) (Arnout)
- fix wayland-scanner.pc (Arnout)
- cleanup comments (Arnout)
Changes v1->V2
- remove DTD on target (Thomas)
--- package/wayland/wayland.mk | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
package/wayland/wayland.mk +17 -12
@@ -11,22 +11,27 @@ WAYLAND_LICENSE = MIT WAYLAND_LICENSE_FILES = COPYING WAYLAND_INSTALL_STAGING = YES -WAYLAND_DEPENDENCIES = libffi host-pkgconf expat host-expat +WAYLAND_DEPENDENCIES = libffi host-pkgconf host-wayland expat -# wayland needs a wayland-scanner program to generate some of its -# source code. By default, it builds it with CC, so it doesn't work with -# cross-compilation. Therefore, we build it manually, and tell wayland -# that the tool is already available. +# wayland-scanner is only needed for building, not on the target WAYLAND_CONF_OPT = --disable-scanner -define WAYLAND_BUILD_SCANNER - (cd $(@D)/src/; \ - $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - -o wayland-scanner scanner.c wayland-util.c -lexpat; \ - $(INSTALL) -m 0755 -D wayland-scanner \ - $(HOST_DIR)/usr/bin/wayland-scanner) +# We must provide a specialy-crafted wayland-scanner .pc file +# which we vampirise and adapt from the host-wayland copy +define WAYLAND_SCANNER_PC + $(INSTALL) -m 0644 -D $(HOST_DIR)/usr/share/pkgconfig/wayland-scanner.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc + $(SED) 's:^prefix=.*:prefix=/usr:' \ + -e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \ + $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc endef +WAYLAND_POST_INSTALL_STAGING_HOOKS += WAYLAND_SCANNER_PC -WAYLAND_POST_CONFIGURE_HOOKS += WAYLAND_BUILD_SCANNER +# Remove the DTD from the target, it's not needed at runtime +define WAYLAND_TARGET_CLEANUP + rm -rf $(TARGET_DIR)/usr/share/wayland +endef +WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
1.8.1.2
PATCH v3 3/3 package/weston: bump to 1.4.0
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Drop patches applied upstream.
Mark the rpi-backend as broken, since it segfaults.
--- package/weston/Config.in | 1 + ...eston-0000-dont-leak-fd-on-launcher-error.patch | 77 ---------------------- .../weston-0001-enable-build-without-libdrm.patch | 45 ------------- ...on-0002-fbdev-fix-compilation-without-EGL.patch | 29 -------- package/weston/weston-0003-dont-build-tests.patch | 15 ++--- ...weston-0004-fbdev-open-launcher-only-once.patch | 46 ------------- package/weston/weston.mk | 3 +- 7 files changed, 10 insertions(+), 206 deletions(-) delete mode 100644 package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch delete mode 100644 package/weston/weston-0001-enable-build-without-libdrm.patch delete mode 100644 package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch delete mode 100644 package/weston/weston-0004-fbdev-open-launcher-only-once.patch
package/weston/Config.in +1 -0
@@ -41,6 +41,7 @@ comment "RPi compositor needs a toolchain w/ C++, largefile, threads" config BR2_PACKAGE_WESTON_RPI bool "RPi compositor" + depends on BROKEN # rpi-backend broken in 1.4.0 depends on BR2_arm # rpi-userland depends on BR2_INSTALL_LIBSTDCPP # rpi-userland depends on BR2_LARGEFILE # rpi-userland
package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch deleted +0 -77
77 lines not on this page · raw message
package/weston/weston-0001-enable-build-without-libdrm.patch deleted +0 -45
45 lines not on this page · raw message
package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch deleted +0 -29
@@ -1,29 +0,0 @@ -commit 9acd374822022793b09427d67ea4033915343dd8 -Author: Kristian H?gsberg <[email protected]> -Date: Fri Oct 11 15:25:42 2013 -0700 - - fbdev: Fix compilation without EGL - - We have to duplicate #defines and typedefs for the EGL types and constants - we use in gl-renderer.h so we can compile the fbdev backend without EGL. - - https://bugs.freedesktop.org/show_bug.cgi?id=70392 - ---- -Signed-off-by: "Yann E. MORIN" <[email protected]> - -To be noted: the bug referenced above was opened by me, -and quickly fixed during an IRC session. Nice! :-) - -diff --git a/src/gl-renderer.h b/src/gl-renderer.h -index 4919a1e..d16ade2 100644 ---- a/src/gl-renderer.h -+++ b/src/gl-renderer.h -@@ -56,6 +56,7 @@ typedef void *EGLDisplay; - typedef void *EGLSurface; - typedef intptr_t EGLNativeDisplayType; - typedef intptr_t EGLNativeWindowType; -+#define EGL_DEFAULT_DISPLAY NULL - - static const EGLint gl_renderer_opaque_attribs[]; - static const EGLint gl_renderer_alpha_attribs[];
package/weston/weston-0003-dont-build-tests.patch +7 -8
@@ -7,12 +7,11 @@ Signed-off-by: "Yann E. MORIN" <[email protected]> diff -durN weston-1.3.0.orig/Makefile.am weston-1.3.0/Makefile.am --- weston-1.3.0.orig/Makefile.am 2013-08-20 20:15:19.000000000 +0200 +++ weston-1.3.0/Makefile.am 2013-10-14 23:08:12.016392097 +0200 -@@ -2,7 +2,7 @@ - wcap_subdir = wcap - endif - --SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man -+SUBDIRS = shared src clients data protocol $(wcap_subdir) man - - DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install +@@ -14,7 +14,6 @@ + clients \ + data \ + protocol \ +- tests \ + $(wcap_subdir) \ + man
package/weston/weston-0004-fbdev-open-launcher-only-once.patch deleted +0 -46
46 lines not on this page · raw message
package/weston/weston.mk +2 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 1.3.0 +WESTON_VERSION = 1.4.0 WESTON_SITE = http://wayland.freedesktop.org/releases/ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT
@@ -17,6 +17,7 @@ WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ WESTON_AUTORECONF = YES WESTON_CONF_OPT = \ + --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ --disable-egl \ --disable-simple-egl-clients \ --disable-xwayland \
Signature · 1 line
1.8.1.2
v3 cover wayland+weston: bump to 1.4.0
In reply to Yann E. MORINQuoted 5 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]>
Hello All!
Quoted 8 lines
Here is a small series that bumps wayland and weston to the latest and ?17:52 -!- - this server!
greatest 1.4.0.Note that the weston's rpi-backend is currently broken, so it is marked accordingly.
Changes v2 -> v3:
- clean-up host-wayland (dependencies, comments) (Arnout)
Committed series, thanks.
Signature · 1 line
Bye, Peter Korsgaard