Skip to contentSkip to conversation

wayland: bump to version 1.13.0

PATCH New Gustavo Zacarias 3 participants 5 messages Mar 2, 2017 – Mar 5, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 wayland: bump to version 1.13.0

---
 package/wayland/wayland.hash | 4 ++--
 package/wayland/wayland.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/wayland/wayland.hash +2 -2
index 9a58c56..9b2c01d 100644
@@ -1,2 +1,2 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031121.html
-sha256  d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1	wayland-1.12.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2017-February/033193.html
+sha256  69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51	wayland-1.13.0.tar.xz
package/wayland/wayland.mk +1 -1
index a862394..286871e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.12.0
+WAYLAND_VERSION = 1.13.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
Signature · 1 line
2.10.2
#1 lore raw

PATCH 2/2 weston: bump to version 2.0.0

Drop upstream patches.

---
 ...form-include-weston-egl-ext.h-only-if-ENA.patch | 38 --------------
 ...onfigure-search-for-lib-with-clock_getres.patch | 47 ------------------
 ...nclude-weston-egl-ext.h-in-drm-x11-and-wa.patch | 58 ----------------------
 ...ix-building-issue-when-EGL-support-is-not.patch | 47 ------------------
 .../weston/0006-tests-add-missing-include.patch    | 36 --------------
 package/weston/weston.hash                         |  4 +-
 package/weston/weston.mk                           |  4 +-
 7 files changed, 3 insertions(+), 231 deletions(-)
 delete mode 100644 package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch
 delete mode 100644 package/weston/0003-configure-search-for-lib-with-clock_getres.patch
 delete mode 100644 package/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch
 delete mode 100644 package/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch
 delete mode 100644 package/weston/0006-tests-add-missing-include.patch
package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch deleted +0 -38
deleted file mode 100644
index baa3a4f..0000000
@@ -1,38 +0,0 @@
-From e338ced1e04bf4b97322d5eed2b5bdf5b052095a Mon Sep 17 00:00:00 2001
-From: Krzysztof Konopko <[email protected]>
-Date: Thu, 15 Sep 2016 13:01:49 +0200
-Subject: [PATCH] shared/platform: include weston-egl-ext.h only if ENABLE_EGL
- is defined
-
-Including `weston-egl-ext.h` causes compilation failure for configurations
-with EGL disabled.
-
-Verified with `--disable-egl`, `--disable-x11-compositor`
-and `--disable-drm-compositor`.
-
-Signed-off-by: Krzysztof Konopko <[email protected]>
-Reviewed-by: Pekka Paalanen <[email protected]>
-[yann.morin.1998 at free.fr: backported from upstream]
-Signed-off-by: "Yann E. MORIN" <[email protected]>
----
- shared/platform.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shared/platform.h b/shared/platform.h
-index 1eb96fd..30db1a6 100644
---- a/shared/platform.h
-+++ b/shared/platform.h
-@@ -33,9 +33,9 @@
- #include <wayland-egl.h>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
--#endif
- 
- #include "weston-egl-ext.h"
-+#endif
- 
- #ifdef  __cplusplus
- extern "C" {
--- 
-2.7.4
-
package/weston/0003-configure-search-for-lib-with-clock_getres.patch deleted +0 -47

47 lines not on this page · raw message

package/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch deleted +0 -58

58 lines not on this page · raw message

package/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch deleted +0 -47

47 lines not on this page · raw message

package/weston/0006-tests-add-missing-include.patch deleted +0 -36
deleted file mode 100644
index 67dc3df..0000000
@@ -1,36 +0,0 @@
-From 4c9e149d641a9945c3a8e15707b8712834f08c4f Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-Date: Sun, 22 Jan 2017 14:46:28 +0100
-Subject: [PATCH] tests: add missing include
-
-The int32_t type is defined in stdint.h.
-
-The musl C library is very conservative in the headers that it
-internally includes, and stdint.h is not included by any other header,
-unlike with glibc or uClibc, which breaks the build.
-
-Add the missing header.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
----
-Status: sent upstream
-    https://lists.freedesktop.org/archives/wayland-devel/2017-January/032771.html
----
- tests/string-test.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/string-test.c b/tests/string-test.c
-index a72ec30..5571b52 100644
---- a/tests/string-test.c
-+++ b/tests/string-test.c
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <stdbool.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <assert.h>
- 
- #include "shared/string-helpers.h"
--- 
-2.7.4
-
package/weston/weston.hash +2 -2
index c966864..85b4613 100644
@@ -1,2 +1,2 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031123.html
-sha256  ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033  weston-1.12.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2017-February/033231.html
+sha256  b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8  weston-2.0.0.tar.xz
package/weston/weston.mk +1 -3
index 9bd127c..a6d9faa 100644
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-WESTON_VERSION = 1.12.0
+WESTON_VERSION = 2.0.0
 WESTON_SITE = http://wayland.freedesktop.org/releases
 WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
-# configure.ac patched by 0003-configure-search-for-lib-with-clock_getres.patch
-WESTON_AUTORECONF = YES
 
 WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
 	libxkbcommon pixman libpng jpeg mtdev udev cairo libinput \
Signature · 1 line
2.10.2
#2 lore raw

PATCH 1/2 wayland: bump to version 1.13.0

In reply to Gustavo Zacarias

Hello,

Quoted 5 lines · Gustavo Zacarias
---
 package/wayland/wayland.hash | 4 ++--
 package/wayland/wayland.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Both applied to master, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 wayland: bump to version 1.13.0

In reply to Gustavo Zacarias

Hello,

Quoted 5 lines · Gustavo Zacarias
---
 package/wayland/wayland.hash | 4 ++--
 package/wayland/wayland.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

This causes some build failures:

http://autobuild.buildroot.net/results/291/291e0f1ea18004190ae5acd9bec147cacc3e4bda/build-end.log

The problem is that it tries to build one test written in C++, while wayland doesn't depend on C++ support. I guess the build of tests should be disabled.

Could you have a look?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#4 lore raw

PATCH 1/2 wayland: bump to version 1.13.0

Thomas, Gustavo, All,

On 2017-03-04 23:47 +0100, Thomas Petazzoni spake thusly:

Quoted 7 lines · Gustavo Zacarias
Quoted 5 lines
---
 package/wayland/wayland.hash | 4 ++--
 package/wayland/wayland.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Quoted 7 lines

This causes some build failures:

http://autobuild.buildroot.net/results/291/291e0f1ea18004190ae5acd9bec147cacc3e4bda/build-end.log

The problem is that it tries to build one test written in C++, while wayland doesn't depend on C++ support. I guess the build of tests should be disabled.

Patches posted:

    https://patchwork.ozlabs.org/patch/735422/
    https://patchwork.ozlabs.org/patch/735421/

Regards,
Yann E. MORIN.

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