[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-370-gb4eb3d2e1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-370-gb4eb3d2e1
|
From: sszy <ss...@us...> - 2023-03-01 16:40:33
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b4eb3d2e1c604138b799c5f4782ad560b3a85962 (commit)
from b3047dec5fd5254eed42784d0a478970096e60c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b4eb3d2e1c604138b799c5f4782ad560b3a85962
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Mar 1 17:40:18 2023 +0100
[BUILDROOT] 2022.02: bump cog version
-----------------------------------------------------------------------
Summary of changes:
.../2022.02/006-armadeus-bump-cog-version.patch | 224 +++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 5 +
2 files changed, 229 insertions(+)
create mode 100644 patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch
diff --git a/patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch b/patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch
new file mode 100644
index 000000000..81276d834
--- /dev/null
+++ b/patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch
@@ -0,0 +1,224 @@
+Bump cog package & reactivate mouse cursor while we are at it.
+
+Bump is from BR mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/cog/cog.mk
+===================================================================
+--- buildroot.orig/package/cog/cog.mk
++++ buildroot/package/cog/cog.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-COG_VERSION = 0.12.4
++COG_VERSION = 0.16.1
+ COG_SITE = https://wpewebkit.org/releases
+ COG_SOURCE = cog-$(COG_VERSION).tar.xz
+ COG_INSTALL_STAGING = YES
+@@ -12,31 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebac
+ COG_LICENSE = MIT
+ COG_LICENSE_FILES = COPYING
+ COG_CONF_OPTS = \
+- -DCOG_BUILD_PROGRAMS=ON \
+- -DCOG_PLATFORM_HEADLESS=ON \
+- -DCOG_WESTON_DIRECT_DISPLAY=OFF \
+- -DINSTALL_MAN_PAGES=OFF \
+- -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \
+- -DUSE_SOUP2=ON
++ -Ddocumentation=false \
++ -Dmanpages=false \
++ -Dprograms=true \
++ -Dsoup2=enabled \
++ -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)
++COG_CONF_OPTS += -Dwayland_weston_direct_display=true
++COG_DEPENDENCIES += weston
++else
++COG_CONF_OPTS += -Dwayland_weston_direct_display=false
++endif
+
+ ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y)
+-COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON
++COG_PLATFORMS_LIST += wayland
+ COG_DEPENDENCIES += libxkbcommon wayland-protocols
+-else
+-COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF
+ endif
+
+ 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
+-else
+-COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF
+ endif
+
+ ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y)
+-COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON
++COG_CONF_OPTS += -Dcog_dbus_control=system
+ else
+-COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF
++COG_CONF_OPTS += -Dcog_dbus_control=user
++endif
++
++ifeq ($(BR2_PACKAGE_LIBMANETTE),y)
++COG_DEPENDENCIES += libmanette
+ endif
+
+-$(eval $(cmake-package))
++$(eval $(meson-package))
+Index: buildroot/package/cog/cog.hash
+===================================================================
+--- buildroot.orig/package/cog/cog.hash
++++ buildroot/package/cog/cog.hash
+@@ -3,5 +3,15 @@ md5 cdb8acdc3acc9b5082e7db9c279155c3 c
+ sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz
+ sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz
+
++# From cog-0.14.0.tar.xz (119.8 KiB)
++md5 2705472ea4f333290973722c0862b21d cog-0.16.0.tar.xz
++sha1 ef16e5e3d91d0da056fe5e4f596c211af7453b4e cog-0.16.0.tar.xz
++sha256 2956f719d36c9a6368f63901a0d1ceaf4d27f529f7df441b3748c36d72906fc6 cog-0.16.0.tar.xz
++
++# From https://wpewebkit.org/releases/cog-0.16.1.tar.xz.sums
++md5 1489740db6b4ea568578035c30b8b2f4 cog-0.16.1.tar.xz
++sha1 1235203085e7ccd8fc76eab6bdfcdb2e3ae38ea9 cog-0.16.1.tar.xz
++sha256 37c5f14123b8dcf077839f6c60f0d721d2a91bb37829e796f420126e6b0d38b5 cog-0.16.1.tar.xz
++
+ # Hashes for license files:
+ sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING
+Index: buildroot/package/weston/weston.mk
+===================================================================
+--- buildroot.orig/package/weston/weston.mk
++++ buildroot/package/weston/weston.mk
+@@ -10,6 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION)
+ WESTON_LICENSE = MIT
+ WESTON_LICENSE_FILES = COPYING
+ WESTON_CPE_ID_VENDOR = wayland
++WESTON_INSTALL_STAGING = YES
+
+ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
+ libxkbcommon pixman libpng udev cairo libinput libdrm
+Index: buildroot/package/cog/0001-make-cursor-great-again.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/cog/0001-make-cursor-great-again.patch
+@@ -0,0 +1,112 @@
++Make COG pointer great again...
++
++(backport from cog mainline)
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-5.10.167/Documentation/dontdiff cog-0.16.1.org/platform/wayland/cog-platform-wl.c cog-0.16.1/platform/wayland/cog-platform-wl.c
++--- cog-0.16.1.org/platform/wayland/cog-platform-wl.c 2023-03-01 16:40:19.799063958 +0100
+++++ cog-0.16.1/platform/wayland/cog-platform-wl.c 2023-03-01 16:42:25.246512793 +0100
++@@ -173,7 +173,6 @@
++ #endif
++
++ #ifdef COG_USE_WAYLAND_CURSOR
++- struct wl_shm *wl_shm;
++ struct wl_cursor_theme *cursor_theme;
++ struct wl_cursor *cursor_left_ptr;
++ struct wl_surface *cursor_left_ptr_surface;
++@@ -1177,10 +1176,9 @@
++ && xkb_compose_state_get_status (xkb_data.compose_state)
++ == XKB_COMPOSE_COMPOSED) {
++ keysym = xkb_compose_state_get_one_sym (xkb_data.compose_state);
++- unicode = xkb_keysym_to_utf32 (keysym);
++ }
++
++- struct wpe_input_keyboard_event event = {time, keysym, unicode, state == true, xkb_data.modifiers};
+++ struct wpe_input_keyboard_event event = {time, keysym, key, state == true, xkb_data.modifiers};
++
++ wpe_view_backend_dispatch_keyboard_event (wpe_view_data.backend, &event);
++ }
++@@ -1654,6 +1652,20 @@
++ static void
++ on_export_wl_egl_image(void *data, struct wpe_fdo_egl_exported_image *image)
++ {
+++ const uint32_t surface_pixel_width = wl_data.current_output.scale * win_data.width;
+++ const uint32_t surface_pixel_height = wl_data.current_output.scale * win_data.height;
+++
+++ if (surface_pixel_width != wpe_fdo_egl_exported_image_get_width(image) ||
+++ surface_pixel_height != wpe_fdo_egl_exported_image_get_height(image)) {
+++ g_debug("Exported FDO EGL image size %" PRIu32 "x%" PRIu32 ", does not match surface size %" PRIu32 "x%" PRIu32
+++ ", skipping.",
+++ wpe_fdo_egl_exported_image_get_width(image), wpe_fdo_egl_exported_image_get_height(image),
+++ surface_pixel_width, surface_pixel_width);
+++ wpe_view_backend_exportable_fdo_dispatch_frame_complete(wpe_host_data.exportable);
+++ wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(wpe_host_data.exportable, image);
+++ return;
+++ }
+++
++ wpe_view_data.image = image;
++
++ if (wpe_view_data.should_update_opaque_region) {
++@@ -1682,10 +1694,7 @@
++ wl_buffer_add_listener(wpe_view_data.buffer, &buffer_listener, image);
++
++ wl_surface_attach (win_data.wl_surface, wpe_view_data.buffer, 0, 0);
++- wl_surface_damage (win_data.wl_surface,
++- 0, 0,
++- win_data.width * wl_data.current_output.scale,
++- win_data.height * wl_data.current_output.scale);
+++ wl_surface_damage(win_data.wl_surface, 0, 0, surface_pixel_width, surface_pixel_height);
++
++ request_frame ();
++
++@@ -1798,6 +1807,21 @@
++ struct wl_resource *exported_resource = wpe_fdo_shm_exported_buffer_get_resource (exported_buffer);
++ struct wl_shm_buffer *exported_shm_buffer = wpe_fdo_shm_exported_buffer_get_shm_buffer (exported_buffer);
++
+++ const uint32_t surface_pixel_width = wl_data.current_output.scale * win_data.width;
+++ const uint32_t surface_pixel_height = wl_data.current_output.scale * win_data.height;
+++
+++ if (surface_pixel_width != wl_shm_buffer_get_width(exported_shm_buffer) ||
+++ surface_pixel_height != wl_shm_buffer_get_height(exported_shm_buffer)) {
+++ g_debug("Exported SHM buffer size %" PRIu32 "x%" PRIu32 ", does not match surface size %" PRIu32 "x%" PRIu32
+++ ", skipping.",
+++ wl_shm_buffer_get_width(exported_shm_buffer), wl_shm_buffer_get_width(exported_shm_buffer),
+++ surface_pixel_width, surface_pixel_width);
+++ wpe_view_backend_exportable_fdo_dispatch_frame_complete(wpe_host_data.exportable);
+++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
+++ exported_buffer);
+++ return;
+++ }
+++
++ struct shm_buffer *buffer = shm_buffer_for_resource (exported_resource);
++ if (!buffer) {
++ int32_t width;
++@@ -1979,14 +2003,11 @@
++ wl_display_roundtrip (wl_data.display);
++
++ #if COG_USE_WAYLAND_CURSOR
++- if (wl_data.wl_shm) {
++- if (!(wl_data.cursor_theme = wl_cursor_theme_load (NULL,
++- 32,
++- wl_data.wl_shm))) {
++- g_warning ("%s: Could not load cursor theme.", G_STRFUNC);
++- } else if (!(wl_data.cursor_left_ptr =
++- wl_cursor_theme_get_cursor (wl_data.cursor_theme, "left_ptr"))) {
++- g_warning ("%s: Could not load left_ptr cursor.", G_STRFUNC);
+++ if (wl_data.shm) {
+++ if (!(wl_data.cursor_theme = wl_cursor_theme_load(NULL, 32, wl_data.shm))) {
+++ g_warning("%s: Could not load cursor theme.", G_STRFUNC);
+++ } else if (!(wl_data.cursor_left_ptr = wl_cursor_theme_get_cursor(wl_data.cursor_theme, "left_ptr"))) {
+++ g_warning("%s: Could not load left_ptr cursor.", G_STRFUNC);
++ }
++ }
++ #endif /* COG_USE_WAYLAND_CURSOR */
++@@ -2027,7 +2048,6 @@
++ #ifdef COG_USE_WAYLAND_CURSOR
++ g_clear_pointer (&wl_data.cursor_left_ptr_surface, wl_surface_destroy);
++ g_clear_pointer (&wl_data.cursor_theme, wl_cursor_theme_destroy);
++- g_clear_pointer (&wl_data.wl_shm, wl_shm_destroy);
++ #endif /* COG_USE_WAYLAND_CURSOR */
++
++ wl_registry_destroy (wl_data.registry);
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index b20407be1..b9faa4f11 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -23,6 +23,10 @@ rm -rf buildroot/package/busybox/S10mdev
rm -rf buildroot/package/cmux/Config.in
rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
+rm -rf buildroot/package/cog/0001-make-cursor-great-again.patch
+rm -rf buildroot/package/cog/Config.in
+rm -rf buildroot/package/cog/cog.hash
+rm -rf buildroot/package/cog/cog.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
@@ -89,6 +93,7 @@ rm -rf buildroot/package/snes9x/snes9x.mk
rm -rf buildroot/package/thingerio/Config.in
rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
+rm -rf buildroot/package/weston/weston.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
rm -rf buildroot/package/xc3sprog/Config.in
hooks/post-receive
--
armadeus
|