[Buildroot] [PATCH 1/6] package/wayland: bump to version 1.19.0

Adrian Perez de Castro aperez at igalia.com
Tue May 18 12:13:40 UTC 2021


Hi Yann, all,

On Sun, 16 May 2021 16:04:14 +0200 "Yann E. MORIN" <yann.morin.1998 at free.fr> wrote:
> Adrian, All,
> 
> On 2021-05-13 19:33 +0300, Adrian Perez de Castro spake thusly:
> > Update wayland to version 1.19.0, which mostly includes bug fixes and is
> > the minimum version required by wlroots 0.13.0
> > 
> > Patch "0001-build-add-option-to-disable-tests.patch" is updated to apply
> > cleanly on top of the new release.
> > 
> > Patch "0002-meson-do-not-check-for-c.patch" is replaced by a newer one,
> > "0002-meson-only-require-cpp-for-tests.patch" which was accepted by
> > upstream as an improved version of it.
> > 
> > Signed-off-by: Adrian Perez de Castro <aperez at igalia.com>
> 
> Applied to next, with the following changes:
> 
>   - do actual backports of upstream patches now they've been merged
>   - consequently, drop the legacy autostuff hunks from first patch
> 
> Thanks!

\o/

Given that this went into “next”, I'll update the patch set and rebase it
on top of “next” for resubmission :)

Thanks for the review!
-Adrian

> > ---
> >  ...01-build-add-option-to-disable-tests.patch | 25 ++++----
> >  .../0002-meson-do-not-check-for-c.patch       | 29 ----------
> >  ...002-meson-only-require-cpp-for-tests.patch | 57 +++++++++++++++++++
> >  package/wayland/wayland.hash                  |  8 +--
> >  package/wayland/wayland.mk                    |  2 +-
> >  5 files changed, 74 insertions(+), 47 deletions(-)
> >  delete mode 100644 package/wayland/0002-meson-do-not-check-for-c.patch
> >  create mode 100644 package/wayland/0002-meson-only-require-cpp-for-tests.patch
> > 
> > diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch
> > index 6ab695e909..7b1fbeb871 100644
> > --- a/package/wayland/0001-build-add-option-to-disable-tests.patch
> > +++ b/package/wayland/0001-build-add-option-to-disable-tests.patch
> > @@ -1,4 +1,4 @@
> > -From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001
> > +From 4bbac166f50e962d2c79f9824db4af3174f69f43 Mon Sep 17 00:00:00 2001
> >  From: James Hilliard <james.hilliard1 at gmail.com>
> >  Date: Tue, 3 Mar 2020 15:27:51 -0700
> >  Subject: [PATCH] build: add option to disable tests
> > @@ -15,6 +15,7 @@ Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
> >  Signed-off-by: James Hilliard <james.hilliard1 at gmail.com>
> >  [Upstream status:
> >  https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
> > +Signed-off-by: Adrian Perez de Castro <aperez at igalia.com>
> >  ---
> >   Makefile.am       | 2 ++
> >   configure.ac      | 9 +++++++++
> > @@ -23,7 +24,7 @@ https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
> >   4 files changed, 18 insertions(+), 1 deletion(-)
> >  
> >  diff --git a/Makefile.am b/Makefile.am
> > -index cc87392..d5d43e3 100644
> > +index b9438b7..6e188de 100644
> >  --- a/Makefile.am
> >  +++ b/Makefile.am
> >  @@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
> > @@ -43,7 +44,7 @@ index cc87392..d5d43e3 100644
> >   EXTRA_DIST += tests/scanner-test.sh			\
> >   	protocol/tests.xml				\
> >  diff --git a/configure.ac b/configure.ac
> > -index dda5e48..99b7c96 100644
> > +index 7f2f393..cdff720 100644
> >  --- a/configure.ac
> >  +++ b/configure.ac
> >  @@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries],
> > @@ -70,10 +71,10 @@ index dda5e48..99b7c96 100644
> >   		     [  ICONDIR=$withval],
> >   		     [  ICONDIR=${datadir}/icons])
> >  diff --git a/meson.build b/meson.build
> > -index 5632f4e..b37bb7a 100644
> > +index 11c35fa..26d69ad 100644
> >  --- a/meson.build
> >  +++ b/meson.build
> > -@@ -83,7 +83,9 @@ subdir('src')
> > +@@ -91,7 +91,9 @@ subdir('src')
> >   if get_option('libraries')
> >   	subdir('cursor')
> >   	subdir('egl')
> > @@ -81,15 +82,15 @@ index 5632f4e..b37bb7a 100644
> >  +	if get_option('tests')
> >  +		subdir('tests')
> >  +	endif
> > - endif
> > - 
> > - if get_option('documentation')
> > + 	if get_option('documentation')
> > + 		subdir('doc')
> > + 	endif
> >  diff --git a/meson_options.txt b/meson_options.txt
> > -index 76314f7..ab4be92 100644
> > +index de588d1..4433fa0 100644
> >  --- a/meson_options.txt
> >  +++ b/meson_options.txt
> > -@@ -2,6 +2,10 @@ option('libraries',
> > -   description: 'Compile Wayland libraries',
> > +@@ -6,6 +6,10 @@ option('scanner',
> > +   description: 'Compile wayland-scanner binary',
> >     type: 'boolean',
> >     value: 'true')
> >  +option('tests',
> > @@ -100,5 +101,5 @@ index 76314f7..ab4be92 100644
> >     description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
> >     type: 'boolean',
> >  -- 
> > -2.20.1
> > +2.31.1
> >  
> > diff --git a/package/wayland/0002-meson-do-not-check-for-c.patch b/package/wayland/0002-meson-do-not-check-for-c.patch
> > deleted file mode 100644
> > index c5819bf477..0000000000
> > --- a/package/wayland/0002-meson-do-not-check-for-c.patch
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001
> > -From: Bernd Kuhls <bernd.kuhls at t-online.de>
> > -Date: Wed, 29 Jul 2020 08:20:41 +0200
> > -Subject: [PATCH] meson: do not check for c++
> > -
> > -Wayland does not need c++, fixes building with toolchains lacking c++.
> > -
> > -Backported from upstream PR:
> > -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88
> > -
> > -Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
> > ----
> > - meson.build | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/meson.build b/meson.build
> > -index b67b101..e47a52d 100644
> > ---- a/meson.build
> > -+++ b/meson.build
> > -@@ -1,5 +1,5 @@
> > - project(
> > --	'wayland', 'c', 'cpp',
> > -+	'wayland', 'c',
> > - 	version: '1.18.0',
> > - 	license: 'MIT',
> > - 	meson_version: '>= 0.47.0',
> > --- 
> > -2.27.0
> > -
> > diff --git a/package/wayland/0002-meson-only-require-cpp-for-tests.patch b/package/wayland/0002-meson-only-require-cpp-for-tests.patch
> > new file mode 100644
> > index 0000000000..bc1af23f22
> > --- /dev/null
> > +++ b/package/wayland/0002-meson-only-require-cpp-for-tests.patch
> > @@ -0,0 +1,57 @@
> > +From 7672edbd84313d536a8ff4aa8a6855fcb46ce378 Mon Sep 17 00:00:00 2001
> > +From: James Hilliard <james.hilliard1 at gmail.com>
> > +Date: Fri, 16 Apr 2021 02:32:38 -0600
> > +Subject: [PATCH] meson: only require cpp for tests
> > +
> > +Signed-off-by: James Hilliard <james.hilliard1 at gmail.com>
> > +[Upstream status:
> > +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130]
> > +Signed-off-by: Adrian Perez de Castro <aperez at igalia.com>
> > +---
> > + meson.build       |  2 +-
> > + tests/meson.build | 16 +++++++++-------
> > + 2 files changed, 10 insertions(+), 8 deletions(-)
> > +
> > +diff --git a/meson.build b/meson.build
> > +index 26d69ad..2c96d20 100644
> > +--- a/meson.build
> > ++++ b/meson.build
> > +@@ -1,5 +1,5 @@
> > + project(
> > +-	'wayland', 'c', 'cpp',
> > ++	'wayland', 'c',
> > + 	version: '1.19.0',
> > + 	license: 'MIT',
> > + 	meson_version: '>= 0.52.1',
> > +diff --git a/tests/meson.build b/tests/meson.build
> > +index a32ac50..2e11af4 100644
> > +--- a/tests/meson.build
> > ++++ b/tests/meson.build
> > +@@ -64,15 +64,17 @@ executable(
> > + 	dependencies: test_runner_dep
> > + )
> > + 
> > +-test(
> > +-	'cpp-compile-test',
> > +-	executable(
> > ++if add_languages('cpp')
> > ++	test(
> > + 		'cpp-compile-test',
> > +-		'cpp-compile-test.cpp',
> > +-		wayland_server_protocol_h,
> > +-		include_directories: src_inc
> > ++		executable(
> > ++			'cpp-compile-test',
> > ++			'cpp-compile-test.cpp',
> > ++			wayland_server_protocol_h,
> > ++			include_directories: src_inc
> > ++		)
> > + 	)
> > +-)
> > ++endif
> > + 
> > + sed_path = find_program('sed').path()
> > + 
> > +-- 
> > +2.31.1
> > +
> > diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash
> > index abd8bcdf29..e9dcb63a90 100644
> > --- a/package/wayland/wayland.hash
> > +++ b/package/wayland/wayland.hash
> > @@ -1,8 +1,6 @@
> > -# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
> > -md5  23317697b6e3ff2e1ac8c5ba3ed57b65  wayland-1.18.0.tar.xz
> > -sha1  33e5292b32a115e829458ea627201ed1e4ad4f45  wayland-1.18.0.tar.xz
> > -sha256  4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d  wayland-1.18.0.tar.xz
> > -sha512  e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc  wayland-1.18.0.tar.xz
> > +# From https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html
> > +sha256  baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15  wayland-1.19.0.tar.xz
> > +sha512  d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef  wayland-1.19.0.tar.xz
> >  
> >  # Locally calculated
> >  sha256  6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061  COPYING
> > diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
> > index 6cb4a50dbb..ecfe95d68a 100644
> > --- a/package/wayland/wayland.mk
> > +++ b/package/wayland/wayland.mk
> > @@ -4,7 +4,7 @@
> >  #
> >  ################################################################################
> >  
> > -WAYLAND_VERSION = 1.18.0
> > +WAYLAND_VERSION = 1.19.0
> >  WAYLAND_SITE = https://wayland.freedesktop.org/releases
> >  WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
> >  WAYLAND_LICENSE = MIT
> > -- 
> > 2.31.1
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> 
> -- 
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210518/1f3412c5/attachment-0002.asc>


More information about the buildroot mailing list