libwpe will switch from cmake to meson in a future release, so switch to meson now. Signed-off-by: Bastian Krause <bst@pengutronix.de> --- rules/libwpe.in | 3 +-- 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 -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
wpebackend-fdo dropped CMake support in version 1.9.1, switch to meson. Signed-off-by: Bastian Krause <bst@pengutronix.de> --- rules/wpebackend-fdo.in | 3 +-- 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 -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Signed-off-by: Bastian Krause <bst@pengutronix.de> --- rules/wpewebkit.in | 1 + rules/wpewebkit.make | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in index 1235e2502..084874067 100644 --- a/rules/wpewebkit.in +++ b/rules/wpewebkit.in @@ -37,6 +37,7 @@ menuconfig WPEWEBKIT select MESALIB_GLES2 select LIBEPOXY select LIBGCRYPT + select LIBTASN1 select GSTREAMER1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO select GST_PLUGINS_BASE1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO select GST_PLUGINS_BASE1_APP if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make index 141d83a71..26d2c0e08 100644 --- a/rules/wpewebkit.make +++ b/rules/wpewebkit.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit # # Paths and names # -WPEWEBKIT_VERSION := 2.30.6 -WPEWEBKIT_MD5 := e35b31932ad3da6c06736d8f2d347072 +WPEWEBKIT_VERSION := 2.32.3 +WPEWEBKIT_MD5 := 1e34412c50fe8d1ff084738477ecad7e WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION) WPEWEBKIT_SUFFIX := tar.xz WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX) @@ -37,13 +37,11 @@ WPEWEBKIT_CONF_OPT := \ -DCMAKE_BUILD_TYPE=Release \ -DANALYZERS=OFF \ -DDEBUG_FISSION=OFF \ - -DENABLE_ACCELERATED_2D_CANVAS=OFF \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_ENCRYPTED_MEDIA=OFF \ -DENABLE_GTKDOC=OFF\ -DENABLE_MEDIA_SOURCE=ON \ - -DENABLE_SHAREABLE_RESOURCE=ON \ -DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \ -DENABLE_WEBDRIVER=ON \ -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \ @@ -55,7 +53,9 @@ WPEWEBKIT_CONF_OPT := \ -DSHOULD_INSTALL_JS_SHELL=OFF \ -DSHOW_BINDINGS_GENERATION_PROGRESS=ON \ -DUSE_LD_GOLD=OFF \ + -DUSE_APPLE_ICU=OFF \ -DUSE_OPENJPEG=OFF \ + -DUSE_SOUP2=ON \ -DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \ -DUSE_THIN_ARCHIVES=ON \ -DUSE_WOFF2=OFF \ -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Signed-off-by: Bastian Krause <bst@pengutronix.de> --- rules/cog.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/cog.make b/rules/cog.make index 3fd9f929a..a59f5a114 100644 --- a/rules/cog.make +++ b/rules/cog.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog # # Paths and names # -COG_VERSION := 0.8.1 -COG_MD5 := 21664fb04c9149dea6d68e13e6074276 +COG_VERSION := 0.10.0 +COG_MD5 := 1b0407b6163a3a01afdfc0fb454a7570 COG := cog-$(COG_VERSION) COG_SUFFIX := tar.xz COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as bfc11c34a9c550f3e891d1fd230c3a1bd4e996fa.
Michael
[sent from post-receive hook]
On Fri, 06 Aug 2021 08:44:49 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> 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>
>
> diff --git a/rules/libwpe.in b/rules/libwpe.in
> index 6b566d06a5c9..53c317b6745c 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 5c6fb9054ab5..ef18468c4950 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 2153c1d8519d4843cb8a698fe41d054572273b04.
Michael
[sent from post-receive hook]
On Fri, 06 Aug 2021 08:44:50 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> 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>
>
> diff --git a/rules/wpebackend-fdo.in b/rules/wpebackend-fdo.in
> index 423e8a0e1e57..0b355bb68ef7 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 339f44320869..614597d40844 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as b030b380bb6e8b5e7c7bb41e6fcec489988602ac.
Michael
[sent from post-receive hook]
On Fri, 06 Aug 2021 08:44:51 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20210803091156.8630-3-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
> index 1235e2502047..084874067aba 100644
> --- a/rules/wpewebkit.in
> +++ b/rules/wpewebkit.in
> @@ -37,6 +37,7 @@ menuconfig WPEWEBKIT
> select MESALIB_GLES2
> select LIBEPOXY
> select LIBGCRYPT
> + select LIBTASN1
> select GSTREAMER1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1 if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> select GST_PLUGINS_BASE1_APP if WPEWEBKIT_VIDEO || WPEWEBKIT_AUDIO
> diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
> index 141d83a71085..26d2c0e086fb 100644
> --- a/rules/wpewebkit.make
> +++ b/rules/wpewebkit.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
> #
> # Paths and names
> #
> -WPEWEBKIT_VERSION := 2.30.6
> -WPEWEBKIT_MD5 := e35b31932ad3da6c06736d8f2d347072
> +WPEWEBKIT_VERSION := 2.32.3
> +WPEWEBKIT_MD5 := 1e34412c50fe8d1ff084738477ecad7e
> WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION)
> WPEWEBKIT_SUFFIX := tar.xz
> WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
> @@ -37,13 +37,11 @@ WPEWEBKIT_CONF_OPT := \
> -DCMAKE_BUILD_TYPE=Release \
> -DANALYZERS=OFF \
> -DDEBUG_FISSION=OFF \
> - -DENABLE_ACCELERATED_2D_CANVAS=OFF \
> -DENABLE_ACCESSIBILITY=OFF \
> -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
> -DENABLE_ENCRYPTED_MEDIA=OFF \
> -DENABLE_GTKDOC=OFF\
> -DENABLE_MEDIA_SOURCE=ON \
> - -DENABLE_SHAREABLE_RESOURCE=ON \
> -DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
> -DENABLE_WEBDRIVER=ON \
> -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \
> @@ -55,7 +53,9 @@ WPEWEBKIT_CONF_OPT := \
> -DSHOULD_INSTALL_JS_SHELL=OFF \
> -DSHOW_BINDINGS_GENERATION_PROGRESS=ON \
> -DUSE_LD_GOLD=OFF \
> + -DUSE_APPLE_ICU=OFF \
> -DUSE_OPENJPEG=OFF \
> + -DUSE_SOUP2=ON \
> -DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \
> -DUSE_THIN_ARCHIVES=ON \
> -DUSE_WOFF2=OFF \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 93e780b5baf52c3880ef1708bb3211038e502ed3.
Michael
[sent from post-receive hook]
On Fri, 06 Aug 2021 08:44:52 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20210803091156.8630-4-bst@pengutronix.de>
> [mol: remove applied patch]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch b/patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch
> deleted file mode 100644
> index 9f2a1900981f..000000000000
> --- a/patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From: Bastian Krause <bst@pengutronix.de>
> -Date: Wed, 14 Apr 2021 17:36:24 +0200
> -Subject: [PATCH] CMake: install D-Bus policy configuration to
> - CMAKE_INSTALL_DATADIR
> -
> -The D-BUS system bus policy config should reside in
> -CMAKE_INSTALL_DATADIR rather than in CMAKE_INSTALL_SYSCONFDIR.
> -
> -See:
> -
> - https://gitlab.freedesktop.org/dbus/dbus/-/blob/ef55a3db0d8f17848f8a579092fb05900cc076f5/bus/CMakeLists.txt#L117
> -
> -Forwarded: https://github.com/Igalia/cog/pull/296
> -Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ----
> - CMakeLists.txt | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index cb51087359fc..2fcd63845212 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -157,7 +157,7 @@ if (COG_DBUS_SYSTEM_BUS)
> - configure_file(dbus/policy.conf.in ${COG_DEFAULT_APPID}.conf @ONLY)
> - install(
> - FILES ${CMAKE_CURRENT_BINARY_DIR}/${COG_DEFAULT_APPID}.conf
> -- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
> -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d
> - COMPONENT "runtime"
> - )
> -
> diff --git a/patches/cog-0.8.1/series b/patches/cog-0.8.1/series
> deleted file mode 100644
> index 14639312eb47..000000000000
> --- a/patches/cog-0.8.1/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch
> -# a7cfa1be71dd856d687d8a3863e5a56f - git-ptx-patches magic
> diff --git a/rules/cog.make b/rules/cog.make
> index 3fd9f929a83f..a59f5a11450b 100644
> --- a/rules/cog.make
> +++ b/rules/cog.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
> #
> # Paths and names
> #
> -COG_VERSION := 0.8.1
> -COG_MD5 := 21664fb04c9149dea6d68e13e6074276
> +COG_VERSION := 0.10.0
> +COG_MD5 := 1b0407b6163a3a01afdfc0fb454a7570
> COG := cog-$(COG_VERSION)
> COG_SUFFIX := tar.xz
> COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de