diff options
| author | Bastian Krause <bst@pengutronix.de> | 2021-08-03 11:11:53 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-08-05 14:47:32 +0200 |
| commit | bfc11c34a9c550f3e891d1fd230c3a1bd4e996fa (patch) | |
| tree | 034001de3246dcd861e573a6a6ef20250e5eacff | |
| parent | 54299be8f2e3020cc5747824be3cd48a9b879f86 (diff) | |
| download | ptxdist-bfc11c34a9c550f3e891d1fd230c3a1bd4e996fa.tar.gz ptxdist-bfc11c34a9c550f3e891d1fd230c3a1bd4e996fa.tar.xz | |
libwpe: version bump 1.8.0 -> 1.10.1
libwpe will switch from cmake to meson in a future release, so switch to
meson now.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
Message-Id: <20210803091156.8630-1-bst@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/libwpe.in | 3 | ||||
| -rw-r--r-- | rules/libwpe.make | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/rules/libwpe.in b/rules/libwpe.in index 6b566d06a..53c317b67 100644 --- a/rules/libwpe.in +++ b/rules/libwpe.in @@ -3,8 +3,7 @@ config LIBWPE tristate prompt "libwpe" - select HOST_CMAKE - select HOST_NINJA + select HOST_MESON select MESALIB select MESALIB_EGL select LIBXKBCOMMON diff --git a/rules/libwpe.make b/rules/libwpe.make index 5c6fb9054..ef18468c4 100644 --- a/rules/libwpe.make +++ b/rules/libwpe.make @@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_LIBWPE) += libwpe # # Paths and names # -LIBWPE_VERSION := 1.8.0 +LIBWPE_VERSION := 1.10.1 LIBWPE_LIBRARY_VERSION := 1.0 -LIBWPE_MD5 := 328ea59dd8dee9107a49353536d00844 +LIBWPE_MD5 := f60fc13b519a66d262afb76c77441870 LIBWPE := libwpe-$(LIBWPE_VERSION) LIBWPE_SUFFIX := tar.xz LIBWPE_URL := https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX) @@ -32,12 +32,11 @@ LIBWPE_LICENSE_FILES := file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc # # cmake # -LIBWPE_CONF_TOOL := cmake +LIBWPE_CONF_TOOL := meson LIBWPE_CONF_OPT := \ - $(CROSS_CMAKE_USR) \ - -G Ninja \ - -DBUILD_DOCS=OFF \ - -DWPE_BACKEND= \ + $(CROSS_MESON_USR) \ + -Dbuild-docs=false \ + -Ddefault-backend= # ---------------------------------------------------------------------------- # Target-Install |