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,52 +1,52 @@ 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 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-scanner:graphics/wayland \ wayland-protocols>0:graphics/wayland-protocols \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libwf-config.so:devel/wf-config \ libwlroots.so:x11-toolkits/wlroots USES= compiler:c++17-lang gnome meson pkgconfig shebangfix USE_GITHUB= yes USE_GITLAB= nodefault USE_GNOME= cairo glibmm GH_ACCOUNT= WayfireWM GH_TUPLE= damianatorrpm:wayfire-plugin_dbus_interface:c705bf1:dbus/subprojects/dbus GL_TUPLE= wayfireplugins:windecor:6ad31bfc10c5d39c0da7c68fa435064effad6381:windecor/subprojects/windecor SHEBANG_FILES= subprojects/dbus/compile-schemas.sh bash_CMD= ${SH} OPTIONS_DEFINE= DBUS LIBRSVG2 OPTIONS_DEFAULT=DBUS LIBRSVG2 OPTIONS_SUB= yes DBUS_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto DBUS_USES= xorg DBUS_USE= XORG=xcb DBUS_MESON_TRUE= enable_dbus DBUS_VARS= GLIB_SCHEMAS+=org.wayland.compositor.dbus.gschema.xml LIBRSVG2_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto LIBRSVG2_USES= xorg LIBRSVG2_USE= GNOME=librsvg2 XORG=pixman LIBRSVG2_MESON_TRUE= enable_windecor post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/subprojects/windecor/deco-theme.cpp .include 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 @@ -1,9 +1,9 @@ TIMESTAMP = 1611938557 SHA256 (WayfireWM-wayfire-plugins-extra-v0.7.0_GH0.tar.gz) = e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287 SIZE (WayfireWM-wayfire-plugins-extra-v0.7.0_GH0.tar.gz) = 50385 SHA256 (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 1eef146ea1077b69aa2ec1afdf51dc1a7831d7661c43b9b10ea68a39b7c50ac3 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();