git: fa585bb09f6f - 2022Q2 - x11-wm/wayfire-plugins-extra: switch to upstream wlroots 0.15 fix

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 03 Jun 2022 01:14:57 UTC
The branch 2022Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fa585bb09f6f3e3430eacb517b40cc7317071203

commit fa585bb09f6f3e3430eacb517b40cc7317071203
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-03 01:11:07 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-06-03 01:14:53 +0000

    x11-wm/wayfire-plugins-extra: switch to upstream wlroots 0.15 fix
    
    (cherry picked from commit 5f6bb89ad95d5f633a8f393c758179ac7726d11a)
---
 x11-wm/wayfire-plugins-extra/Makefile              |  4 ++--
 x11-wm/wayfire-plugins-extra/distinfo              |  4 ++--
 .../wayfire-plugins-extra/files/patch-wlroots-0.15 | 27 ----------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile
index 03d733c9d590..e8528bfe2c73 100644
--- a/x11-wm/wayfire-plugins-extra/Makefile
+++ b/x11-wm/wayfire-plugins-extra/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	wayfire-plugins-extra
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	a8eca14c44b9.patch:-p1 # https://github.com/WayfireWM/wayfire-plugins-extra/pull/106
+PATCHFILES+=	cf95ac721fb1.patch:-p1 # https://github.com/WayfireWM/wayfire-plugins-extra/pull/127
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Additional plugins for Wayfire
diff --git a/x11-wm/wayfire-plugins-extra/distinfo b/x11-wm/wayfire-plugins-extra/distinfo
index 0bc2e2a30895..555c783185a8 100644
--- a/x11-wm/wayfire-plugins-extra/distinfo
+++ b/x11-wm/wayfire-plugins-extra/distinfo
@@ -5,5 +5,5 @@ SHA256 (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 1eef14
 SIZE (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 30095
 SHA256 (wayfireplugins-windecor-6ad31bfc10c5d39c0da7c68fa435064effad6381_GL0.tar.gz) = d3c739481faad2abc4391f165ebcd52a8fde1b062038bdbefcc1540a2dbbeed2
 SIZE (wayfireplugins-windecor-6ad31bfc10c5d39c0da7c68fa435064effad6381_GL0.tar.gz) = 16547
-SHA256 (a8eca14c44b9.patch) = 99dd5f51ff2a27bbff2165ee80707ea3954c25c438bef5969f85bedcda410c7f
-SIZE (a8eca14c44b9.patch) = 1059
+SHA256 (cf95ac721fb1.patch) = 8f059e60e438c3ff9f0b62071b69f567895f399ab8b44f386189a1571e4e1616
+SIZE (cf95ac721fb1.patch) = 6562
diff --git a/x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.15 b/x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.15
deleted file mode 100644
index 6124414c61e5..000000000000
--- a/x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.15
+++ /dev/null
@@ -1,27 +0,0 @@
-../src/mag.cpp:176:30: error: no member named 'front_buffer' in 'wlr_output'
-        if (!output->handle->front_buffer)
-             ~~~~~~~~~~~~~~  ^
-../src/mag.cpp:184:52: error: no member named 'front_buffer' in 'wlr_output'
-        if (!wlr_buffer_get_dmabuf(output->handle->front_buffer, &dmabuf_attribs))
-                                   ~~~~~~~~~~~~~~  ^
-
---- src/mag.cpp.orig	2021-01-29 16:42:37 UTC
-+++ src/mag.cpp
-@@ -173,7 +173,7 @@ class wayfire_magnifier : public wf::plugin_interface_
-     {
-         wlr_dmabuf_attributes dmabuf_attribs;
- 
--        if (!output->handle->front_buffer)
-+        if (!output->handle->back_buffer)
-         {
-             LOGE("Got empty buffer on ", output->handle->name);
-             return;
-@@ -181,7 +181,7 @@ class wayfire_magnifier : public wf::plugin_interface_
- 
-         /* This plugin only works if this function succeeds. It will not
-          * work with the x11 backend but works with drm, for example. */
--        if (!wlr_buffer_get_dmabuf(output->handle->front_buffer, &dmabuf_attribs))
-+        if (!wlr_buffer_get_dmabuf(output->handle->back_buffer, &dmabuf_attribs))
-         {
-             LOGE("Failed reading output contents");
-             deactivate();