package/cog: build cog 0.16 with wpewebkit 2.38

Version 0.16 includes gamepad support, which is only available with
WPE WebKit 2.38. While it would be possible to build also Cog 0.16.
The changes are a bit involved due to Cog switching to Meson, which
requires keeping two sets of configuration flags in parallel (using
the COG_CONF_OPTS_{MESON,CMAKE} variables, and then choosing among
them along with {meson,cmake}package at the end of the Make fragment.

Signed-off-by: Adrian Perez de Castro <[email protected]>

Author: aperezdc

package/cog/cog.hash

@@ -8,5 +8,10 @@ md5  69d72ac046a0fc485ea7b61b96e7e7fc  cog-0.14.1.tar.xz
 sha1  6236972b0ae0bce38a0a017610f161b349723862  cog-0.14.1.tar.xz
 sha256  fb91104e25e1dde27189c91c70acc356e387f47acebaa8997e01ce5879c3a600  cog-0.14.1.tar.xz
 
+# From https://wpewebkit.org/releases/cog-0.16.0.tar.xz.sums
+md5  2705472ea4f333290973722c0862b21d  cog-0.16.0.tar.xz
+sha1  ef16e5e3d91d0da056fe5e4f596c211af7453b4e  cog-0.16.0.tar.xz
+sha256  2956f719d36c9a6368f63901a0d1ceaf4d27f529f7df441b3748c36d72906fc6  cog-0.16.0.tar.xz
+
 # Hashes for license files:
 sha256  e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252  COPYING

package/cog/cog.mk

@@ -4,22 +4,32 @@
 #
 ################################################################################
 
-ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38),y)
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38),y)
+COG_VERSION = 0.16.0
+else
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
 COG_VERSION = 0.14.1
 else
 COG_VERSION = 0.6.0
-endif
+endif # BR2_PACKAGE_WPEWEBKIT2_28
+endif # BR2_PACKAGE_WPEWEBKIT2_38
 
 COG_SITE = https://wpewebkit.org/releases
 COG_SOURCE = cog-$(COG_VERSION).tar.xz
 COG_INSTALL_STAGING = YES
 COG_DEPENDENCIES = dbus wpewebkit
 COG_LICENSE = MIT
 COG_LICENSE_FILES = COPYING
-COG_CONF_OPTS = \
+COG_CONF_OPTS_CMAKE = \
 	-DCOG_BUILD_PROGRAMS=ON \
 	-DINSTALL_MAN_PAGES=OFF \
 	-DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))'
+COG_CONF_OPTS_MESON = \
+	-Ddocumentation=false \
+	-Dmanpages=false \
+	-Dprograms=true \
+	-Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \
+	-Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))'
 
 # Add the wpebackend-fdo dependency if any of the backends which
 # need it have been selected (i.e. the expansion is non-empty.)
@@ -29,44 +39,51 @@ endif
 
 ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38),y)
 COG_FDO_PLATFORM_CMAKE_OPTION = COG_PLATFORM_WL
-COG_CONF_OPTS += \
+COG_CONF_OPTS_CMAKE += \
 	-DCOG_PLATFORM_GTK4=OFF \
 	-DCOG_PLATFORM_X11=OFF
 else
 COG_FDO_PLATFORM_CMAKE_OPTION = COG_PLATFORM_FDO
 endif # BR2_PACKAGE_WPEWEBKIT2_38
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_2),y)
-COG_CONF_OPTS += -DUSE_SOUP2=ON
+COG_CONF_OPTS_CMAKE += -DUSE_SOUP2=ON
+COG_CONF_OPTS_MESON += -Dsoup2=enabled
 else
-COG_CONF_OPTS += -DUSE_SOUP2=OFF
+COG_CONF_OPTS_CMAKE += -DUSE_SOUP2=OFF
+COG_CONF_OPTS_MESON += -Dsoup2=disabled
 endif # BR2_PACKAGE_LIBSOUP_VERSION_2
 
 ifeq ($(BR2_PACKAGE_WESTON),y)
-COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=ON
+COG_CONF_OPTS_CMAKE += -DCOG_WESTON_DIRECT_DISPLAY=ON
+COG_CONF_OPTS_MESON += -Dwayland_weston_direct_display=true
 COG_DEPENDENCIES += weston
 else
-COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=OFF
+COG_CONF_OPTS_CMAKE += -DCOG_WESTON_DIRECT_DISPLAY=OFF
+COG_CONF_OPTS_MESON += -Dwayland_weston_direct_display=false
 endif
 
 ifeq ($(BR2_PACKAGE_COG_PLATFORM_HEADLESS),y)
-COG_CONF_OPTS += -DCOG_PLATFORM_HEADLESS=ON
+COG_CONF_OPTS_CMAKE += -DCOG_PLATFORM_HEADLESS=ON
+COG_PLATFORMS_LIST += headless
 else
-COG_CONF_OPTS += -DCOG_PLATFORM_HEADLESS=OFF
+COG_CONF_OPTS_CMAKE += -DCOG_PLATFORM_HEADLESS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y)
-COG_CONF_OPTS += -D$(COG_FDO_PLATFORM_CMAKE_OPTION)=ON
+COG_CONF_OPTS_CMAKE += -D$(COG_FDO_PLATFORM_CMAKE_OPTION)=ON
+COG_PLATFORMS_LIST += wayland
 COG_DEPENDENCIES += libxkbcommon wayland-protocols wayland
 else
-COG_CONF_OPTS += -D$(COG_FDO_PLATFORM_CMAKE_OPTION)=OFF
+COG_CONF_OPTS_CMAKE += -D$(COG_FDO_PLATFORM_CMAKE_OPTION)=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y)
-COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON
+COG_CONF_OPTS_CMAKE += -DCOG_PLATFORM_DRM=ON
+COG_PLATFORMS_LIST += drm
 COG_DEPENDENCIES += libdrm libinput libgbm libegl udev
 else
-COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF
+COG_CONF_OPTS_CMAKE += -DCOG_PLATFORM_DRM=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y)
@@ -75,9 +92,11 @@ define COG_INSTALL_DBUS_POLICY
 	$(INSTALL) -D -m 0644 $(@D)/com.igalia.Cog.conf $(TARGET_DIR)/usr/share/dbus-1/system.d/
 endef
 COG_POST_INSTALL_TARGET_HOOKS += COG_INSTALL_DBUS_POLICY
-COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON
+COG_CONF_OPTS_CMAKE += -DCOG_DBUS_SYSTEM_BUS=ON
+COG_CONF_OPTS_MESON += -Dcog_dbus_control=system
 else
-COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF
+COG_CONF_OPTS_CMAKE += -DCOG_DBUS_SYSTEM_BUS=OFF
+COG_CONF_OPTS_MESON += -Dcog_dbus_control=user
 endif # BR2_PACKAGE_COG_USE_SYSTEM_DBUS
 
 # WPE WebKit 2.28 has been patched to use libsoup3, but the pkg-config
@@ -98,4 +117,13 @@ define COG_INSTALL_SETTINGS
 endef
 COG_POST_INSTALL_TARGET_HOOKS += COG_INSTALL_SETTINGS
 
+ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38),y)
+ifeq ($(BR2_PACKAGE_LIBMANETTE),y)
+COG_DEPENDENCIES += libmanette
+endif
+COG_CONF_OPTS = $(COG_CONF_OPTS_MESON)
+$(eval $(meson-package))
+else # !BR2_PACKAGE_WPEWEBKIT2_38
+COG_CONF_OPTS = $(COG_CONF_OPTS_CMAKE)
 $(eval $(cmake-package))
+endif # BR2_PACKAGE_WPEWEBKIT2_38