diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch deleted file mode 100644 index 9467318b31..0000000000 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 7854cd141f6f4c896afdc86229671d443ca7ba10 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Thu, 18 Feb 2021 22:31:39 +0000 -Subject: [PATCH] Add feature macros to more C files - -These source files use "struct timespec", which is POSIX 1993.09. - -Upstream: Rejected (Upstream does not want these workarounds) -see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 - -Signed-off-by: Paul Cercueil -[Retrieved from: https://github.com/swaywm/wlroots/pull/2493] -Signed-off-by: Fabrice Fontaine -[Julien: refreshed the patch to be applied with fuzz factor 0] -Signed-off-by: Julien Olivain ---- - backend/wayland/output.c | 1 + - types/data_device/wlr_data_device.c | 1 + - types/data_device/wlr_drag.c | 1 + - types/wlr_export_dmabuf_v1.c | 1 + - types/wlr_idle.c | 1 + - types/wlr_keyboard_shortcuts_inhibit_v1.c | 1 + - types/wlr_pointer_constraints_v1.c | 1 + - types/wlr_primary_selection.c | 1 + - types/wlr_relative_pointer_v1.c | 1 + - types/wlr_screencopy_v1.c | 1 + - types/wlr_virtual_pointer_v1.c | 1 + - types/wlr_xdg_decoration_v1.c | 1 + - types/xdg_shell/wlr_xdg_popup.c | 1 + - types/xdg_shell/wlr_xdg_positioner.c | 1 + - types/xdg_shell/wlr_xdg_shell.c | 1 + - types/xdg_shell/wlr_xdg_surface.c | 1 + - 16 files changed, 16 insertions(+) - -diff --git a/backend/wayland/output.c b/backend/wayland/output.c -index c4b95e1..d5699d3 100644 ---- a/backend/wayland/output.c -+++ b/backend/wayland/output.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/data_device/wlr_data_device.c b/types/data_device/wlr_data_device.c -index 7e67479..2db13a6 100644 ---- a/types/data_device/wlr_data_device.c -+++ b/types/data_device/wlr_data_device.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c -index c1fa801..8981ea0 100644 ---- a/types/data_device/wlr_drag.c -+++ b/types/data_device/wlr_drag.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_export_dmabuf_v1.c b/types/wlr_export_dmabuf_v1.c -index c1d26e6..cd06615 100644 ---- a/types/wlr_export_dmabuf_v1.c -+++ b/types/wlr_export_dmabuf_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_idle.c b/types/wlr_idle.c -index cb3a1cc..5f1fa95 100644 ---- a/types/wlr_idle.c -+++ b/types/wlr_idle.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_keyboard_shortcuts_inhibit_v1.c b/types/wlr_keyboard_shortcuts_inhibit_v1.c -index cc9bac1..3924893 100644 ---- a/types/wlr_keyboard_shortcuts_inhibit_v1.c -+++ b/types/wlr_keyboard_shortcuts_inhibit_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_pointer_constraints_v1.c b/types/wlr_pointer_constraints_v1.c -index 7a8d209..70b0984 100644 ---- a/types/wlr_pointer_constraints_v1.c -+++ b/types/wlr_pointer_constraints_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c -index d576bf0..bac4daa 100644 ---- a/types/wlr_primary_selection.c -+++ b/types/wlr_primary_selection.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_relative_pointer_v1.c b/types/wlr_relative_pointer_v1.c -index 44da791..f6925b8 100644 ---- a/types/wlr_relative_pointer_v1.c -+++ b/types/wlr_relative_pointer_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c -index 4ca659a..76c582e 100644 ---- a/types/wlr_screencopy_v1.c -+++ b/types/wlr_screencopy_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_virtual_pointer_v1.c b/types/wlr_virtual_pointer_v1.c -index b452ff5..661e613 100644 ---- a/types/wlr_virtual_pointer_v1.c -+++ b/types/wlr_virtual_pointer_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/wlr_xdg_decoration_v1.c b/types/wlr_xdg_decoration_v1.c -index fcd97a5..1850665 100644 ---- a/types/wlr_xdg_decoration_v1.c -+++ b/types/wlr_xdg_decoration_v1.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c -index fa99acd..8361eef 100644 ---- a/types/xdg_shell/wlr_xdg_popup.c -+++ b/types/xdg_shell/wlr_xdg_popup.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/xdg_shell/wlr_xdg_positioner.c b/types/xdg_shell/wlr_xdg_positioner.c -index 6a991bb..dae879b 100644 ---- a/types/xdg_shell/wlr_xdg_positioner.c -+++ b/types/xdg_shell/wlr_xdg_positioner.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include -diff --git a/types/xdg_shell/wlr_xdg_shell.c b/types/xdg_shell/wlr_xdg_shell.c -index 70b777d..16d275a 100644 ---- a/types/xdg_shell/wlr_xdg_shell.c -+++ b/types/xdg_shell/wlr_xdg_shell.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include "types/wlr_xdg_shell.h" -diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c -index a03b90a..a6267cf 100644 ---- a/types/xdg_shell/wlr_xdg_surface.c -+++ b/types/xdg_shell/wlr_xdg_surface.c -@@ -1,3 +1,4 @@ -+#define _POSIX_C_SOURCE 199309L - #include - #include - #include --- -2.45.2 - diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index d81506c375..02bd54c999 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_WLROOTS depends on BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PNP_IDS + select BR2_PACKAGE_LIBDISPLAY_INFO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 8ab05393b1..ccfcd6ac42 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,7 @@ -# Generated locally, after checking https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz.sig -sha256 83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa wlroots-0.16.2.tar.gz +# Locally calculated after checking pgp signature +# https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.18.1/downloads/wlroots-0.18.1.tar.gz.sig +# with key 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 "emersion " +sha256 b9c4bfef4123fe9f8662280b851e3c5741927457174315826827bfbb70612878 wlroots-0.18.1.tar.gz # Hashes for license files: -sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE +sha256 35d427c043dcafe8893b9e7247348f599847c81d9a067703587c80707f3d58df LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index fdd2fb8250..8fa7408717 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.16.2 +WLROOTS_VERSION = 0.18.1 WLROOTS_SITE = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$(WLROOTS_VERSION)/downloads WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -14,6 +14,7 @@ WLROOTS_DEPENDENCIES = \ host-pkgconf \ host-wayland \ hwdata \ + libdisplay-info \ libinput \ libxkbcommon \ libegl \