Date: Thu, 8 Jul 2021 15:44:38 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: e06d8cc21260 - 2021Q3 - x11-toolkits/wlroots: unbreak NVIDIA after e8342192e9dd Message-ID: <202107081544.168FicGJ025450@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e06d8cc21260f7389827bafce5ab6206c26b7bb7 commit e06d8cc21260f7389827bafce5ab6206c26b7bb7 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-07-08 15:37:01 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-07-08 15:44:35 +0000 x11-toolkits/wlroots: unbreak NVIDIA after e8342192e9dd ===> Applying distribution patches for wlroots-0.14.1 1 out of 14 hunks failed--saving rejects to render/gles2/renderer.c.rej ===> FAILED Applying distribution patch b78146d76ab0.patch with -p1 *** Error code 1 (cherry picked from commit 8c3c0663752147ed0a8f0cf1e5596b9eeaf9f72f) --- x11-toolkits/wlroots/Makefile | 2 +- x11-toolkits/wlroots/distinfo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 7543bf70a35d..05f8024822ed 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -37,7 +37,7 @@ OPTIONS_SUB= yes NVIDIA_DESC= EGLStreams support for DRM backend (experimental) NVIDIA_PATCH_SITES= https://github.com/danvd/${GH_PROJECT}-eglstreams/commit/:nvidia -NVIDIA_PATCHFILES= b78146d76ab0.patch:-p1:nvidia # https://github.com/swaywm/wlroots/pull/2769 +NVIDIA_PATCHFILES= d9acdb6b21ec.patch:-p1:nvidia # https://github.com/swaywm/wlroots/pull/2769 NVIDIA_IMPLIES= OPENGL .if make(makesum) .MAKEFLAGS: WITH+=NVIDIA diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index 01b2e4f26af7..908165425bec 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -5,8 +5,8 @@ SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da21 SIZE (7c0e2a271a4c.patch) = 5729 SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad0849594f10383ce7 SIZE (55a8d225cf8c.patch) = 4209 -SHA256 (b78146d76ab0.patch) = 4ecabeb60e6bc641d4f10d535d6144b6cf5cd57f7a26b22621f47d1fac3b1932 -SIZE (b78146d76ab0.patch) = 91559 +SHA256 (d9acdb6b21ec.patch) = b78414c89ebf93b4af02d955f9345d886d05ea0865d48f5c05e1e415adf3c45e +SIZE (d9acdb6b21ec.patch) = 91660 SHA256 (8c700c534556.patch) = d004493cde08be574d81e3e6024491cd1c4312ddadbdc0f5ea818327a558165a SIZE (8c700c534556.patch) = 49189 SHA256 (0464af8573f9.patch) = f4870fb2a232885513ab18594ff97463483e132ebbac09f367f3017c510d3823
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107081544.168FicGJ025450>