From nobody Fri Jun 03 01:14:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D5A9C1B68DF2; Fri, 3 Jun 2022 01:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LDlKs5ZjWz3Qrl; Fri, 3 Jun 2022 01:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654218897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qffKAUQDEFD+QrWHn1MhnnvQWoZsKwU5ZILFrBC9Wbk=; b=ltJJ3Id8zbPRoqo8zvkq2CP6C+uBFZ/cKe0FJTF66UxVbOfHVQhyYUFIi5nsCE6mRzunQ4 TyrfPl73BzPIwyhTEUyXtUdl4/BMxBagGucuV8alqlP/gAYu0GdtvVTKXtGYDCJrEiV8Id +Geanmb+f69CgxgAZW0LSge+FqIvhOcysaCfZNMJiInIeJth2+gsFCv1Dx/C1GZ4/W65PQ 73Xp+E8+KEjJrlROKWxobL7zTGHGIslaR236sNRVgCG6e6A80Wg0JzjZRNuxxwuEX6R5f+ WArxEemoo/3tbvrCJwwMbxtUz00zdxUJifPLCHKZCT06Hnhcf3yUquCRuhuUQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A07CC1F97C; Fri, 3 Jun 2022 01:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2531EvYa052624; Fri, 3 Jun 2022 01:14:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2531EvuL052623; Fri, 3 Jun 2022 01:14:57 GMT (envelope-from git) Date: Fri, 3 Jun 2022 01:14:57 GMT Message-Id: <202206030114.2531EvuL052623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: fa585bb09f6f - 2022Q2 - x11-wm/wayfire-plugins-extra: switch to upstream wlroots 0.15 fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: fa585bb09f6f3e3430eacb517b40cc7317071203 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654218897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qffKAUQDEFD+QrWHn1MhnnvQWoZsKwU5ZILFrBC9Wbk=; b=RmUfsetlHINvVkOhOfVNnQhQYBZrWZyz1rYRsbeSjVO+eQ7HXOmfv5SlRV8itNlbZRCHlx YIn8tnrFcQzv0N5zQzAndToVMCMmV/fDjgArBacvr4CgC1kCaLpy8SdHMgFAxaaM2mUm42 +vobdcUJptKIGqBRfPeaPNsn5ZA2bOOaltF/47NjtelDup8PnVpAL/eXD91d8MxtHP5UlO gPGuPEpgzo1RYVxQT9Y6KPwoGhBeGlQo+nTWfftB+9aqHjBkvPLosd+lSxV1LPxtbv3+Zb IA9Xj1ptj1HwYwulWKF4717jSY5sUGSsRIBC19NzHcRQAPgikM/2/4Sv0b4uqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654218897; a=rsa-sha256; cv=none; b=VmjpysOuH2kXLcFaeuHyZn8SKfBFLAzREiKvMv5s1guHLYoL8cr/dhvTpFpv7mkMpe4Uvy 2znZyiW/DJ6jWmas03/uKddSM2iVGgpeAZkSyghJVPC1TwAicl5l0lYknbu6zKoqJh/tqZ LMuw5JkIALc6R90KApSK4+sEwduNeXMiHqX01+Bqamar7ROQ9JfE1AcsjzxT4kwNdNHuE1 NXCdBtHikSB05MrBR3lUvcW4wKW9503EDCnd4tfGzgFqvIH0I07lHGzl1Fsv5ZUoAh1C+9 UlcOdghsDU9ikt5BeiKzKHi0/Has1yP99jgifgiwiV5ZL+5/OIQaRxPxmeGWfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa585bb09f6f3e3430eacb517b40cc7317071203 commit fa585bb09f6f3e3430eacb517b40cc7317071203 Author: Jan Beich AuthorDate: 2022-06-03 01:11:07 +0000 Commit: Jan Beich 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();