The wayland/weston/libgtk3 bump
cover The wayland/weston/libgtk3 bump
This series bumps wayland/weston to the latest 1.12 release and gtk3+ to it's latest 3.22.0 release.
The series can't be split since these wayland/weston/gtk+ versions are protocol-version tied, i.e. gtk+ 3.22 won't work with any older wayland release.
Gustavo Zacarias (9):
wayland-protocols: bump to version 1.7
wayland: bump to version 1.12.0
weston: bump to version 1.12.0
legacy: add weston rpi support
adwaita-icon-theme: bump to version 3.22.0
libgtk3: bump to version 3.22.0
glibmm: bump to version 2.50.0
libsigc: bump to version 2.10.0
gtkmm3: bump to version 3.22.0
Config.in.legacy | 8 +++++ package/adwaita-icon-theme/adwaita-icon-theme.hash | 4 +-- package/adwaita-icon-theme/adwaita-icon-theme.mk | 5 ++-- package/glibmm/glibmm.hash | 4 +-- package/glibmm/glibmm.mk | 4 +-- package/gtkmm3/gtkmm3.hash | 4 +-- package/gtkmm3/gtkmm3.mk | 4 +-- package/libgtk3/libgtk3.hash | 4 +-- package/libgtk3/libgtk3.mk | 4 +-- package/libsigc/libsigc.hash | 4 +-- package/libsigc/libsigc.mk | 2 +- package/wayland-protocols/wayland-protocols.hash | 4 +-- package/wayland-protocols/wayland-protocols.mk | 2 +- ...0002-scanner-Use-uint32_t-instead-of-uint.patch | 31 -------------------- package/wayland/wayland.hash | 4 +-- package/wayland/wayland.mk | 2 +- ...ompositor-rdp-fix-no-break-space-U-A0-U8-.patch | 34 ---------------------- package/weston/Config.in | 6 ---- package/weston/weston.hash | 4 +-- package/weston/weston.mk | 11 +------ 20 files changed, 37 insertions(+), 108 deletions(-) delete mode 100644 package/wayland/0002-scanner-Use-uint32_t-instead-of-uint.patch delete mode 100644 package/weston/0002-libweston-compositor-rdp-fix-no-break-space-U-A0-U8-.patch
Signature · 1 line
2.7.3
PATCH 1/9 wayland-protocols: bump to version 1.7
--- package/wayland-protocols/wayland-protocols.hash | 4 ++-- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/wayland-protocols/wayland-protocols.hash +2 -2
@@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-May/029014.html -sha256 014a9a23c21ed14f49b1005b3e8efa66d6337d4ceafc97f7b0d6707e7e3df572 wayland-protocols-1.4.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030606.html +sha256 635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f wayland-protocols-1.7.tar.xz
package/wayland-protocols/wayland-protocols.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.4 +WAYLAND_PROTOCOLS_VERSION = 1.7 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT
Signature · 1 line
2.7.3
PATCH 2/9 wayland: bump to version 1.12.0
In reply to Gustavo ZacariasAnd drop upstream patch.
--- ...0002-scanner-Use-uint32_t-instead-of-uint.patch | 31 ---------------------- package/wayland/wayland.hash | 4 +-- package/wayland/wayland.mk | 2 +- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 package/wayland/0002-scanner-Use-uint32_t-instead-of-uint.patch
package/wayland/0002-scanner-Use-uint32_t-instead-of-uint.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 6750b47d9e0d3074d2e56aa36c476493f533d696 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 15 Jul 2016 16:23:48 -0700 -Subject: [PATCH 1/1] scanner: Use uint32_t instead of uint - -uint32_t is C99 defined stdint type - -Signed-off-by: Khem Raj <[email protected]> -Reviewed-by: Daniel Stone <[email protected]> -[Rahul Bedarkar: Backported from: 6750b47d9e0d3074d2e56aa36c476493f533d696] -Signed-off-by: Rahul Bedarkar <[email protected]> ---- - src/scanner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scanner.c b/src/scanner.c -index 6e2c3a3..ebae4cc 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -819,7 +819,7 @@ find_enumeration(struct protocol *protocol, - struct interface *i; - struct enumeration *e; - char *enum_name; -- uint idx = 0, j; -+ uint32_t idx = 0, j; - - for (j = 0; j + 1 < strlen(enum_attribute); j++) { - if (enum_attribute[j] == '.') { --- -2.6.2 -
package/wayland/wayland.hash +2 -2
@@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-June/029163.html -sha256 9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0 wayland-1.11.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031121.html +sha256 d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1 wayland-1.12.0.tar.xz
package/wayland/wayland.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.11.0 +WAYLAND_VERSION = 1.12.0 WAYLAND_SITE = http://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT
Signature · 1 line
2.7.3
PATCH 3/9 weston: bump to version 1.12.0
In reply to Gustavo ZacariasAlso drop upstream patch.
Drop propietary RPI support since it's gone upstream.
--- ...ompositor-rdp-fix-no-break-space-U-A0-U8-.patch | 34 ---------------------- package/weston/Config.in | 6 ---- package/weston/weston.hash | 4 +-- package/weston/weston.mk | 11 +------ 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 package/weston/0002-libweston-compositor-rdp-fix-no-break-space-U-A0-U8-.patch
package/weston/0002-libweston-compositor-rdp-fix-no-break-space-U-A0-U8-.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 7ee8589dd83e52ae6af3ec5247c3403e8ded69a5 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -Date: Tue, 9 Aug 2016 20:00:29 +0200 -Subject: [PATCH] libweston/compositor-rdp: fix no-break space U+A0 (U8+C2A0) - -There is a UTF-8 no-break space (U+A0, U8+C2A0) in the definition of -macro NSC_RESET in the case of 1.2.2 <= FreeRDP < 2.0. - -This is causing build issues (\302 is 0xC2, \240 is 0xA0): - http://autobuild.buildroot.net/results/f49/f49a9cbb7bdc5d9e05dcf0a20bd83f059e234e74/build-end.log - -Fix that by using a plain, boring space U+20. - -Signed-off-by: "Yann E. MORIN" <[email protected]> ---- - libweston/compositor-rdp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c -index 11f5f05..ee81300 100644 ---- a/src/compositor-rdp.c -+++ b/src/compositor-rdp.c -@@ -58,7 +58,7 @@ - # define NSC_RESET(C, W, H) nsc_context_reset(C, W, H) - # define RFX_RESET(C, W, H) rfx_context_reset(C, W, H) - #else --# define NSC_RESET(C, W, H) do {?nsc_context_reset(C); C->width = W; C->height = H; } while(0) -+# define NSC_RESET(C, W, H) do { nsc_context_reset(C); C->width = W; C->height = H; } while(0) - # define RFX_RESET(C, W, H) do { rfx_context_reset(C); C->width = W; C->height = H; } while(0) - #endif - #define FREERDP_CB_RET_TYPE BOOL --- -2.7.4 -
package/weston/Config.in +0 -6
@@ -77,12 +77,6 @@ comment "RDP compositor needs a toolchain w/ wchar, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP -# rpi-userland is an EGL/GLES provider, so we can't select it -config BR2_PACKAGE_WESTON_RPI - bool "RPi compositor" - depends on BR2_PACKAGE_RPI_USERLAND - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR - config BR2_PACKAGE_WESTON_X11 bool "X11 compositor" depends on BR2_PACKAGE_XORG7
package/weston/weston.hash +2 -2
@@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-June/029164.html -sha256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 weston-1.11.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031123.html +sha256 ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 weston-1.12.0.tar.xz
package/weston/weston.mk +1 -10
@@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 1.11.0 +WESTON_VERSION = 1.12.0 WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT
@@ -89,15 +89,6 @@ else WESTON_CONF_OPTS += --disable-drm-compositor endif -ifeq ($(BR2_PACKAGE_WESTON_RPI),y) -WESTON_DEPENDENCIES += rpi-userland -WESTON_CONF_OPTS += --enable-rpi-compositor \ - --disable-resize-optimization \ - WESTON_NATIVE_BACKEND=rpi-backend.so -else -WESTON_CONF_OPTS += --disable-rpi-compositor -endif # BR2_PACKAGE_WESTON_RPI - ifeq ($(BR2_PACKAGE_WESTON_X11),y) WESTON_CONF_OPTS += \ --enable-x11-compositor \
Signature · 1 line
2.7.3
PATCH 4/9 legacy: add weston rpi support
In reply to Gustavo ZacariasIt's gone for good, people should just use the open vc4 support instead.
--- Config.in.legacy | 8 ++++++++ 1 file changed, 8 insertions(+)
Config.in.legacy +8 -0
@@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_WESTON_RPI + bool "Weston propietary RPI support is gone" + select BR2_LEGACY + help + Upstream decided the propietary (rpi-userland) weston composer + support wasn't worth the effort so it was removed. Switch to + the open VC4 support. + config BR2_LINUX_KERNEL_TOOL_CPUPOWER bool "linux-tool cpupower" depends on BR2_LINUX_KERNEL
Signature · 1 line
2.7.3
PATCH 5/9 adwaita-icon-theme: bump to version 3.22.0
In reply to Gustavo Zacarias--- package/adwaita-icon-theme/adwaita-icon-theme.hash | 4 ++-- package/adwaita-icon-theme/adwaita-icon-theme.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
package/adwaita-icon-theme/adwaita-icon-theme.hash +2 -2
@@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.20/adwaita-icon-theme-3.20.sha256sum -sha256 7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35 adwaita-icon-theme-3.20.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum +sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz
package/adwaita-icon-theme/adwaita-icon-theme.mk +3 -2
@@ -4,8 +4,9 @@ # ################################################################################ -ADWAITA_ICON_THEME_VERSION = 3.20 -ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION) +ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22 +ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0 +ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0 ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3
Signature · 1 line
2.7.3
PATCH 6/9 libgtk3: bump to version 3.22.0
In reply to Gustavo Zacarias--- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
package/libgtk3/libgtk3.hash +2 -2
@@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.9.sha256sum -sha256 83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 gtk+-3.20.9.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.0.sha256sum +sha256 88d0bb584be7ecec965b82ba88a9cf0aafd6f03eff7447653295ab2341c74134 gtk+-3.22.0.tar.xz
package/libgtk3/libgtk3.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -LIBGTK3_VERSION_MAJOR = 3.20 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).9 +LIBGTK3_VERSION_MAJOR = 3.22 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).0 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+
Signature · 1 line
2.7.3
PATCH 7/9 glibmm: bump to version 2.50.0
In reply to Gustavo Zacarias--- package/glibmm/glibmm.hash | 4 ++-- package/glibmm/glibmm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
package/glibmm/glibmm.hash +2 -2
@@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.48/glibmm-2.48.1.sha256sum -sha256 dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf glibmm-2.48.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.50/glibmm-2.50.0.sha256sum +sha256 df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94 glibmm-2.50.0.tar.xz
package/glibmm/glibmm.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -GLIBMM_VERSION_MAJOR = 2.48 -GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1 +GLIBMM_VERSION_MAJOR = 2.50 +GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0 GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz
Signature · 1 line
2.7.3
PATCH 8/9 libsigc: bump to version 2.10.0
In reply to Gustavo Zacarias--- package/libsigc/libsigc.hash | 4 ++-- package/libsigc/libsigc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/libsigc/libsigc.hash +2 -2
@@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.8/libsigc++-2.8.0.sha256sum -sha256 774980d027c52947cb9ee4fac6ffe2ca60cc2f753068a89dfd281c83dbff9651 libsigc++-2.8.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.10/libsigc++-2.10.0.sha256sum +sha256 f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81 libsigc++-2.10.0.tar.xz
package/libsigc/libsigc.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGC_VERSION_MAJOR = 2.8 +LIBSIGC_VERSION_MAJOR = 2.10 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR)
Signature · 1 line
2.7.3
PATCH 9/9 gtkmm3: bump to version 3.22.0
In reply to Gustavo Zacarias--- package/gtkmm3/gtkmm3.hash | 4 ++-- package/gtkmm3/gtkmm3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
package/gtkmm3/gtkmm3.hash +2 -2
@@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.20/gtkmm-3.20.1.sha256sum -sha256 051de1b8756ca6ec61f26264338cfc3060af936fd70bf4558bfe1e115418c612 gtkmm-3.20.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum +sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz
package/gtkmm3/gtkmm3.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -GTKMM3_VERSION_MAJOR = 3.20 -GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).1 +GTKMM3_VERSION_MAJOR = 3.22 +GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
Signature · 1 line
2.7.3
cover The wayland/weston/libgtk3 bump
In reply to Gustavo ZacariasHello,
Quoted 11 lines · Gustavo Zacarias
This series bumps wayland/weston to the latest 1.12 release and gtk3+ to it's latest 3.22.0 release.
The series can't be split since these wayland/weston/gtk+ versions are protocol-version tied, i.e. gtk+ 3.22 won't work with any older wayland release.Gustavo Zacarias (9):
wayland-protocols: bump to version 1.7
wayland: bump to version 1.12.0
weston: bump to version 1.12.0
legacy: add weston rpi support
I've merged this patch into the previous one. Indeed, we normally add the Config.in.legacy entry in the same commit as the one removing the option.
Quoted 5 lines
adwaita-icon-theme: bump to version 3.22.0
libgtk3: bump to version 3.22.0
glibmm: bump to version 2.50.0
libsigc: bump to version 2.10.0
gtkmm3: bump to version 3.22.0
All other patches applied as-is.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com