wayland: clean up recipe and remove not needed patch files
Cleaned code comes from older yocto versions (not needed anymore), and is causing a build failure when building the nativesdk package. Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera
parent
60e499f423
commit
b72a3425b1
|
|
@ -1,34 +0,0 @@
|
|||
From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001
|
||||
From: Joshua Watt <JPEWhacker@gmail.com>
|
||||
Date: Thu, 20 Feb 2020 15:20:45 -0600
|
||||
Subject: [PATCH] build: Fix strndup detection on MinGW
|
||||
|
||||
GCC and meson conspire together to incorrectly detect that strndup()
|
||||
exists on MinGW as __builtin_strndup, when no such function exists. As a
|
||||
work around, meson will skip looking for __builtin functions if an
|
||||
'#include' is in the prefix, so add '#include <string.h>' when looking
|
||||
for strndup().
|
||||
|
||||
See: https://github.com/mesonbuild/meson/issues/3672
|
||||
|
||||
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63]
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -36,11 +36,11 @@ have_funcs = [
|
||||
'posix_fallocate',
|
||||
'prctl',
|
||||
'memfd_create',
|
||||
- 'strndup',
|
||||
]
|
||||
foreach f: have_funcs
|
||||
config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
|
||||
endforeach
|
||||
+config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup'))
|
||||
|
||||
if get_option('libraries')
|
||||
ffi_dep = dependency('libffi')
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Beich <jbeich@FreeBSD.org>
|
||||
Date: Sat, 15 Feb 2020 02:03:45 +0000
|
||||
Subject: [PATCH] meson/tests: add missing dependencies on protocol headers
|
||||
|
||||
In file included from ../tests/connection-test.c:43:
|
||||
In file included from ../tests/test-compositor.h:30:
|
||||
../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found
|
||||
#include "wayland-client-protocol.h"
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
In file included from ../tests/display-test.c:45:
|
||||
In file included from ../src/wayland-server.h:104:
|
||||
src/wayland-server-protocol.h:4454:2: error: unterminated /* comment
|
||||
/**
|
||||
^
|
||||
In file included from ../tests/cpp-compile-test.cpp:2:
|
||||
In file included from src/wayland-server-protocol.h:8:
|
||||
In file included from ../src/wayland-server.h:104:
|
||||
src/wayland-server-protocol.h:3:2: error: unterminated conditional directive
|
||||
#ifndef WAYLAND_SERVER_PROTOCOL_H
|
||||
^
|
||||
../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h!
|
||||
#error including wayland-server-protocol.h did not include wayland-server.h!
|
||||
^
|
||||
In file included from ../tests/headers-protocol-test.c:26:
|
||||
In file included from src/wayland-client-protocol.h:8:
|
||||
In file included from ../src/wayland-client.h:40:
|
||||
src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive
|
||||
#ifndef WL_SHM_FORMAT_ENUM
|
||||
^
|
||||
In file included from ../tests/protocol-logger-test.c:34:
|
||||
In file included from ../src/wayland-client.h:40:
|
||||
src/wayland-client-protocol.h:2613:1: error: unterminated /* comment
|
||||
/**
|
||||
^
|
||||
../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface'
|
||||
res = wl_resource_create(client, &wl_seat_interface, 4, 0);
|
||||
^
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
tests/meson.build | 26 ++++++++++++++++++--------
|
||||
1 file changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/tests/meson.build b/tests/meson.build
|
||||
index c28a2a3..f1af7b4 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
@@ -69,7 +69,7 @@ test(
|
||||
executable(
|
||||
'cpp-compile-test',
|
||||
'cpp-compile-test.cpp',
|
||||
- wayland_server_protocol_core_h,
|
||||
+ wayland_server_protocol_h,
|
||||
include_directories: src_inc
|
||||
)
|
||||
)
|
||||
@@ -91,17 +91,25 @@ tests = {
|
||||
'array-test': [],
|
||||
'client-test': [ wayland_server_protocol_h ],
|
||||
'display-test': [
|
||||
+ wayland_client_protocol_h,
|
||||
+ wayland_server_protocol_h,
|
||||
tests_server_protocol_h,
|
||||
tests_client_protocol_c,
|
||||
tests_protocol_c,
|
||||
],
|
||||
- 'connection-test': [ wayland_server_protocol_h ],
|
||||
+ 'connection-test': [
|
||||
+ wayland_client_protocol_h,
|
||||
+ wayland_server_protocol_h,
|
||||
+ ],
|
||||
'event-loop-test': [ wayland_server_protocol_h ],
|
||||
'fixed-test': [],
|
||||
'interface-test': [ wayland_client_protocol_h ],
|
||||
'list-test': [],
|
||||
'map-test': [],
|
||||
- 'sanity-test' : [ wayland_server_protocol_h ],
|
||||
+ 'sanity-test' : [
|
||||
+ wayland_client_protocol_h,
|
||||
+ wayland_server_protocol_h,
|
||||
+ ],
|
||||
'socket-test': [
|
||||
wayland_client_protocol_h,
|
||||
wayland_server_protocol_h,
|
||||
@@ -116,7 +124,7 @@ tests = {
|
||||
files('../src/wayland-server.c'),
|
||||
wayland_server_protocol_h,
|
||||
],
|
||||
- 'resources-test': [ wayland_server_protocol_core_h ],
|
||||
+ 'resources-test': [ wayland_server_protocol_h ],
|
||||
'message-test': [
|
||||
wayland_client_protocol_h,
|
||||
wayland_server_protocol_h,
|
||||
@@ -126,14 +134,16 @@ tests = {
|
||||
wayland_server_protocol_h,
|
||||
],
|
||||
'protocol-logger-test': [
|
||||
- wayland_server_protocol_core_h,
|
||||
- wayland_client_protocol_core_h,
|
||||
+ wayland_client_protocol_h,
|
||||
+ wayland_server_protocol_h,
|
||||
],
|
||||
'headers-test': [
|
||||
+ wayland_client_protocol_h,
|
||||
+ wayland_server_protocol_h,
|
||||
'headers-protocol-test.c',
|
||||
- 'headers-protocol-core-test.c',
|
||||
- wayland_server_protocol_core_h,
|
||||
wayland_client_protocol_core_h,
|
||||
+ wayland_server_protocol_core_h,
|
||||
+ 'headers-protocol-core-test.c',
|
||||
],
|
||||
'os-wrappers-test': [],
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 17 Feb 2020 21:46:18 +0100
|
||||
Subject: [PATCH] Do not hardcode the path to wayland-scanner
|
||||
|
||||
This results in host contamination during builds.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
src/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 294aee0..7e410fa 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -49,7 +49,7 @@ pkgconfig.generate(
|
||||
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
|
||||
'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
|
||||
'bindir=' + join_paths('${prefix}', get_option('bindir')),
|
||||
- 'wayland_scanner=${bindir}/wayland-scanner'
|
||||
+ 'wayland_scanner=wayland-scanner'
|
||||
],
|
||||
filebase: 'wayland-scanner'
|
||||
)
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sun, 16 Feb 2020 16:29:53 +0100
|
||||
Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
|
||||
|
||||
Otherwise, meson attempts to use the target pkg-config and fails.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
src/meson.build | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 3e8c9bf..294aee0 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -55,8 +55,7 @@ pkgconfig.generate(
|
||||
)
|
||||
|
||||
if meson.is_cross_build()
|
||||
- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
|
||||
- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
|
||||
+ wayland_scanner_for_build = find_program('wayland-scanner')
|
||||
else
|
||||
wayland_scanner_for_build = wayland_scanner
|
||||
endif
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
export WAYLAND_SCANNER=wayland-scanner
|
||||
export TEST_DATA_DIR=tests/data
|
||||
export TEST_OUTPUT_DIR=tests/output
|
||||
export SED=sed
|
||||
export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1
|
||||
export NM=nm
|
||||
|
||||
for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do
|
||||
$i
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "PASS: $i"
|
||||
else
|
||||
echo "FAIL: $i"
|
||||
fi
|
||||
done
|
||||
|
|
@ -1,16 +1,4 @@
|
|||
# Copyright (C) 2020-2022, Digi International Inc.
|
||||
|
||||
FILES:${PN}:class-nativesdk = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
|
||||
${sysconfdir} ${sharedstatedir} ${localstatedir} \
|
||||
${base_bindir}/* ${base_sbindir}/* \
|
||||
${base_libdir}/*${SOLIBS} \
|
||||
${base_prefix}/lib/udev ${prefix}/lib/udev \
|
||||
${base_libdir}/udev ${libdir}/udev \
|
||||
${datadir}/${BPN} ${libdir}/${BPN}/* \
|
||||
${datadir}/pixmaps ${datadir}/applications \
|
||||
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
|
||||
${libdir}/bonobo/servers"
|
||||
FILES:${PN}-dev:remove:class-nativesdk = "${bindir} ${datadir}/wayland"
|
||||
# Copyright (C) 2020-2023, Digi International Inc.
|
||||
|
||||
FILES_SOLIBSDEV = " \
|
||||
${base_libdir}/lib*${SOLIBSDEV} \
|
||||
|
|
|
|||
Loading…
Reference in New Issue