* [ptxdist] [PATCH] cog: version bump 0.14.1 -> 0.16
@ 2022-09-27 13:55 Bastian Krause
2022-10-07 7:38 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Bastian Krause @ 2022-09-27 13:55 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
- cog 0.16 switches the build system from CMake to Meson
- building without D-Bus is no longer possible
- allow install of cogctl for D-Bus user bus
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/cog.in | 6 ++----
rules/cog.make | 37 ++++++++++++++++---------------------
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/rules/cog.in b/rules/cog.in
index 81313c636..47651073b 100644
--- a/rules/cog.in
+++ b/rules/cog.in
@@ -3,12 +3,11 @@
menuconfig COG
tristate
prompt "cog "
- select HOST_CMAKE
- select HOST_NINJA
+ select HOST_MESON
+ select DBUS
select WAYLAND_PROTOCOLS
select WPEWEBKIT
select WPEBACKEND_FDO
- select DBUS if COG_REMOTE_DBUS_SYSTEM_BUS
help
Cog launcher and webapp container.
@@ -20,7 +19,6 @@ config COG_REMOTE_DBUS_SYSTEM_BUS
config COG_COGCTL
bool
- select COG_REMOTE_DBUS_SYSTEM_BUS
prompt "Install cogctl"
endif
diff --git a/rules/cog.make b/rules/cog.make
index 43c661344..e8be1f709 100644
--- a/rules/cog.make
+++ b/rules/cog.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
#
# Paths and names
#
-COG_VERSION := 0.14.1
-COG_MD5 := 69d72ac046a0fc485ea7b61b96e7e7fc
+COG_VERSION := 0.16.0
+COG_MD5 := 2705472ea4f333290973722c0862b21d
COG := cog-$(COG_VERSION)
COG_SUFFIX := tar.xz
COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
@@ -31,26 +31,21 @@ COG_LICENSE_FILES := file://COPYING;md5=bf1229cd7425b302d60cdb641b0ce5fb
#
# cmake
#
-COG_CONF_TOOL := cmake
+COG_CONF_TOOL := meson
COG_CONF_OPT := \
- $(CROSS_CMAKE_USR) \
- -G Ninja \
- -DBUILD_DOCS=OFF \
- -DCOG_APPID= \
- -DCOG_BUILD_PROGRAMS=ON \
- -DCOG_DBUS_OWN_USER= \
- -DCOG_DBUS_SYSTEM_BUS=$(call ptx/onoff,PTXCONF_COG_REMOTE_DBUS_SYSTEM_BUS) \
- -DCOG_HOME_URI=https://ptxdist.org/ \
- -DCOG_MODULEDIR=/usr/lib/cog/modules \
- -DCOG_PLATFORM_DRM=OFF \
- -DCOG_PLATFORM_GTK4=OFF \
- -DCOG_PLATFORM_HEADLESS=OFF \
- -DCOG_PLATFORM_WL=ON \
- -DCOG_PLATFORM_X11=OFF \
- -DCOG_WESTON_DIRECT_DISPLAY=OFF \
- -DINSTALL_MAN_PAGES=OFF \
- -DUSE_SOUP2=ON \
- -DWAYLAND_PROTOCOLS=$(PTXDIST_SYSROOT_TARGET)/usr/share/wayland-protocols
+ $(CROSS_MESON_USR) \
+ -Dcog_appid=com.igalia.Cog \
+ -Dcog_dbus_control=$(call ptx/ifdef, PTXCONF_COG_REMOTE_DBUS_SYSTEM_BUS,system,user) \
+ -Dcog_dbus_system_owner= \
+ -Dcog_home_uri=https://ptxdist.org/ \
+ -Ddocumentation=false \
+ -Dmanpages=false \
+ -Dplatforms=wayland \
+ -Dplugin_path=/usr/lib/cog/modules \
+ -Dprograms=true \
+ -Dsoup2=enabled \
+ -Dwayland_weston_content_protection=false \
+ -Dwayland_weston_direct_display=false
# ----------------------------------------------------------------------------
# Target-Install
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] cog: version bump 0.14.1 -> 0.16
2022-09-27 13:55 [ptxdist] [PATCH] cog: version bump 0.14.1 -> 0.16 Bastian Krause
@ 2022-10-07 7:38 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-10-07 7:38 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as eae4fb16ff5456c16a6f5683ed4fd0474c07b6de.
Michael
[sent from post-receive hook]
On Fri, 07 Oct 2022 09:38:47 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> - cog 0.16 switches the build system from CMake to Meson
> - building without D-Bus is no longer possible
> - allow install of cogctl for D-Bus user bus
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220927135505.3974831-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/cog.in b/rules/cog.in
> index 81313c636dba..47651073bdc7 100644
> --- a/rules/cog.in
> +++ b/rules/cog.in
> @@ -3,12 +3,11 @@
> menuconfig COG
> tristate
> prompt "cog "
> - select HOST_CMAKE
> - select HOST_NINJA
> + select HOST_MESON
> + select DBUS
> select WAYLAND_PROTOCOLS
> select WPEWEBKIT
> select WPEBACKEND_FDO
> - select DBUS if COG_REMOTE_DBUS_SYSTEM_BUS
> help
> Cog launcher and webapp container.
>
> @@ -20,7 +19,6 @@ config COG_REMOTE_DBUS_SYSTEM_BUS
>
> config COG_COGCTL
> bool
> - select COG_REMOTE_DBUS_SYSTEM_BUS
> prompt "Install cogctl"
>
> endif
> diff --git a/rules/cog.make b/rules/cog.make
> index 43c661344a69..e8be1f7097a4 100644
> --- a/rules/cog.make
> +++ b/rules/cog.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
> #
> # Paths and names
> #
> -COG_VERSION := 0.14.1
> -COG_MD5 := 69d72ac046a0fc485ea7b61b96e7e7fc
> +COG_VERSION := 0.16.0
> +COG_MD5 := 2705472ea4f333290973722c0862b21d
> COG := cog-$(COG_VERSION)
> COG_SUFFIX := tar.xz
> COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
> @@ -31,26 +31,21 @@ COG_LICENSE_FILES := file://COPYING;md5=bf1229cd7425b302d60cdb641b0ce5fb
> #
> # cmake
> #
> -COG_CONF_TOOL := cmake
> +COG_CONF_TOOL := meson
> COG_CONF_OPT := \
> - $(CROSS_CMAKE_USR) \
> - -G Ninja \
> - -DBUILD_DOCS=OFF \
> - -DCOG_APPID= \
> - -DCOG_BUILD_PROGRAMS=ON \
> - -DCOG_DBUS_OWN_USER= \
> - -DCOG_DBUS_SYSTEM_BUS=$(call ptx/onoff,PTXCONF_COG_REMOTE_DBUS_SYSTEM_BUS) \
> - -DCOG_HOME_URI=https://ptxdist.org/ \
> - -DCOG_MODULEDIR=/usr/lib/cog/modules \
> - -DCOG_PLATFORM_DRM=OFF \
> - -DCOG_PLATFORM_GTK4=OFF \
> - -DCOG_PLATFORM_HEADLESS=OFF \
> - -DCOG_PLATFORM_WL=ON \
> - -DCOG_PLATFORM_X11=OFF \
> - -DCOG_WESTON_DIRECT_DISPLAY=OFF \
> - -DINSTALL_MAN_PAGES=OFF \
> - -DUSE_SOUP2=ON \
> - -DWAYLAND_PROTOCOLS=$(PTXDIST_SYSROOT_TARGET)/usr/share/wayland-protocols
> + $(CROSS_MESON_USR) \
> + -Dcog_appid=com.igalia.Cog \
> + -Dcog_dbus_control=$(call ptx/ifdef, PTXCONF_COG_REMOTE_DBUS_SYSTEM_BUS,system,user) \
> + -Dcog_dbus_system_owner= \
> + -Dcog_home_uri=https://ptxdist.org/ \
> + -Ddocumentation=false \
> + -Dmanpages=false \
> + -Dplatforms=wayland \
> + -Dplugin_path=/usr/lib/cog/modules \
> + -Dprograms=true \
> + -Dsoup2=enabled \
> + -Dwayland_weston_content_protection=false \
> + -Dwayland_weston_direct_display=false
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-07 7:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-27 13:55 [ptxdist] [PATCH] cog: version bump 0.14.1 -> 0.16 Bastian Krause
2022-10-07 7:38 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox