Merge pull request #2841 from fewtarius/mainline-3566

Dev -> Mainline 3566
This commit is contained in:
fewtarius 2024-02-07 06:08:53 -05:00 committed by GitHub
commit 1c25a13e8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 16 deletions

View file

@ -7,7 +7,7 @@ index f1fb908..6ea815e 100644
endif
-libweston_version = 10
+libweston_version = 12
+libweston_version = 13
dir_prefix = get_option('prefix')
dir_lib = dir_prefix / get_option('libdir')
dir_module_weston = dir_lib / 'weston'

View file

@ -2,12 +2,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="weston"
PKG_VERSION="12.0.3"
PKG_VERSION="13.0.0"
PKG_LICENSE="MIT"
PKG_SITE="https://wayland.freedesktop.org/"
PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
#PKG_URL="https://gitlab.freedesktop.org/wayland/weston.git"
PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libxcb-cursor libinput cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xwayland libXcursor xkbcomp setxkbmap cairo xterm libwebp"
PKG_LONGDESC="Reference implementation of a Wayland compositor"
PKG_PATCH_DIRS+="${DEVICE}"
@ -39,7 +38,6 @@ PKG_MESON_OPTS_TARGET+=" -Dbackend-drm=true \
-Dshell-kiosk=true \
-Ddesktop-shell-client-default="weston-desktop-shell" \
-Dcolor-management-lcms=false \
-Dlauncher-libseat=true \
-Dimage-jpeg=true \
-Dimage-webp=true \
-Dtools=['terminal','debug','info']

View file

@ -1,21 +1,19 @@
diff --git a/clients/image.c b/clients/image.c
index 63a5cefb..eedbefa2 100644
--- a/clients/image.c
+++ b/clients/image.c
@@ -402,7 +402,7 @@ image_create(struct display *display, const char *filename,
diff -rupN weston.orig/clients/image.c weston/clients/image.c
--- weston.orig/clients/image.c 2024-02-05 14:42:51.052285175 +0000
+++ weston/clients/image.c 2024-02-05 14:44:09.510805841 +0000
@@ -402,7 +402,7 @@ image_create(struct display *display, co
widget_set_button_handler(image->widget, button_handler);
widget_set_axis_handler(image->widget, axis_handler);
window_set_key_handler(image->window, key_handler);
- widget_schedule_resize(image->widget, 500, 400);
+ widget_schedule_resize(image->widget, 480, 320);
+ widget_schedule_resize(image->widget, 380, 320);
return image;
}
diff --git a/clients/meson.build b/clients/meson.build
index 2fe10956..38000b41 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -267,77 +267,7 @@ foreach t : tools_list
diff -rupN weston.orig/clients/meson.build weston/clients/meson.build
--- weston.orig/clients/meson.build 2024-02-05 14:42:51.052285175 +0000
+++ weston/clients/meson.build 2024-02-05 14:47:27.792730710 +0000
@@ -270,83 +270,7 @@ foreach t : tools_list
endforeach
demo_clients = [
@ -24,7 +22,13 @@ index 2fe10956..38000b41 100644
- 'basename': 'cliptest',
- 'dep_objs': [ dep_vertex_clipping, dep_matrix_c ]
- },
- { 'basename': 'confine' },
- {
- 'basename': 'constraints',
- 'add_sources': [
- xdg_shell_client_protocol_h,
- xdg_shell_protocol_c,
- ],
- },
- {
- 'basename': 'content_protection',
- 'add_sources': [