diff options
author | Bastian Krause <bst@pengutronix.de> | 2021-08-03 11:11:54 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-08-05 14:47:32 +0200 |
commit | 2153c1d8519d4843cb8a698fe41d054572273b04 (patch) | |
tree | 4d4558ca2a0e3fb9074cd1885f0efa26e385c692 | |
parent | bfc11c34a9c550f3e891d1fd230c3a1bd4e996fa (diff) | |
download | ptxdist-2153c1d8519d4843cb8a698fe41d054572273b04.tar.gz ptxdist-2153c1d8519d4843cb8a698fe41d054572273b04.tar.xz |
wpebackend-fdo: version bump 1.8.2 -> 1.10.0
wpebackend-fdo dropped CMake support in version 1.9.1, switch to meson.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
Message-Id: <20210803091156.8630-2-bst@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/wpebackend-fdo.in | 3 | ||||
-rw-r--r-- | rules/wpebackend-fdo.make | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in index 423e8a0e1..0b355bb68 100644 --- a/rules/wpebackend-fdo.in +++ b/rules/wpebackend-fdo.in @@ -3,8 +3,7 @@ config WPEBACKEND_FDO tristate prompt "wpebackend-fdo" - select HOST_CMAKE - select HOST_NINJA + select HOST_MESON select LIBEPOXY select LIBWPE select GLIB diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make index 339f44320..614597d40 100644 --- a/rules/wpebackend-fdo.make +++ b/rules/wpebackend-fdo.make @@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_WPEBACKEND_FDO) += wpebackend-fdo # # Paths and names # -WPEBACKEND_FDO_VERSION := 1.8.2 +WPEBACKEND_FDO_VERSION := 1.10.0 WPEBACKEND_FDO_LIBRARY_VERSION := 1.0 -WPEBACKEND_FDO_MD5 := 93ca185b5c0f539abbf7ab32cfdc96b2 +WPEBACKEND_FDO_MD5 := 306adbb0c66dc753e1794c83b7a2682b WPEBACKEND_FDO := wpebackend-fdo-$(WPEBACKEND_FDO_VERSION) WPEBACKEND_FDO_SUFFIX := tar.xz WPEBACKEND_FDO_URL := https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX) @@ -30,13 +30,12 @@ WPEBACKEND_FDO_LICENSE_FILES := file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7 # ---------------------------------------------------------------------------- # -# cmake +# meson # -WPEBACKEND_FDO_CONF_TOOL := cmake +WPEBACKEND_FDO_CONF_TOOL := meson WPEBACKEND_FDO_CONF_OPT := \ - $(CROSS_CMAKE_USR) \ - -G Ninja \ - -DBUILD_DOCS=OFF + $(CROSS_MESON_USR) \ + -Dbuild_docs=false # ---------------------------------------------------------------------------- # Target-Install |