diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /gui-libs/wlroots/files | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'gui-libs/wlroots/files')
| -rw-r--r-- | gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch | 25 | ||||
| -rw-r--r-- | gui-libs/wlroots/files/wlroots-gcc-10.patch | 26 |
2 files changed, 26 insertions, 25 deletions
diff --git a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch deleted file mode 100644 index 614d0c7a2cd4..000000000000 --- a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d113e48a2a32542fe6e12f1759f07888364609bf Mon Sep 17 00:00:00 2001 -From: Ferdinand Bachmann <theferdi265@gmail.com> -Date: Sat, 19 Oct 2019 13:33:22 +0200 -Subject: [PATCH] Add missing include required by mesa and libglvnd change - -eglext.h no longer inludes eglmesaext.h, include it within wlroots -explicitly. - -Fixes #1862 ---- - glgen.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/glgen.sh b/glgen.sh -index 7324fdf6b..31af28120 100755 ---- a/glgen.sh -+++ b/glgen.sh -@@ -75,6 +75,7 @@ cat > "$OUTDIR/$BASE.h" << EOF - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <GLES2/gl2.h> - #include <GLES2/gl2ext.h> - diff --git a/gui-libs/wlroots/files/wlroots-gcc-10.patch b/gui-libs/wlroots/files/wlroots-gcc-10.patch new file mode 100644 index 000000000000..44e1cb7d89b0 --- /dev/null +++ b/gui-libs/wlroots/files/wlroots-gcc-10.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/707496 + +From f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com> +Date: Tue, 28 Jan 2020 15:27:24 +0100 +Subject: [PATCH] Declare wlr_seat globals as extern + +--- + include/types/wlr_seat.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/include/types/wlr_seat.h ++++ b/include/types/wlr_seat.h +@@ -4,9 +4,9 @@ + #include <wayland-server-core.h> + #include <wlr/types/wlr_seat.h> + +-const struct wlr_pointer_grab_interface default_pointer_grab_impl; +-const struct wlr_keyboard_grab_interface default_keyboard_grab_impl; +-const struct wlr_touch_grab_interface default_touch_grab_impl; ++extern const struct wlr_pointer_grab_interface default_pointer_grab_impl; ++extern const struct wlr_keyboard_grab_interface default_keyboard_grab_impl; ++extern const struct wlr_touch_grab_interface default_touch_grab_impl; + + void seat_client_create_pointer(struct wlr_seat_client *seat_client, + uint32_t version, uint32_t id); |