NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libwpe: switch over to Meson

Browse Source 
The CMake based build system will be eventually removed by upstream
so it seems like a good idea to switch over to Meson already before
that happens.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adrian Perez de Castro 2020-09-16 01:30:49 +03:00 committed by Thomas Petazzoni
parent 0e8686be9f
commit edb505b78f
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
package/libwpe/0001-meson-Use-a-partial-dependency-to-pass-EGL-module-fl.patch Normal file
View File

@ -0,0 +1,45 @@
From 81bfedfa02fd864f3e4b295091d49c3eb20bb372 Mon Sep 17 00:00:00 2001
From: Adrian Perez de Castro <aperez@igalia.com>
Date: Wed, 16 Sep 2020 00:01:37 +0300
Subject: [PATCH] meson: Use a partial dependency to pass EGL module flags
Make Meson try to always find an "egl" dependency, if found extract
the include directories and compiler flags from ir using a partial
dependency, otherwise check that at least EGL/eglplatform.h is
available when the pkg-config module is not found.
Fixes #70
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
[Upstrem status: https://github.com/WebPlatformForEmbedded/libwpe/pull/71]
---
meson.build | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 5c88aed..a05f4ab 100644
--- a/meson.build
+++ b/meson.build
@@ -57,8 +57,16 @@ dependencies = [
]
cc = meson.get_compiler('c')
-if not cc.has_header('EGL/eglplatform.h')
- dependencies += dependency('egl')
+egl_dep = dependency('egl', required: false)
+if egl_dep.found()
+ dependencies += egl_dep.partial_dependency(
+ compile_args: true,
+ includes: true,
+ )
+else
+ assert(cc.has_header('EGL/eglplatform.h'),
+ 'Required heaer <EGL/eglplatform.h> not found'
+ )
endif
if not cc.has_function('dlopen')
--
2.28.0

10
package/libwpe/libwpe.mk
View File

@ -12,11 +12,13 @@ LIBWPE_LICENSE = BSD-2-Clause
LIBWPE_LICENSE_FILES = COPYING
LIBWPE_DEPENDENCIES = libegl libxkbcommon
LIBWPE_CFLAGS = $(TARGET_CFLAGS)
LIBWPE_CXXFLAGS = $(TARGET_CXXFLAGS)
# Workaround for https://github.com/raspberrypi/userland/issues/316
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
LIBWPE_CONF_OPTS += \
-DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \
-DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE'
LIBWPE_CFLAGS += -D_GNU_SOURCE
LIBWPE_CXXFLAGS += -D_GNU_SOURCE
endif
$(eval $(cmake-package))
$(eval $(meson-package))