NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/cog: bump to version 0.16.0

Browse Source 
This new version includes support for setting proxy options and gamepad
support. Release notes:

  https://wpewebkit.org/release/cog-0.16.0.html

This imports a small patch to properly pick libdrm compiler flags,
fetched from the upstream repository.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Tested-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Adrian Perez de Castro 2022-10-06 12:58:33 +03:00 committed by Peter Korsgaard
parent 917f05975f
commit 43c833e6cb
3 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch Normal file
View File

@ -0,0 +1,36 @@
From 9a1982c563e218b7695e6a174c8230d3b063eb27 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Thu, 6 Oct 2022 09:04:22 +0200
Subject: [PATCH] wl: Fix libdrm dependency when protocols are used
As the comment says, cog-platform-wl.c needs drm_fourcc.h to build
properly when wayland_weston_direct_display is enabled.
However, libdrm.pc doesn't specify "include/libdrm" as part of its
includedir but whether in its cflags. So use the compile_args dep
instead of includes to fix the build failure.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
(cherry picked from commit 32c1d9533bcdc22cbc01d02bf2e6ac0d4bda2dc2)
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
[Upstream status: https://github.com/Igalia/cog/pull/501]
---
platform/wayland/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platform/wayland/meson.build b/platform/wayland/meson.build
index f1e18ec..31e4460 100644
--- a/platform/wayland/meson.build
+++ b/platform/wayland/meson.build
@@ -67,7 +67,7 @@ if wayland_platform_weston_protocols.length() > 0
# The code uses definitions from the drm_fourcc.h header, but does not
# need to link the library; libdrm here is only a build-time dependency.
- wayland_platform_dependencies += [dependency('libdrm').partial_dependency(includes: true)]
+ wayland_platform_dependencies += [dependency('libdrm').partial_dependency(compile_args: true)]
endif
--
2.38.0

8
package/cog/cog.hash
View File

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

37
package/cog/cog.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
COG_VERSION = 0.14.1 COG_VERSION = 0.16.0
COG_SITE = https://wpewebkit.org/releases COG_SITE = https://wpewebkit.org/releases
COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_SOURCE = cog-$(COG_VERSION).tar.xz
COG_INSTALL_STAGING = YES COG_INSTALL_STAGING = YES
@ -12,37 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland
COG_LICENSE = MIT COG_LICENSE = MIT
COG_LICENSE_FILES = COPYING COG_LICENSE_FILES = COPYING
COG_CONF_OPTS = \ COG_CONF_OPTS = \
-DCOG_BUILD_PROGRAMS=ON \ -Ddocumentation=false \
-DCOG_PLATFORM_HEADLESS=ON \ -Dmanpages=false \
-DINSTALL_MAN_PAGES=OFF \ -Dprograms=true \
-DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ -Dsoup2=enabled \
-DUSE_SOUP2=ON -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \
-Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))'
COG_PLATFORMS_LIST = headless
ifeq ($(BR2_PACKAGE_WESTON),y) ifeq ($(BR2_PACKAGE_WESTON),y)
COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=ON COG_CONF_OPTS += -Dwayland_weston_direct_display=true
COG_DEPENDENCIES += weston COG_DEPENDENCIES += weston
else else
COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=OFF COG_CONF_OPTS += -Dwayland_weston_direct_display=false
endif endif
ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y)
COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON COG_PLATFORMS_LIST += wayland
COG_DEPENDENCIES += libxkbcommon wayland-protocols COG_DEPENDENCIES += libxkbcommon wayland-protocols
else
COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF
endif endif
ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y)
COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON COG_PLATFORMS_LIST += drm
COG_DEPENDENCIES += libdrm libinput libgbm libegl udev COG_DEPENDENCIES += libdrm libinput libgbm libegl udev
else
COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF
endif endif
ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y) ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y)
COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON COG_CONF_OPTS += -Dcog_dbus_control=system
else else
COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF COG_CONF_OPTS += -Dcog_dbus_control=user
endif endif
$(eval $(cmake-package)) ifeq ($(BR2_PACKAGE_LIBMANETTE),y)
COG_DEPENDENCIES += libmanette
endif
$(eval $(meson-package))