package/wayland: bump to version 1.21.0
upgrade wayland to 1.21.0 for IMG DDK 1.19 and copy patches from IMG DDK 1.19 Signed-off-by: Andy Hu <andy.hu@starfivetech.com>
This commit is contained in:
Andy Hu
@@ -1,58 +0,0 @@
|
||||
From 88f1605a826ca0c2ff02be6f4cf9ecabf68e8341 Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Tue, 3 Mar 2020 15:27:51 -0700
|
||||
Subject: [PATCH] build: add option to disable tests
|
||||
|
||||
When building for a product, tests are not needed.
|
||||
|
||||
Besides, one test requires a C++ compiler, which is not always
|
||||
available.
|
||||
|
||||
So, add an option to configure to disable building tests altogether.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
|
||||
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
||||
[yann.morin.1998@free.fr: backport from upstream]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
meson.build | 4 +++-
|
||||
meson_options.txt | 4 ++++
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index cdb66bc..714a86d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -84,7 +84,9 @@ subdir('src')
|
||||
if get_option('libraries')
|
||||
subdir('cursor')
|
||||
subdir('egl')
|
||||
- subdir('tests')
|
||||
+ if get_option('tests')
|
||||
+ subdir('tests')
|
||||
+ endif
|
||||
if get_option('documentation')
|
||||
subdir('doc')
|
||||
endif
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index de588d1..4433fa0 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -6,6 +6,10 @@ option('scanner',
|
||||
description: 'Compile wayland-scanner binary',
|
||||
type: 'boolean',
|
||||
value: 'true')
|
||||
+option('tests',
|
||||
+ description: 'Compile Wayland tests',
|
||||
+ type: 'boolean',
|
||||
+ value: 'true')
|
||||
option('documentation',
|
||||
description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
|
||||
type: 'boolean',
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From d58695c5a49e3279cd45037b3219c1387c91868c Mon Sep 17 00:00:00 2001
|
||||
From: Brendan King <Brendan.King@imgtec.com>
|
||||
Date: Wed, 18 May 2022 12:14:56 +0100
|
||||
Subject: [PATCH] build: the wayland scanner is not always required
|
||||
|
||||
The Wayland Scanner is only needed if the libraries or tests are
|
||||
being built.
|
||||
|
||||
In the IMG DDK build system, Wayland is built twice, once for the build
|
||||
machine, and once for the host. The build machine version only builds
|
||||
the Wayland Scanner which is used to build the host version. Both builds
|
||||
use a cross build definition file, and so are cross builds.
|
||||
|
||||
Without this change, it is not possible to build Wayland Scanner for the
|
||||
build machine, unless a Wayland Scanner is already installed.
|
||||
|
||||
The indentation within the new "if" block hasn't been altered to minimise
|
||||
the diff.
|
||||
---
|
||||
src/meson.build | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index a8a1d2b..ed35ea9 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -77,12 +77,14 @@ if get_option('scanner')
|
||||
endif
|
||||
endif
|
||||
|
||||
+if get_option('libraries') or get_option('tests')
|
||||
if meson.is_cross_build() or not get_option('scanner')
|
||||
scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
|
||||
wayland_scanner_for_build = find_program(scanner_dep.get_variable(pkgconfig: 'wayland_scanner'))
|
||||
else
|
||||
wayland_scanner_for_build = wayland_scanner
|
||||
endif
|
||||
+endif
|
||||
|
||||
if get_option('libraries')
|
||||
# wayland libraries
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
From 4c2105312379b62dc84f6eaaf26e2ab293d51b92 Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@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@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130]
|
||||
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
||||
[yann.morin.1998@free.fr: backport from upstream]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
meson.build | 2 +-
|
||||
tests/meson.build | 16 +++++++++-------
|
||||
2 files changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 12b4641..cdb66bc 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
|
||||
|
||||
Regular → Executable
+3
-3
@@ -1,6 +1,6 @@
|
||||
# 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
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2022-June/042268.html
|
||||
sha256 6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac wayland-1.21.0.tar.xz
|
||||
sha512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3 wayland-1.21.0.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING
|
||||
|
||||
Regular → Executable
+2
-2
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WAYLAND_VERSION = 1.19.0
|
||||
WAYLAND_SITE = https://wayland.freedesktop.org/releases
|
||||
WAYLAND_VERSION = 1.21.0
|
||||
WAYLAND_SITE = https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(WAYLAND_VERSION)/downloads
|
||||
WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
|
||||
WAYLAND_LICENSE = MIT
|
||||
WAYLAND_LICENSE_FILES = COPYING
|
||||
|
||||
Reference in New Issue
Block a user